diff options
Diffstat (limited to 'searx/search/processors')
| -rw-r--r-- | searx/search/processors/abstract.py | 7 | ||||
| -rw-r--r-- | searx/search/processors/online.py | 16 | ||||
| -rw-r--r-- | searx/search/processors/online_currency.py | 3 | ||||
| -rw-r--r-- | searx/search/processors/online_dictionary.py | 4 | ||||
| -rw-r--r-- | searx/search/processors/online_url_search.py | 3 |
5 files changed, 32 insertions, 1 deletions
diff --git a/searx/search/processors/abstract.py b/searx/search/processors/abstract.py index d4822fc56..d74616db0 100644 --- a/searx/search/processors/abstract.py +++ b/searx/search/processors/abstract.py @@ -138,6 +138,13 @@ class EngineProcessor(ABC): return False def get_params(self, search_query, engine_category): + """Returns a set of *request params* or ``None`` if request is not supported. + + Not supported conditions (``None`` is returned): + + - A page-number > 1 when engine does not support paging. + - A time range when the engine does not support time range. + """ # if paging is not supported, skip if search_query.pageno > 1 and not self.engine.paging: return None diff --git a/searx/search/processors/online.py b/searx/search/processors/online.py index 8d8275df1..17e9b6a96 100644 --- a/searx/search/processors/online.py +++ b/searx/search/processors/online.py @@ -60,6 +60,17 @@ class OnlineProcessor(EngineProcessor): # add an user agent params['headers']['User-Agent'] = gen_useragent() + # add Accept-Language header + if self.engine.send_accept_language_header and search_query.locale: + ac_lang = search_query.locale.language + if search_query.locale.territory: + ac_lang = "%s-%s,%s;q=0.9,*;q=0.5" % ( + search_query.locale.language, + search_query.locale.territory, + search_query.locale.language, + ) + params['headers']['Accept-Language'] = ac_lang + return params def _send_http_request(self, params): @@ -162,6 +173,11 @@ class OnlineProcessor(EngineProcessor): self.handle_exception(result_container, e, suspend=True) self.logger.exception('CAPTCHA') except SearxEngineTooManyRequestsException as e: + if "google" in self.engine_name: + self.logger.warn( + "Set to 'true' the use_mobile_ui parameter in the 'engines:'" + " section of your settings.yml file if google is blocked for you." + ) self.handle_exception(result_container, e, suspend=True) self.logger.exception('Too many requests') except SearxEngineAccessDeniedException as e: diff --git a/searx/search/processors/online_currency.py b/searx/search/processors/online_currency.py index 6bd891b1d..92398239f 100644 --- a/searx/search/processors/online_currency.py +++ b/searx/search/processors/online_currency.py @@ -38,6 +38,9 @@ class OnlineCurrencyProcessor(OnlineProcessor): engine_type = 'online_currency' def get_params(self, search_query, engine_category): + """Returns a set of *request params* or ``None`` if search query does not match + to :py:obj:`parser_re`.""" + params = super().get_params(search_query, engine_category) if params is None: return None diff --git a/searx/search/processors/online_dictionary.py b/searx/search/processors/online_dictionary.py index 3e7f6ed59..fbfc9df8e 100644 --- a/searx/search/processors/online_dictionary.py +++ b/searx/search/processors/online_dictionary.py @@ -9,7 +9,7 @@ import re from searx.utils import is_valid_lang from .online import OnlineProcessor -parser_re = re.compile('.*?([a-z]+)-([a-z]+) ([^ ]+)$', re.I) +parser_re = re.compile('.*?([a-z]+)-([a-z]+) (.+)$', re.I) class OnlineDictionaryProcessor(OnlineProcessor): @@ -18,6 +18,8 @@ class OnlineDictionaryProcessor(OnlineProcessor): engine_type = 'online_dictionary' def get_params(self, search_query, engine_category): + """Returns a set of *request params* or ``None`` if search query does not match + to :py:obj:`parser_re`.""" params = super().get_params(search_query, engine_category) if params is None: return None diff --git a/searx/search/processors/online_url_search.py b/searx/search/processors/online_url_search.py index 2863be28e..6383fa37f 100644 --- a/searx/search/processors/online_url_search.py +++ b/searx/search/processors/online_url_search.py @@ -20,6 +20,9 @@ class OnlineUrlSearchProcessor(OnlineProcessor): engine_type = 'online_url_search' def get_params(self, search_query, engine_category): + """Returns a set of *request params* or ``None`` if search query does not match + to at least one of :py:obj:`re_search_urls`. + """ params = super().get_params(search_query, engine_category) if params is None: return None |