diff options
Diffstat (limited to 'searx/engines')
36 files changed, 17 insertions, 108 deletions
diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py index d7defe0b4..154cd605f 100644 --- a/searx/engines/__init__.py +++ b/searx/engines/__init__.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """This module implements the engine loader. Load and initialize the ``engines``, see :py:func:`load_engines` and register @@ -111,6 +110,7 @@ def load_engine(engine_data): if is_missing_required_attributes(engine): return None + engine.logger = logger.getChild(engine_name) return engine diff --git a/searx/engines/apkmirror.py b/searx/engines/apkmirror.py index 855d19739..746a8cd9c 100644 --- a/searx/engines/apkmirror.py +++ b/searx/engines/apkmirror.py @@ -3,20 +3,17 @@ """APKMirror """ -# pylint: disable=invalid-name, missing-function-docstring +# pylint: disable=invalid-name from urllib.parse import urlencode from lxml import html -from searx import logger from searx.utils import ( eval_xpath_list, eval_xpath_getindex, extract_text, ) -logger = logger.getChild('APKMirror engine') - about = { "website": 'https://www.apkmirror.com', "wikidata_id": None, diff --git a/searx/engines/artic.py b/searx/engines/artic.py index 44af4ebd5..104ab8839 100644 --- a/searx/engines/artic.py +++ b/searx/engines/artic.py @@ -8,14 +8,9 @@ Explore thousands of artworks from The Art Institute of Chicago. """ -# pylint: disable=missing-function-docstring - from json import loads from urllib.parse import urlencode -from searx import logger -logger = logger.getChild('APKMirror engine') - about = { "website": 'https://www.artic.edu', "wikidata_id": 'Q239303', diff --git a/searx/engines/bing.py b/searx/engines/bing.py index f849cef92..9cac3e926 100644 --- a/searx/engines/bing.py +++ b/searx/engines/bing.py @@ -6,11 +6,8 @@ import re from urllib.parse import urlencode from lxml import html -from searx import logger from searx.utils import eval_xpath, extract_text, match_language -logger = logger.getChild('bing engine') - # about about = { "website": 'https://www.bing.com', diff --git a/searx/engines/core.py b/searx/engines/core.py index 0d9724695..e83c8bbe9 100644 --- a/searx/engines/core.py +++ b/searx/engines/core.py @@ -3,17 +3,13 @@ """CORE (science) """ -# pylint: disable=missing-function-docstring from json import loads from datetime import datetime from urllib.parse import urlencode -from searx import logger from searx.exceptions import SearxEngineAPIException -logger = logger.getChild('CORE engine') - about = { "website": 'https://core.ac.uk', "wikidata_id": 'Q22661180', @@ -29,8 +25,6 @@ nb_per_page = 10 api_key = 'unset' -logger = logger.getChild('CORE engine') - base_url = 'https://core.ac.uk:443/api-v2/search/' search_string = '{query}?page={page}&pageSize={nb_per_page}&apiKey={apikey}' diff --git a/searx/engines/deviantart.py b/searx/engines/deviantart.py index 21d56831c..b13d54dd5 100644 --- a/searx/engines/deviantart.py +++ b/searx/engines/deviantart.py @@ -3,7 +3,6 @@ """ Deviantart (Images) """ -# pylint: disable=missing-function-docstring from urllib.parse import urlencode from lxml import html diff --git a/searx/engines/digg.py b/searx/engines/digg.py index 5c6fb3875..e12cc43c8 100644 --- a/searx/engines/digg.py +++ b/searx/engines/digg.py @@ -3,7 +3,6 @@ """ Digg (News, Social media) """ -# pylint: disable=missing-function-docstring from json import loads from urllib.parse import urlencode diff --git a/searx/engines/docker_hub.py b/searx/engines/docker_hub.py index d9d0f745b..e69f677b3 100644 --- a/searx/engines/docker_hub.py +++ b/searx/engines/docker_hub.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """Docker Hub (IT) """ diff --git a/searx/engines/duckduckgo_definitions.py b/searx/engines/duckduckgo_definitions.py index a9098de65..3ef043964 100644 --- a/searx/engines/duckduckgo_definitions.py +++ b/searx/engines/duckduckgo_definitions.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """DuckDuckGo (Instant Answer API) """ @@ -9,15 +8,12 @@ import json from urllib.parse import urlencode, urlparse, urljoin from lxml import html -from searx import logger from searx.data import WIKIDATA_UNITS from searx.engines.duckduckgo import language_aliases from searx.engines.duckduckgo import _fetch_supported_languages, supported_languages_url # NOQA # pylint: disable=unused-import from searx.utils import extract_text, html_to_text, match_language, get_string_replaces_function from searx.external_urls import get_external_url, get_earth_coordinates_url, area_to_osm_zoom -logger = logger.getChild('duckduckgo_definitions') - # about about = { "website": 'https://duckduckgo.com/', @@ -67,7 +63,7 @@ def request(query, params): params['url'] = URL.format(query=urlencode({'q': query})) language = match_language( params['language'], - supported_languages, # pylint: disable=undefined-variable + supported_languages, language_aliases ) language = language.split('-')[0] diff --git a/searx/engines/flickr_noapi.py b/searx/engines/flickr_noapi.py index a07aad51e..1d670ee50 100644 --- a/searx/engines/flickr_noapi.py +++ b/searx/engines/flickr_noapi.py @@ -7,11 +7,8 @@ from json import loads from time import time import re from urllib.parse import urlencode -from searx.engines import logger from searx.utils import ecma_unescape, html_to_text -logger = logger.getChild('flickr-noapi') - # about about = { "website": 'https://www.flickr.com', diff --git a/searx/engines/genius.py b/searx/engines/genius.py index 9d701a8de..b0fcb09a8 100644 --- a/searx/engines/genius.py +++ b/searx/engines/genius.py @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=invalid-name, missing-function-docstring +# pylint: disable=invalid-name """Genius """ @@ -9,9 +9,6 @@ from json import loads from urllib.parse import urlencode from datetime import datetime -from searx import logger -logger = logger.getChild('genius engine') - # about about = { "website": 'https://genius.com/', diff --git a/searx/engines/gigablast.py b/searx/engines/gigablast.py index d1c2639af..c2c51afe8 100644 --- a/searx/engines/gigablast.py +++ b/searx/engines/gigablast.py @@ -3,12 +3,11 @@ """ Gigablast (Web) """ -# pylint: disable=missing-function-docstring, invalid-name +# pylint: disable=invalid-name import re from json import loads from urllib.parse import urlencode -# from searx import logger from searx.network import get # about diff --git a/searx/engines/google.py b/searx/engines/google.py index e1caabb12..4e6fa6190 100644 --- a/searx/engines/google.py +++ b/searx/engines/google.py @@ -25,16 +25,11 @@ The google WEB engine itself has a special setup option: """ -# pylint: disable=invalid-name, missing-function-docstring - from urllib.parse import urlencode from lxml import html -from searx import logger from searx.utils import match_language, extract_text, eval_xpath, eval_xpath_list, eval_xpath_getindex from searx.exceptions import SearxEngineCaptchaException -logger = logger.getChild('google engine') - # about about = { "website": 'https://www.google.com', @@ -280,7 +275,6 @@ def request(query, params): offset = (params['pageno'] - 1) * 10 lang_info = get_lang_info( - # pylint: disable=undefined-variable params, supported_languages, language_aliases, True ) diff --git a/searx/engines/google_images.py b/searx/engines/google_images.py index f4fbbaa42..ffdd6675e 100644 --- a/searx/engines/google_images.py +++ b/searx/engines/google_images.py @@ -16,7 +16,6 @@ from urllib.parse import urlencode, unquote from lxml import html -from searx import logger from searx.utils import ( eval_xpath, eval_xpath_list, @@ -37,8 +36,6 @@ from searx.engines.google import ( ) # pylint: enable=unused-import -logger = logger.getChild('google images') - # about about = { "website": 'https://images.google.com', @@ -95,7 +92,6 @@ def request(query, params): """Google-Video search request""" lang_info = get_lang_info( - # pylint: disable=undefined-variable params, supported_languages, language_aliases, False ) logger.debug( diff --git a/searx/engines/google_news.py b/searx/engines/google_news.py index e6d50855e..87ac9a19d 100644 --- a/searx/engines/google_news.py +++ b/searx/engines/google_news.py @@ -11,7 +11,7 @@ ignores some parameters from the common :ref:`google API`: """ -# pylint: disable=invalid-name, missing-function-docstring +# pylint: disable=invalid-name import binascii from datetime import datetime @@ -20,7 +20,6 @@ from urllib.parse import urlencode from base64 import b64decode from lxml import html -from searx import logger from searx.utils import ( eval_xpath, eval_xpath_list, @@ -50,8 +49,6 @@ about = { "results": 'HTML', } -logger = logger.getChild('google news') - # compared to other google engines google-news has a different time range # support. The time range is included in the search term. time_range_dict = { @@ -78,7 +75,6 @@ def request(query, params): """Google-News search request""" lang_info = get_lang_info( - # pylint: disable=undefined-variable params, supported_languages, language_aliases, False ) logger.debug( diff --git a/searx/engines/google_scholar.py b/searx/engines/google_scholar.py index 8442a7bfa..e6726463d 100644 --- a/searx/engines/google_scholar.py +++ b/searx/engines/google_scholar.py @@ -9,12 +9,11 @@ Definitions`_. https://developers.google.com/custom-search/docs/xml_results#WebSearch_Query_Parameter_Definitions """ -# pylint: disable=invalid-name, missing-function-docstring +# pylint: disable=invalid-name from urllib.parse import urlencode from datetime import datetime from lxml import html -from searx import logger from searx.utils import ( eval_xpath, @@ -53,8 +52,6 @@ use_locale_domain = True time_range_support = True safesearch = False -logger = logger.getChild('google scholar') - def time_range_url(params): """Returns a URL query component for a google-Scholar time range based on ``params['time_range']``. Google-Scholar does only support ranges in years. @@ -76,7 +73,6 @@ def request(query, params): offset = (params['pageno'] - 1) * 10 lang_info = get_lang_info( - # pylint: disable=undefined-variable params, supported_languages, language_aliases, False ) logger.debug( diff --git a/searx/engines/google_videos.py b/searx/engines/google_videos.py index 3990d5b32..9403ef4f7 100644 --- a/searx/engines/google_videos.py +++ b/searx/engines/google_videos.py @@ -14,13 +14,12 @@ """ -# pylint: disable=invalid-name, missing-function-docstring +# pylint: disable=invalid-name import re from urllib.parse import urlencode from lxml import html -from searx import logger from searx.utils import ( eval_xpath, eval_xpath_list, @@ -59,8 +58,6 @@ about = { "results": 'HTML', } -logger = logger.getChild('google video') - # engine dependent config categories = ['videos'] @@ -113,7 +110,6 @@ def request(query, params): """Google-Video search request""" lang_info = get_lang_info( - # pylint: disable=undefined-variable params, supported_languages, language_aliases, False ) logger.debug( diff --git a/searx/engines/mediathekviewweb.py b/searx/engines/mediathekviewweb.py index 80104ae73..bd7c16a5d 100644 --- a/searx/engines/mediathekviewweb.py +++ b/searx/engines/mediathekviewweb.py @@ -4,8 +4,6 @@ """ -# pylint: disable=missing-function-docstring - import datetime from json import loads, dumps diff --git a/searx/engines/meilisearch.py b/searx/engines/meilisearch.py index d0d304e2a..c41d23eb4 100644 --- a/searx/engines/meilisearch.py +++ b/searx/engines/meilisearch.py @@ -4,7 +4,7 @@ Meilisearch """ -# pylint: disable=global-statement, missing-function-docstring +# pylint: disable=global-statement from json import loads, dumps diff --git a/searx/engines/mongodb.py b/searx/engines/mongodb.py index 1f24c5acf..2ebb90539 100644 --- a/searx/engines/mongodb.py +++ b/searx/engines/mongodb.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """MongoDB engine (Offline) """ diff --git a/searx/engines/mysql_server.py b/searx/engines/mysql_server.py index 42b436f5e..be89eb86e 100644 --- a/searx/engines/mysql_server.py +++ b/searx/engines/mysql_server.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """MySQL database (offline) """ diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py index 6920356c3..78c15320a 100644 --- a/searx/engines/openstreetmap.py +++ b/searx/engines/openstreetmap.py @@ -3,7 +3,6 @@ """OpenStreetMap (Map) """ -# pylint: disable=missing-function-docstring import re from json import loads @@ -439,3 +438,8 @@ def get_key_label(key_name, lang): if labels is None: return None return get_label(labels, lang) + + +def init(_): + import searx.engines.wikidata # pylint: disable=import-outside-toplevel + searx.engines.wikidata.logger = logger diff --git a/searx/engines/peertube.py b/searx/engines/peertube.py index 058065c03..f9cd50be1 100644 --- a/searx/engines/peertube.py +++ b/searx/engines/peertube.py @@ -34,7 +34,6 @@ def request(query, params): search_url = sanitized_url + "/api/v1/search/videos/?pageno={pageno}&{query}" query_dict = {"search": query} language = params["language"].split("-")[0] - # pylint: disable=undefined-variable if "all" != language and language in supported_languages: query_dict["languageOneOf"] = language params["url"] = search_url.format( diff --git a/searx/engines/postgresql.py b/searx/engines/postgresql.py index eb4e9b0b4..1eddcd519 100644 --- a/searx/engines/postgresql.py +++ b/searx/engines/postgresql.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """PostgreSQL database (offline) """ diff --git a/searx/engines/qwant.py b/searx/engines/qwant.py index 8d03d8324..18e6a65d8 100644 --- a/searx/engines/qwant.py +++ b/searx/engines/qwant.py @@ -89,7 +89,6 @@ def request(query, params): else: language = match_language( params['language'], - # pylint: disable=undefined-variable supported_languages, language_aliases, ) diff --git a/searx/engines/redis_server.py b/searx/engines/redis_server.py index e8c248e32..a48f0775b 100644 --- a/searx/engines/redis_server.py +++ b/searx/engines/redis_server.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """Redis engine (offline) """ diff --git a/searx/engines/solidtorrents.py b/searx/engines/solidtorrents.py index 4ed6167d0..7fbef9190 100644 --- a/searx/engines/solidtorrents.py +++ b/searx/engines/solidtorrents.py @@ -4,13 +4,8 @@ """ -# pylint: disable=missing-function-docstring - from json import loads from urllib.parse import urlencode -from searx import logger - -logger = logger.getChild('solidtor engine') about = { "website": 'https://www.solidtorrents.net/', diff --git a/searx/engines/solr.py b/searx/engines/solr.py index e38a103a9..e26f19442 100644 --- a/searx/engines/solr.py +++ b/searx/engines/solr.py @@ -4,7 +4,7 @@ Solr """ -# pylint: disable=global-statement, missing-function-docstring +# pylint: disable=global-statement from json import loads from urllib.parse import urlencode diff --git a/searx/engines/soundcloud.py b/searx/engines/soundcloud.py index a6f923855..d5bfc0f6f 100644 --- a/searx/engines/soundcloud.py +++ b/searx/engines/soundcloud.py @@ -8,7 +8,6 @@ from json import loads from lxml import html from dateutil import parser from urllib.parse import quote_plus, urlencode -from searx import logger from searx.network import get as http_get # about diff --git a/searx/engines/springer.py b/searx/engines/springer.py index 77a82016b..246e59b44 100644 --- a/searx/engines/springer.py +++ b/searx/engines/springer.py @@ -4,17 +4,12 @@ """ -# pylint: disable=missing-function-docstring - from datetime import datetime from json import loads from urllib.parse import urlencode -from searx import logger from searx.exceptions import SearxEngineAPIException -logger = logger.getChild('Springer Nature engine') - about = { "website": 'https://www.springernature.com/', "wikidata_id": 'Q21096327', diff --git a/searx/engines/sqlite.py b/searx/engines/sqlite.py index 84db74d62..292448602 100644 --- a/searx/engines/sqlite.py +++ b/searx/engines/sqlite.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """SQLite database (Offline) @@ -9,11 +8,6 @@ import sqlite3 import contextlib -from searx import logger - - -logger = logger.getChild('SQLite engine') - engine_type = 'offline' database = "" query_str = "" diff --git a/searx/engines/unsplash.py b/searx/engines/unsplash.py index 834bc917c..1445b4cec 100644 --- a/searx/engines/unsplash.py +++ b/searx/engines/unsplash.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """Unsplash """ @@ -8,9 +7,6 @@ from urllib.parse import urlencode, urlparse, urlunparse, parse_qsl from json import loads -from searx import logger - -logger = logger.getChild('unsplash engine') # about about = { "website": 'https://unsplash.com', diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py index ddcce9085..f0dfc7595 100644 --- a/searx/engines/wikidata.py +++ b/searx/engines/wikidata.py @@ -10,15 +10,12 @@ from json import loads from dateutil.parser import isoparse from babel.dates import format_datetime, format_date, format_time, get_datetime_format -from searx import logger from searx.data import WIKIDATA_UNITS from searx.network import post, get from searx.utils import match_language, searx_useragent, get_string_replaces_function from searx.external_urls import get_external_url, get_earth_coordinates_url, area_to_osm_zoom from searx.engines.wikipedia import _fetch_supported_languages, supported_languages_url # NOQA # pylint: disable=unused-import -logger = logger.getChild('wikidata') - # about about = { "website": 'https://wikidata.org/', diff --git a/searx/engines/wordnik.py b/searx/engines/wordnik.py index 4bfeb4070..0c3785cfb 100644 --- a/searx/engines/wordnik.py +++ b/searx/engines/wordnik.py @@ -4,12 +4,9 @@ """ from lxml.html import fromstring -from searx import logger from searx.utils import extract_text from searx.network import raise_for_httperror -logger = logger.getChild('Wordnik engine') - # about about = { "website": 'https://www.wordnik.com', diff --git a/searx/engines/xpath.py b/searx/engines/xpath.py index 0f88fb29a..8338d5301 100644 --- a/searx/engines/xpath.py +++ b/searx/engines/xpath.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # lint: pylint -# pylint: disable=missing-function-docstring """The XPath engine is a *generic* engine with which it is possible to configure engines in the settings. @@ -23,9 +22,6 @@ from urllib.parse import urlencode from lxml import html from searx.utils import extract_text, extract_url, eval_xpath, eval_xpath_list -from searx import logger - -logger = logger.getChild('XPath engine') search_url = None """ @@ -187,7 +183,7 @@ def response(resp): ''' results = [] dom = html.fromstring(resp.text) - is_onion = 'onions' in categories # pylint: disable=undefined-variable + is_onion = 'onions' in categories if results_xpath: for result in eval_xpath_list(dom, results_xpath): diff --git a/searx/engines/yahoo_news.py b/searx/engines/yahoo_news.py index 98d8bc9f1..ec07cd408 100644 --- a/searx/engines/yahoo_news.py +++ b/searx/engines/yahoo_news.py @@ -6,7 +6,7 @@ Yahoo News is "English only" and do not offer localized nor language queries. """ -# pylint: disable=invalid-name, missing-function-docstring +# pylint: disable=invalid-name import re from urllib.parse import urlencode @@ -14,7 +14,6 @@ from datetime import datetime, timedelta from dateutil import parser from lxml import html -from searx import logger from searx.utils import ( eval_xpath_list, eval_xpath_getindex, @@ -23,8 +22,6 @@ from searx.utils import ( from searx.engines.yahoo import parse_url -logger = logger.getChild('yahoo_news engine') - # about about = { "website": 'https://news.yahoo.com', |