@@ -18,7 +18,6 @@
1818from lxml import html
1919from json import loads
2020import re
21−from searx.engines.bing import _fetch_supported_languages, supported_languages_url
2221from searx.url_utils import urlencode
2322
2423# engine dependent config
@@ -26,6 +25,8 @@ categories = ['images']
2625paging = True
2726safesearch = True
2827time_range_support = True
28+language_support = True
29+supported_languages_url = 'https://www.bing.com/account/general'
2930
3031# search-url
3132base_url = 'https://www.bing.com/'
@@ -45,23 +46,41 @@ safesearch_types = {2: 'STRICT',
4546_quote_keys_regex = re.compile('({|,)([a-z][a-z0-9]*):(")', re.I | re.U)
4647
4748
49+# get supported region code
50+def get_region_code(lang, lang_list=None):
51+ region = None
52+ if lang in (lang_list or supported_languages):
53+ region = lang
54+ elif lang.startswith('no'):
55+ region = 'nb-NO'
56+ else:
57+ # try to get a supported country code with language
58+ lang = lang.split('-')[0]
59+ for lc in (lang_list or supported_languages):
60+ if lang == lc.split('-')[0]:
61+ region = lc
62+ break
63+ if region:
64+ return region.lower()
65+ else:
66+ return 'en-us'
67+
68+
4869# do search-request
4970def request(query, params):
5071 offset = (params['pageno'] - 1) * 10 + 1
5172
52− # required for cookie
53− if params['language'] == 'all':
54− language = 'en-US'
55− else:
56− language = params['language']
57−
5873 search_path = search_string.format(
5974 query=urlencode({'q': query}),
6075 offset=offset)
6176
77+ language = get_region_code(params['language'])
78+
6279 params['cookies']['SRCHHPGUSR'] = \
63− 'NEWWND=0&NRSLT=-1&SRCHLANG=' + language.split('-')[0] +\
64− '&ADLT=' + safesearch_types.get(params['safesearch'], 'DEMOTE')
80+ 'ADLT=' + safesearch_types.get(params['safesearch'], 'DEMOTE')
81+
82+ params['cookies']['_EDGE_S'] = 'mkt=' + language +\
83+ '&ui=' + language + '&F=1'
6584
6685 params['url'] = base_url + search_path
6786 if params['time_range'] in time_range_dict:
@@ -106,3 +125,22 @@ def response(resp):
106125
107126 # return results
108127 return results
128+
129+
130+# get supported languages from their site
131+def _fetch_supported_languages(resp):
132+ supported_languages = []
133+ dom = html.fromstring(resp.text)
134+
135+ regions_xpath = '//div[@id="region-section-content"]' \
136+ + '//ul[@class="b_vList"]/li/a/@href'
137+
138+ regions = dom.xpath(regions_xpath)
139+ for region in regions:
140+ code = re.search('setmkt=[^\&]+', region).group()[7:]
141+ if code == 'nb-NO':
142+ code = 'no-NO'
143+
144+ supported_languages.append(code)
145+
146+ return supported_languages