diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2023-06-25 12:37:31 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarIT.de> | 2023-06-25 13:58:26 +0200 |
| commit | e8706fb738da9feb21e596f403dddb40e69c8a7b (patch) | |
| tree | 1ddf3dbd2860d65de879d9feecf7df01a7727680 /searx/engines/peertube.py | |
| parent | 2e4a435134e0f677fbe24853dd81453a54770674 (diff) | |
[fix] engine & network issues / documentation and type annotations
This patch fixes some quirks and issues related to the engines and the network.
Each engine has its own network and this network was broken for the following
engines[1]:
- archlinux
- bing
- dailymotion
- duckduckgo
- google
- peertube
- startpage
- wikipedia
Since the files have been touched anyway, the type annotaions of the engine
modules has also been completed so that error messages from the type checker are
no longer reported.
Related and (partial) fixed issue:
- [1] https://github.com/searxng/searxng/issues/762#issuecomment-1605323861
- [2] https://github.com/searxng/searxng/issues/2513
- [3] https://github.com/searxng/searxng/issues/2515
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'searx/engines/peertube.py')
| -rw-r--r-- | searx/engines/peertube.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/searx/engines/peertube.py b/searx/engines/peertube.py index 87b386d7a..d0eba6b88 100644 --- a/searx/engines/peertube.py +++ b/searx/engines/peertube.py @@ -13,7 +13,7 @@ from dateutil.relativedelta import relativedelta import babel -from searx import network +from searx.network import get # see https://github.com/searxng/searxng/issues/762 from searx.locales import language_tag from searx.utils import html_to_text from searx.enginelib.traits import EngineTraits @@ -147,32 +147,30 @@ def fetch_traits(engine_traits: EngineTraits): https://framagit.org/framasoft/peertube/search-index/-/commit/8ed5c729#3d8747f9a60695c367c70bb64efba8f403721fad_0_291 """ - resp = network.get( + resp = get( 'https://framagit.org/framasoft/peertube/search-index/-/raw/master/client/src/components/Filters.vue', # the response from search-index repository is very slow timeout=60, ) - if not resp.ok: + if not resp.ok: # type: ignore print("ERROR: response from peertube is not OK.") return - js_lang = re.search(r"videoLanguages \(\)[^\n]+(.*?)\]", resp.text, re.DOTALL) + js_lang = re.search(r"videoLanguages \(\)[^\n]+(.*?)\]", resp.text, re.DOTALL) # type: ignore if not js_lang: print("ERROR: can't determine languages from peertube") return for lang in re.finditer(r"\{ id: '([a-z]+)', label:", js_lang.group(1)): + eng_tag = lang.group(1) + if eng_tag == 'oc': + # Occitanis not known by babel, its closest relative is Catalan + # but 'ca' is already in the list of engine_traits.languages --> + # 'oc' will be ignored. + continue try: - eng_tag = lang.group(1) - if eng_tag == 'oc': - # Occitanis not known by babel, its closest relative is Catalan - # but 'ca' is already in the list of engine_traits.languages --> - # 'oc' will be ignored. - continue - sxng_tag = language_tag(babel.Locale.parse(eng_tag)) - except babel.UnknownLocaleError: print("ERROR: %s is unknown by babel" % eng_tag) continue |