Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b6ffed0 authored by Marc Abonce Seguin's avatar Marc Abonce Seguin
Browse files

fix fetch_languages for bing 

Bing has a list of regions that it supports and some of these regions
may have more than one possible language.

In some cases, like Switzerland, these languages are always shown as
options, so there is no issue. But in other cases, like Andorra, Bing
will only show one language at the time, either the region's default or
the request's language if the latter is supported by that region.

For example, if the HTTP request is in French, Andorra will appear as
fr-AD but if the same page is requested in any other language Andorra
will appear as ca-AD.

This is specially a problem when Bing assumes that the request is in
English because it overrides enough language codes to make several major
languages like Arabic dissappear from the languages.py file.

To avoid that issue, I set the Accept-Language header to a language
that's only supported in one region to hopefully avoid these overrides.
parent 728e0967

searx/engines/__init__.py

+6 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ from searx import settings 
from searx import logger

from searx.data import ENGINES_LANGUAGES

from searx.poolrequests import get, get_proxy_cycles

from searx.utils import load_module, match_language, get_engine_from_settings

from searx.utils import load_module, match_language, get_engine_from_settings, gen_useragent





logger = logger.getChild('engines')
@@ -131,8 +131,12 @@ def load_engine(engine_data): 


    # assign language fetching method if auxiliary method exists

    if hasattr(engine, '_fetch_supported_languages'):

        headers = {

            'User-Agent': gen_useragent(),

            'Accept-Language': 'ja-JP,ja;q=0.8,en-US;q=0.5,en;q=0.3',  # bing needs a non-English language

        }

        setattr(engine, 'fetch_supported_languages',

                lambda: engine._fetch_supported_languages(get(engine.supported_languages_url)))

                lambda: engine._fetch_supported_languages(get(engine.supported_languages_url, headers=headers)))



    engine.stats = {

        'sent_search_count': 0,  # sent search