2438b3c · searx · git.iko.soy

git.iko.soy/searx

Merge pull request #1475 from kvch/add-all-language-option-again

Revert "remove 'all' option from search languages"

commit2438b3c77a3ad276aaeb15e5a54315d351a42273 authorNoémi Ványi <kvch@users.noreply.github.com> dateMon 7 Jan 2019, 21:35 (8 years ago) parent491792c 97351a2

51 files changed+242−70

compare with master

unifiedsplit

searx/engines/archlinux.py+2−2

@@ -36,7 +36,7 @@ def locale_to_lang_code(locale):

3636# wikis for some languages were moved off from the main site, we need to make

3737# requests to correct URLs to be able to get results in those languages

3838lang_urls = {

39− 'en': {

39+ 'all': {

4040 'base': 'https://wiki.archlinux.org',

4141 'search': '/index.php?title=Special:Search&offset={offset}&{query}'

4242 },

@@ -67,7 +67,7 @@ lang_urls = {

6767def get_lang_urls(language):

6868 if language in lang_urls:

6969 return lang_urls[language]

70− return lang_urls['en']

70+ return lang_urls['all']

7171

7272

7373# Language names to build search requests for

searx/engines/bing.py+4−1

@@ -34,7 +34,10 @@ search_string = 'search?{query}&first={offset}'

3434def request(query, params):

3535 offset = (params['pageno'] - 1) * 10 + 1

3636

37− lang = match_language(params['language'], supported_languages, language_aliases)

37+ if params['language'] == 'all':

38+ lang = 'EN'

39+ else:

40+ lang = match_language(params['language'], supported_languages, language_aliases)

3841

3942 query = u'language:{} {}'.format(lang.split('-')[0].upper(), query.decode('utf-8')).encode('utf-8')

4043

searx/engines/bing_news.py+4−1

@@ -71,7 +71,10 @@ def request(query, params):

7171

7272 offset = (params['pageno'] - 1) * 10 + 1

7373

74− language = match_language(params['language'], supported_languages, language_aliases)

74+ if params['language'] == 'all':

75+ language = 'en-US'

76+ else:

77+ language = match_language(params['language'], supported_languages, language_aliases)

7578

7679 params['url'] = _get_url(query, language, offset, params['time_range'])

7780

searx/engines/dailymotion.py+4−1

@@ -33,7 +33,10 @@ supported_languages_url = 'https://api.dailymotion.com/languages'

3333

3434# do search-request

3535def request(query, params):

36− locale = match_language(params['language'], supported_languages)

36+ if params['language'] == 'all':

37+ locale = 'en-US'

38+ else:

39+ locale = match_language(params['language'], supported_languages)

3740

3841 params['url'] = search_url.format(

3942 query=urlencode({'search': query, 'localization': locale}),

searx/engines/duckduckgo.py+9−3

@@ -54,6 +54,9 @@ content_xpath = './/a[@class="result__snippet"]'

5454

5555# match query's language to a region code that duckduckgo will accept

5656def get_region_code(lang, lang_list=[]):

57+ if lang == 'all':

58+ return None

59+

5760 lang_code = match_language(lang, lang_list, language_aliases, 'wt-WT')

5861 lang_parts = lang_code.split('-')

5962

@@ -61,7 +64,6 @@ def get_region_code(lang, lang_list=[]):

6164 return lang_parts[1].lower() + '-' + lang_parts[0].lower()

6265

6366

64−# do search-request

6567def request(query, params):

6668 if params['time_range'] and params['time_range'] not in time_range_dict:

6769 return params

@@ -69,8 +71,12 @@ def request(query, params):

6971 offset = (params['pageno'] - 1) * 30

7072

7173 region_code = get_region_code(params['language'], supported_languages)

72− params['url'] = url.format(

73− query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)

74+ if region_code:

75+ params['url'] = url.format(

76+ query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)

77+ else:

78+ params['url'] = url.format(

79+ query=urlencode({'q': query}), offset=offset, dc_param=offset)

7480

7581 if params['time_range'] in time_range_dict:

7682 params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])

searx/engines/duckduckgo_images.py+6−2

@@ -56,8 +56,12 @@ def request(query, params):

5656 safesearch = params['safesearch'] - 1

5757

5858 region_code = get_region_code(params['language'], lang_list=supported_languages)

59− params['url'] = images_url.format(

60− query=urlencode({'q': query, 'l': region_code}), offset=offset, safesearch=safesearch, vqd=vqd)

59+ if region_code:

60+ params['url'] = images_url.format(

61+ query=urlencode({'q': query, 'l': region_code}), offset=offset, safesearch=safesearch, vqd=vqd)

62+ else:

63+ params['url'] = images_url.format(

64+ query=urlencode({'q': query}), offset=offset, safesearch=safesearch, vqd=vqd)

6165

6266 return params

6367

searx/engines/faroo.py+4−1

@@ -40,7 +40,10 @@ def request(query, params):

4040 offset = (params['pageno'] - 1) * number_of_results + 1

4141 categorie = search_category.get(params['category'], 'web')

4242

43− language = params['language'].split('-')[0]

43+ if params['language'] == 'all':

44+ language = 'en'

45+ else:

46+ language = params['language'].split('-')[0]

4447

4548 # if language is not supported, put it in english

4649 if language != 'en' and\

searx/engines/gigablast.py+6−3

@@ -50,9 +50,12 @@ supported_languages_url = 'https://gigablast.com/search?&rxikd=1'

5050def request(query, params):

5151 offset = (params['pageno'] - 1) * number_of_results

5252

53− language = params['language'].replace('-', '_').lower()

54− if language.split('-')[0] != 'zh':

55− language = language.split('-')[0]

53+ if params['language'] == 'all':

54+ language = 'xx'

55+ else:

56+ language = params['language'].replace('-', '_').lower()

57+ if language.split('-')[0] != 'zh':

58+ language = language.split('-')[0]

5659

5760 if params['safesearch'] >= 1:

5861 safesearch = 1

searx/engines/google.py+5−1

@@ -166,7 +166,11 @@ def extract_text_from_dom(result, xpath):

166166def request(query, params):

167167 offset = (params['pageno'] - 1) * 10

168168

169− language = match_language(params['language'], supported_languages, language_aliases)

169+ if params['language'] == 'all' or params['language'] == 'en-US':

170+ language = 'en-GB'

171+ else:

172+ language = match_language(params['language'], supported_languages, language_aliases)

173+

170174 language_array = language.split('-')

171175 if params['language'].find('-') > 0:

172176 country = params['language'].split('-')[1]

searx/engines/google_news.py+4−3

@@ -51,9 +51,10 @@ def request(query, params):

5151 params['url'] = search_url.format(query=urlencode({'q': query}),

5252 search_options=urlencode(search_options))

5353

54− language = match_language(params['language'], supported_languages, language_aliases).split('-')[0]

55− if language:

56− params['url'] += '&lr=lang_' + language

54+ if params['language'] != 'all':

55+ language = match_language(params['language'], supported_languages, language_aliases).split('-')[0]

56+ if language:

57+ params['url'] += '&lr=lang_' + language

5758

5859 return params

5960

searx/engines/mediawiki.py+4−1

@@ -45,7 +45,10 @@ def request(query, params):

4545

4646 format_strings = list(Formatter().parse(base_url))

4747

48− language = params['language'].split('-')[0]

48+ if params['language'] == 'all':

49+ language = 'en'

50+ else:

51+ language = params['language'].split('-')[0]

4952

5053 # format_string [('https://', 'language', '', None), ('.wikipedia.org/', None, None, None)]

5154 if any(x[1] == 'language' for x in format_strings):

searx/engines/photon.py+4−3

@@ -35,9 +35,10 @@ def request(query, params):

3535 search_string.format(query=urlencode({'q': query}),

3636 limit=number_of_results)

3737

38− language = params['language'].split('-')[0]

39− if language in supported_languages:

40− params['url'] = params['url'] + "&lang=" + language

38+ if params['language'] != 'all':

39+ language = params['language'].split('_')[0]

40+ if language in supported_languages:

41+ params['url'] = params['url'] + "&lang=" + language

4142

4243 # using searx User-Agent

4344 params['headers']['User-Agent'] = searx_useragent()

searx/engines/qwant.py+3−2

@@ -46,8 +46,9 @@ def request(query, params):

4646 offset=offset)

4747

4848 # add language tag

49− language = match_language(params['language'], supported_languages, language_aliases)

50− params['url'] += '&locale=' + language.replace('-', '_').lower()

49+ if params['language'] != 'all':

50+ language = match_language(params['language'], supported_languages, language_aliases)

51+ params['url'] += '&locale=' + language.replace('-', '_').lower()

5152

5253 return params

5354

searx/engines/startpage.py+3−2

@@ -46,8 +46,9 @@ def request(query, params):

4646 params['data'] = {'query': query,

4747 'startat': offset}

4848

49− # set language

50− params['data']['with_language'] = ('lang_' + params['language'].split('-')[0])

49+ # set language if specified

50+ if params['language'] != 'all':

51+ params['data']['with_language'] = ('lang_' + params['language'].split('-')[0])

5152

5253 return params

5354

searx/engines/subtitleseeker.py+1−1

@@ -48,7 +48,7 @@ def response(resp):

4848 search_lang = 'Farsi'

4949 elif resp.search_params['language'] == 'pt-BR':

5050 search_lang = 'Brazilian'

51− else:

51+ elif resp.search_params['language'] != 'all':

5252 search_lang = [lc[3]

5353 for lc in language_codes

5454 if lc[0].split('-')[0] == resp.search_params['language'].split('-')[0]]

searx/engines/swisscows.py+6−2

@@ -36,8 +36,12 @@ regex_img_url_remove_start = re.compile(b'^https?://i\.swisscows\.ch/\?link=')

3636

3737# do search-request

3838def request(query, params):

39− region = match_language(params['language'], supported_languages, language_aliases)

40− ui_language = region.split('-')[0]

39+ if params['language'] == 'all':

40+ ui_language = 'browser'

41+ region = 'browser'

42+ else:

43+ region = match_language(params['language'], supported_languages, language_aliases)

44+ ui_language = region.split('-')[0]

4145

4246 search_path = search_string.format(

4347 query=urlencode({'query': query, 'uiLanguage': ui_language, 'region': region}),

searx/engines/twitter.py+6−1

@@ -37,7 +37,12 @@ timestamp_xpath = './/span[contains(@class,"_timestamp")]'

3737# do search-request

3838def request(query, params):

3939 params['url'] = search_url + urlencode({'q': query})

40− params['cookies']['lang'] = params['language'].split('-')[0]

40+

41+ # set language if specified

42+ if params['language'] != 'all':

43+ params['cookies']['lang'] = params['language'].split('-')[0]

44+ else:

45+ params['cookies']['lang'] = 'en'

4146

4247 return params

4348

searx/engines/wikidata.py+4−1

@@ -68,7 +68,10 @@ def response(resp):

6868 html = fromstring(resp.text)

6969 search_results = html.xpath(wikidata_ids_xpath)

7070

71− language = match_language(resp.search_params['language'], supported_languages, language_aliases).split('-')[0]

71+ if resp.search_params['language'].split('-')[0] == 'all':

72+ language = 'en'

73+ else:

74+ language = match_language(resp.search_params['language'], supported_languages, language_aliases).split('-')[0]

7275

7376 # TODO: make requests asynchronous to avoid timeout when result_count > 1

7477 for search_result in search_results[:result_count]:

searx/engines/wikipedia.py+3

@@ -31,6 +31,9 @@ supported_languages_url = 'https://meta.wikimedia.org/wiki/List_of_Wikipedias'

3131

3232# set language in base_url

3333def url_lang(lang):

34+ lang_pre = lang.split('-')[0]

35+ if lang_pre == 'all' or lang_pre not in supported_languages and lang_pre not in language_aliases:

36+ return 'en'

3437 return match_language(lang, supported_languages, language_aliases).split('-')[0]

3538

3639

searx/engines/yacy.py+3−1

@@ -51,7 +51,9 @@ def request(query, params):

5151 limit=number_of_results,

5252 search_type=search_type)

5353

54− params['url'] += '&lr=lang_' + params['language'].split('-')[0]

54+ # add language tag if specified

55+ if params['language'] != 'all':

56+ params['url'] += '&lr=lang_' + params['language'].split('-')[0]

5557

5658 return params

5759

searx/engines/yahoo.py+13−4

@@ -73,16 +73,25 @@ def _get_url(query, offset, language, time_range):

7373 lang=language)

7474

7575

76+def _get_language(params):

77+ if params['language'] == 'all':

78+ return 'en'

79+

80+ language = match_language(params['language'], supported_languages, language_aliases)

81+ if language not in language_aliases.values():

82+ language = language.split('-')[0]

83+ language = language.replace('-', '_').lower()

84+

85+ return language

86+

87+

7688# do search-request

7789def request(query, params):

7890 if params['time_range'] and params['time_range'] not in time_range_dict:

7991 return params

8092

8193 offset = (params['pageno'] - 1) * 10 + 1

82− language = match_language(params['language'], supported_languages, language_aliases)

83− if language not in language_aliases.values():

84− language = language.split('-')[0]

85− language = language.replace('-', '_').lower()

94+ language = _get_language(params)

8695

8796 params['url'] = _get_url(query, offset, language, params['time_range'])

8897

searx/engines/yahoo_news.py+4−1

@@ -41,7 +41,10 @@ suggestion_xpath = '//div[contains(@class,"VerALSOTRY")]//a'

4141def request(query, params):

4242 offset = (params['pageno'] - 1) * 10 + 1

4343

44− language = match_language(params['language'], supported_languages, language_aliases).split('-')[0]

44+ if params['language'] == 'all':

45+ language = 'en'

46+ else:

47+ language = match_language(params['language'], supported_languages, language_aliases).split('-')[0]

4548

4649 params['url'] = search_url.format(offset=offset,

4750 query=urlencode({'p': query}),

searx/engines/youtube_api.py+3−1

@@ -34,7 +34,9 @@ def request(query, params):

3434 params['url'] = search_url.format(query=urlencode({'q': query}),

3535 api_key=api_key)

3636

37− params['url'] += '&relevanceLanguage=' + params['language'].split('-')[0]

37+ # add language tag if specified

38+ if params['language'] != 'all':

39+ params['url'] += '&relevanceLanguage=' + params['language'].split('-')[0]

3840

3941 return params

4042

searx/preferences.py+1

@@ -12,6 +12,7 @@ if version[0] == '3':

1212

1313COOKIE_MAX_AGE = 60 * 60 * 24 * 365 * 5 # 5 years

1414LANGUAGE_CODES = [l[0] for l in languages]

15+LANGUAGE_CODES.append('all')

1516DISABLED = 0

1617ENABLED = 1

1718DOI_RESOLVERS = list(settings['doi_resolvers'])

searx/search.py+1−5

@@ -24,7 +24,7 @@ from flask_babel import gettext

2424import requests.exceptions

2525import searx.poolrequests as requests_lib

2626from searx.engines import (

27− categories, engines, settings

27+ categories, engines

2828)

2929from searx.answerers import ask

3030from searx.utils import gen_useragent

@@ -221,10 +221,6 @@ def get_search_query_from_webapp(preferences, form):

221221 else:

222222 query_lang = preferences.get_value('language')

223223

224− # provides backwards compatibility for requests using old language default

225− if query_lang == 'all':

226− query_lang = settings['search']['language']

227−

228224 # check language

229225 if not VALID_LANGUAGE_CODE.match(query_lang):

230226 raise SearxParameterException('language', query_lang)

searx/settings_robot.yml+1−1

@@ -5,7 +5,7 @@ general:

55search:

66 safe_search : 0

77 autocomplete : ""

8− language: "en-US"

8+ language: "all"

1010server:

1111 port : 11111

searx/templates/courgette/preferences.html+1

@@ -13,6 +13,7 @@

1313 <legend>{{ _('Search language') }}</legend>

1414 <p>

1515 <select name='language'>

16+ <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>

1617 {% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %}

1718 <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id }}</option>

1819 {% endfor %}

searx/templates/legacy/preferences.html+1

@@ -14,6 +14,7 @@

1414 <legend>{{ _('Search language') }}</legend>

1515 <p>

1616 <select name='language'>

17+ <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>

1718 {% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %}

1819 <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id }}</option>

1920 {% endfor %}

searx/templates/oscar/languages.html+6−5

@@ -3,9 +3,10 @@

33{% else %}

44<select class="time_range custom-select form-control" id='language' name='language'>

55{% endif %}

6− {% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %}

7− <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>

8− {{ lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id }}

9− </option>

10− {% endfor %}

6+ <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>

7+ {% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %}

8+ <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>

9+ {{ lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id }}

10+ </option>

11+ {% endfor %}

1112</select>

searx/templates/pix-art/preferences.html+1

@@ -9,6 +9,7 @@

99 <legend>{{ _('Search language') }}</legend>

1010 <p>

1111 <select name='language'>

12+ <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>

1213 {% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %}

1314 <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id }}</option>

1415 {% endfor %}

searx/webapp.py+11−6

@@ -637,8 +637,8 @@ def autocompleter():

637637 if len(raw_results) <= 3 and completer:

638638 # get language from cookie

639639 language = request.preferences.get_value('language')

640− if not language:

641− language = settings['search']['language']

640+ if not language or language == 'all':

641+ language = 'en'

642642 else:

643643 language = language.split('-')[0]

644644 # run autocompletion

@@ -691,10 +691,7 @@ def preferences():

691691 'warn_time': False}

692692 if e.timeout > settings['outgoing']['request_timeout']:

693693 stats[e.name]['warn_timeout'] = True

694− if match_language(request.preferences.get_value('language'),

695− getattr(e, 'supported_languages', []),

696− getattr(e, 'language_aliases', {}), None):

697− stats[e.name]['supports_selected_language'] = True

694+ stats[e.name]['supports_selected_language'] = _is_selected_language_supported(e, request.preferences)

698695

699696 # get first element [0], the engine time,

700697 # and then the second element [1] : the time (the first one is the label)

@@ -725,6 +722,14 @@ def preferences():

725722 preferences=True)

726723

727724

725+def _is_selected_language_supported(engine, preferences):

726+ language = preferences.get_value('language')

727+ return (language == 'all'

728+ or match_language(language,

729+ getattr(engine, 'supported_languages', []),

730+ getattr(engine, 'language_aliases', {}), None))

731+

732+

728733@app.route('/image_proxy', methods=['GET'])

729734def image_proxy():

730735 url = request.args.get('url').encode('utf-8')

tests/unit/engines/test_archlinux.py+1−1

@@ -4,7 +4,7 @@ from searx.engines import archlinux

44from searx.testing import SearxTestCase

66domains = {

7− 'en': 'https://wiki.archlinux.org',

7+ 'all': 'https://wiki.archlinux.org',

88 'de': 'https://wiki.archlinux.de',

99 'fr': 'https://wiki.archlinux.fr',

1010 'ja': 'https://wiki.archlinuxjp.org',

tests/unit/engines/test_bing.py+4

@@ -18,6 +18,10 @@ class TestBingEngine(SearxTestCase):

1818 self.assertTrue('language%3AFR' in params['url'])

1919 self.assertTrue('bing.com' in params['url'])

2020

21+ dicto['language'] = 'all'

22+ params = bing.request(query.encode('utf-8'), dicto)

23+ self.assertTrue('language' in params['url'])

24+

2125 def test_response(self):

2226 self.assertRaises(AttributeError, bing.response, None)

2327 self.assertRaises(AttributeError, bing.response, [])

tests/unit/engines/test_bing_news.py+4

@@ -20,6 +20,10 @@ class TestBingNewsEngine(SearxTestCase):

2020 self.assertIn('bing.com', params['url'])

2121 self.assertIn('fr', params['url'])

2222

23+ dicto['language'] = 'all'

24+ params = bing_news.request(query, dicto)

25+ self.assertIn('en', params['url'])

26+

2327 def test_no_url_in_request_year_time_range(self):

2428 dicto = defaultdict(dict)

2529 query = 'test_query'

tests/unit/engines/test_dailymotion.py+4

@@ -19,6 +19,10 @@ class TestDailymotionEngine(SearxTestCase):

1919 self.assertTrue('dailymotion.com' in params['url'])

2020 self.assertTrue('fr' in params['url'])

2121

22+ dicto['language'] = 'all'

23+ params = dailymotion.request(query, dicto)

24+ self.assertTrue('en' in params['url'])

25+

2226 def test_response(self):

2327 self.assertRaises(AttributeError, dailymotion.response, None)

2428 self.assertRaises(AttributeError, dailymotion.response, [])

tests/unit/engines/test_duckduckgo_images.py+1−1

@@ -14,7 +14,7 @@ class TestDuckduckgoImagesEngine(SearxTestCase):

1414 dicto['is_test'] = True

1515 dicto['pageno'] = 1

1616 dicto['safesearch'] = 0

17− dicto['language'] = 'en-US'

17+ dicto['language'] = 'all'

1818 params = duckduckgo_images.request(query, dicto)

1919 self.assertIn('url', params)

2020 self.assertIn(query, params['url'])

tests/unit/engines/test_faroo.py+4

@@ -20,6 +20,10 @@ class TestFarooEngine(SearxTestCase):

2020 self.assertIn('en', params['url'])

2121 self.assertIn('web', params['url'])

2222

23+ dicto['language'] = 'all'

24+ params = faroo.request(query, dicto)

25+ self.assertIn('en', params['url'])

26+

2327 dicto['language'] = 'de-DE'

2428 params = faroo.request(query, dicto)

2529 self.assertIn('de', params['url'])

tests/unit/engines/test_gigablast.py+6−1

@@ -11,11 +11,16 @@ class TestGigablastEngine(SearxTestCase):

1111 dicto = defaultdict(dict)

1212 dicto['pageno'] = 0

1313 dicto['safesearch'] = 0

14− dicto['language'] = 'en-US'

14+ dicto['language'] = 'all'

1515 params = gigablast.request(query, dicto)

1616 self.assertTrue('url' in params)

1717 self.assertTrue(query in params['url'])

1818 self.assertTrue('gigablast.com' in params['url'])

19+ self.assertTrue('xx' in params['url'])

20+

21+ dicto['language'] = 'en-US'

22+ params = gigablast.request(query, dicto)

23+ self.assertTrue('en' in params['url'])

1924 self.assertFalse('en-US' in params['url'])

2025

2126 def test_response(self):

tests/unit/engines/test_google_news.py+5

@@ -21,6 +21,11 @@ class TestGoogleNewsEngine(SearxTestCase):

2121 self.assertIn(query, params['url'])

2222 self.assertIn('fr', params['url'])

2323

24+ dicto['language'] = 'all'

25+ params = google_news.request(query, dicto)

26+ self.assertIn('url', params)

27+ self.assertNotIn('fr', params['url'])

28+

2429 def test_response(self):

2530 self.assertRaises(AttributeError, google_news.response, None)

2631 self.assertRaises(AttributeError, google_news.response, [])

tests/unit/engines/test_mediawiki.py+4

@@ -18,6 +18,10 @@ class TestMediawikiEngine(SearxTestCase):

1818 self.assertIn('wikipedia.org', params['url'])

1919 self.assertIn('fr', params['url'])

2020

21+ dicto['language'] = 'all'

22+ params = mediawiki.request(query, dicto)

23+ self.assertIn('en', params['url'])

24+

2125 mediawiki.base_url = "http://test.url/"

2226 mediawiki.search_url = mediawiki.base_url +\

2327 'w/api.php?action=query'\

tests/unit/engines/test_qwant.py+1−2

@@ -21,11 +21,10 @@ class TestQwantEngine(SearxTestCase):

2121 self.assertIn('qwant.com', params['url'])

2222 self.assertIn('fr_fr', params['url'])

2323

24− dicto['language'] = 'en-US'

24+ dicto['language'] = 'all'

2525 qwant.categories = ['news']

2626 params = qwant.request(query, dicto)

2727 self.assertFalse('fr' in params['url'])

28− self.assertIn('en_us', params['url'])

2928 self.assertIn('news', params['url'])

3029

3130 dicto['language'] = 'fr'

tests/unit/engines/test_startpage.py+4

@@ -21,6 +21,10 @@ class TestStartpageEngine(SearxTestCase):

2121 self.assertIn('with_language', params['data'])

2222 self.assertIn('lang_fr', params['data']['with_language'])

2323

24+ dicto['language'] = 'all'

25+ params = startpage.request(query, dicto)

26+ self.assertNotIn('with_language', params['data'])

27+

2428 def test_response(self):

2529 self.assertRaises(AttributeError, startpage.response, None)

2630 self.assertRaises(AttributeError, startpage.response, [])

tests/unit/engines/test_subtitleseeker.py+36

@@ -73,6 +73,42 @@ class TestSubtitleseekerEngine(SearxTestCase):

7373 results = subtitleseeker.response(response)

7474 self.assertEqual(results[0]['url'], 'http://this.is.the.url/Brazilian/')

7575

76+ html = """

77+ <div class="boxRows">

78+ <div class="boxRowsInner" style="width:600px;">

79+ <img src="http://static.subtitleseeker.com/images/movie.gif"

80+ style="width:16px; height:16px;" class="icon">

81+ <a href="http://this.is.the.url/"

82+ class="blue" title="Title subtitle" >

83+ This is the Title

84+ </a>

85+ </div>

86+ <div class="boxRowsInner f12b red" style="width:70px;">

87+ 1998

88+ </div>

89+ <div class="boxRowsInner grey-web f12" style="width:120px;">

90+ <img src="http://static.subtitleseeker.com/images/basket_put.png"

91+ style="width:16px; height:16px;" class="icon">

92+ 1039 Subs

93+ </div>

94+ <div class="boxRowsInner grey-web f10" style="width:130px;">

95+ <img src="http://static.subtitleseeker.com/images/arrow_refresh_small.png"

96+ style="width:16px; height:16px;" class="icon">

97+ 1 hours ago

98+ </div>

99+ <div class="clear"></div>

100+ </div>

101+ """

102+ dicto['language'] = 'all'

103+ response = mock.Mock(text=html, search_params=dicto)

104+ results = subtitleseeker.response(response)

105+ self.assertEqual(type(results), list)

106+ self.assertEqual(len(results), 1)

107+ self.assertEqual(results[0]['title'], 'This is the Title')

108+ self.assertEqual(results[0]['url'], 'http://this.is.the.url/')

109+ self.assertIn('1998', results[0]['content'])

110+ self.assertIn('1039 Subs', results[0]['content'])

111+

76112 html = """

77113 <div class="boxRows">

78114 <div class="boxRowsInner" style="width:600px;">

tests/unit/engines/test_swisscows.py+5

@@ -20,6 +20,11 @@ class TestSwisscowsEngine(SearxTestCase):

2020 self.assertTrue('uiLanguage=de' in params['url'])

2121 self.assertTrue('region=de-DE' in params['url'])

2222

23+ dicto['language'] = 'all'

24+ params = swisscows.request(query, dicto)

25+ self.assertTrue('uiLanguage=browser' in params['url'])

26+ self.assertTrue('region=browser' in params['url'])

27+

2328 dicto['category'] = 'images'

2429 params = swisscows.request(query, dicto)

2530 self.assertIn('image', params['url'])

tests/unit/engines/test_twitter.py+6

@@ -20,6 +20,12 @@ class TestTwitterEngine(SearxTestCase):

2020 self.assertIn('lang', params['cookies'])

2121 self.assertIn('fr', params['cookies']['lang'])

2222

23+ dicto['language'] = 'all'

24+ params = twitter.request(query, dicto)

25+ self.assertIn('cookies', params)

26+ self.assertIn('lang', params['cookies'])

27+ self.assertIn('en', params['cookies']['lang'])

28+

2329 def test_response(self):

2430 self.assertRaises(AttributeError, twitter.response, None)

2531 self.assertRaises(AttributeError, twitter.response, [])

tests/unit/engines/test_wikidata.py+2

@@ -11,11 +11,13 @@ class TestWikidataEngine(SearxTestCase):

1111 def test_request(self):

1212 query = 'test_query'

1313 dicto = defaultdict(dict)

14+ dicto['language'] = 'all'

1415 params = wikidata.request(query, dicto)

1516 self.assertIn('url', params)

1617 self.assertIn(query, params['url'])

1718 self.assertIn('wikidata.org', params['url'])

1819

20+ dicto['language'] = 'es_ES'

1921 params = wikidata.request(query, dicto)

2022 self.assertIn(query, params['url'])

2123

tests/unit/engines/test_wikipedia.py+3

@@ -29,6 +29,9 @@ class TestWikipediaEngine(SearxTestCase):

2929 dicto['language'] = 'nb'

3030 params = wikipedia.request(query, dicto)

3131 self.assertIn('no.wikipedia.org', params['url'])

32+ dicto['language'] = 'all'

33+ params = wikipedia.request(query, dicto)

34+ self.assertIn('en', params['url'])

3235

3336 dicto['language'] = 'xx'

3437 params = wikipedia.request(query, dicto)

tests/unit/engines/test_yacy.py+5

@@ -17,6 +17,11 @@ class TestYacyEngine(SearxTestCase):

1717 self.assertIn('localhost', params['url'])

1818 self.assertIn('fr', params['url'])

1919

20+ dicto['language'] = 'all'

21+ params = yacy.request(query, dicto)

22+ self.assertIn('url', params)

23+ self.assertNotIn('lr=lang_', params['url'])

24+

2025 def test_response(self):

2126 self.assertRaises(AttributeError, yacy.response, None)

2227 self.assertRaises(AttributeError, yacy.response, [])

tests/unit/engines/test_yahoo.py+7

@@ -50,6 +50,13 @@ class TestYahooEngine(SearxTestCase):

5050 self.assertIn('zh_cht', params['url'])

5151 self.assertIn('zh_cht', params['cookies']['sB'])

5252

53+ dicto['language'] = 'all'

54+ params = yahoo.request(query, dicto)

55+ self.assertIn('cookies', params)

56+ self.assertIn('sB', params['cookies'])

57+ self.assertIn('en', params['cookies']['sB'])

58+ self.assertIn('en', params['url'])

59+

5360 def test_no_url_in_request_year_time_range(self):

5461 dicto = defaultdict(dict)

5562 query = 'test_query'

tests/unit/engines/test_yahoo_news.py+7

@@ -23,6 +23,13 @@ class TestYahooNewsEngine(SearxTestCase):

2323 self.assertIn('sB', params['cookies'])

2424 self.assertIn('fr', params['cookies']['sB'])

2525

26+ dicto['language'] = 'all'

27+ params = yahoo_news.request(query, dicto)

28+ self.assertIn('cookies', params)

29+ self.assertIn('sB', params['cookies'])

30+ self.assertIn('en', params['cookies']['sB'])

31+ self.assertIn('en', params['url'])

32+

2633 def test_sanitize_url(self):

2734 url = "test.url"

2835 self.assertEqual(url, yahoo_news.sanitize_url(url))

tests/unit/test_preferences.py+5−10

@@ -90,30 +90,25 @@ class TestSettings(SearxTestCase):

9090

9191 # search language settings

9292 def test_lang_setting_valid_choice(self):

93− setting = SearchLanguageSetting('en', choices=['de', 'en'])

93+ setting = SearchLanguageSetting('all', choices=['all', 'de', 'en'])

9494 setting.parse('de')

9595 self.assertEquals(setting.get_value(), 'de')

9696

9797 def test_lang_setting_invalid_choice(self):

98− setting = SearchLanguageSetting('en', choices=['de', 'en'])

98+ setting = SearchLanguageSetting('all', choices=['all', 'de', 'en'])

9999 setting.parse('xx')

100− self.assertEquals(setting.get_value(), 'en')

100+ self.assertEquals(setting.get_value(), 'all')

101101

102102 def test_lang_setting_old_cookie_choice(self):

103− setting = SearchLanguageSetting('en', choices=['en', 'es', 'es-ES'])

103+ setting = SearchLanguageSetting('all', choices=['all', 'es', 'es-ES'])

104104 setting.parse('es_XA')

105105 self.assertEquals(setting.get_value(), 'es')

106106

107107 def test_lang_setting_old_cookie_format(self):

108− setting = SearchLanguageSetting('en', choices=['en', 'es', 'es-ES'])

108+ setting = SearchLanguageSetting('all', choices=['all', 'es', 'es-ES'])

109109 setting.parse('es_ES')

110110 self.assertEquals(setting.get_value(), 'es-ES')

111111

112− def test_lang_setting_old_default(self):

113− setting = SearchLanguageSetting('en', choices=['en', 'es', 'de'])

114− setting.parse('all')

115− self.assertEquals(setting.get_value(), 'en')

116−

117112 # plugins settings

118113 def test_plugins_setting_all_default_enabled(self):

119114 plugin1 = PluginStub('plugin1', True)