Merge 443fcc7233 into fa4dfd4efe

.github/workflows/integration.yml

@@ -45,6 +45,14 @@ jobs:
         make V=1 gecko.driver
     - name: Run tests
       run: make V=1 ci.test
+    - name: Test coverage
+      run: make V=1 test.coverage
+    - name: Store coverage result
+      uses: actions/upload-artifact@v3
+      with:
+        name: coverage-${{ matrix.python-version }}
+        path: coverage/
+        retention-days: 60
 
   themes:
     name: Themes

searx/engines/annas_archive.py

@@ -34,10 +34,10 @@ Implementations
 """
 
 from typing import List, Dict, Any, Optional
-from urllib.parse import urlencode
+from urllib.parse import quote
 from lxml import html
 
-from searx.utils import extract_text, eval_xpath, eval_xpath_getindex, eval_xpath_list
+from searx.utils import extract_text, eval_xpath, eval_xpath_list
 from searx.enginelib.traits import EngineTraits
 from searx.data import ENGINE_TRAITS
 
@@ -53,7 +53,7 @@ about: Dict[str, Any] = {
 
 # engine dependent config
 categories: List[str] = ["files"]
-paging: bool = True
+paging: bool = False
 
 # search-url
 base_url: str = "https://annas-archive.org"
@@ -99,18 +99,9 @@ def init(engine_settings=None):  # pylint: disable=unused-argument
 
 
 def request(query, params: Dict[str, Any]) -> Dict[str, Any]:
+    q = quote(query)
     lang = traits.get_language(params["language"], traits.all_locale)  # type: ignore
-    args = {
+    params["url"] = base_url + f"/search?lang={lang or ''}&content={aa_content}&ext={aa_ext}&sort={aa_sort}&q={q}"
-        'lang': lang,
-        'content': aa_content,
-        'ext': aa_ext,
-        'sort': aa_sort,
-        'q': query,
-        'page': params['pageno'],
-    }
-    # filter out None and empty values
-    filtered_args = dict((k, v) for k, v in args.items() if v)
-    params["url"] = f"{base_url}/search?{urlencode(filtered_args)}"
     return params
 
 
@@ -137,12 +128,12 @@ def response(resp) -> List[Dict[str, Optional[str]]]:
 def _get_result(item):
     return {
         'template': 'paper.html',
-        'url': base_url + extract_text(eval_xpath_getindex(item, './@href', 0)),
+        'url': base_url + item.xpath('./@href')[0],
         'title': extract_text(eval_xpath(item, './/h3/text()[1]')),
         'publisher': extract_text(eval_xpath(item, './/div[contains(@class, "text-sm")]')),
         'authors': [extract_text(eval_xpath(item, './/div[contains(@class, "italic")]'))],
         'content': extract_text(eval_xpath(item, './/div[contains(@class, "text-xs")]')),
-        'thumbnail': extract_text(eval_xpath_getindex(item, './/img/@src', 0, default=None), allow_none=True),
+        'thumbnail': item.xpath('.//img/@src')[0],
     }
 
 

searx/engines/google.py

@@ -62,7 +62,7 @@ filter_mapping = {0: 'off', 1: 'medium', 2: 'high'}
 results_xpath = './/div[contains(@jscontroller, "SC7lYd")]'
 title_xpath = './/a/h3[1]'
 href_xpath = './/a[h3]/@href'
-content_xpath = './/div[contains(@data-sncf, "1")]'
+content_xpath = './/div[@data-sncf="1"]'
 
 # Suggestions are links placed in a *card-section*, we extract only the text
 # from the links not the links itself.

searx/translations/es/LC_MESSAGES/messages.po

@@ -39,7 +39,7 @@ msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-10-26 21:13+0000\n"
+"PO-Revision-Date: 2024-10-06 14:31+0000\n"
 "Last-Translator: Atul_Eterno <Atul_Eterno@users.noreply.translate.codeberg."
 "org>\n"
 "Language-Team: Spanish <https://translate.codeberg.org/projects/searxng/"
@@ -49,7 +49,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8.1\n"
+"X-Generator: Weblate 5.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -155,7 +155,7 @@ msgstr "preguntas y respuestas"
 #. CATEGORY_GROUPS['REPOS']
 #: searx/searxng.msg
 msgid "repos"
-msgstr "repositorios"
+msgstr "repos"
 
 #. CATEGORY_GROUPS['SOFTWARE_WIKIS']
 #: searx/searxng.msg

searx/translations/nl/LC_MESSAGES/messages.po

@@ -22,14 +22,13 @@
 # MVDW-Java <MVDW-Java@users.noreply.translate.codeberg.org>, 2024.
 # notlmutsaers <notlmutsaers@users.noreply.translate.codeberg.org>, 2024.
 # return42 <return42@users.noreply.translate.codeberg.org>, 2024.
-# ljansen <ljansen@users.noreply.translate.codeberg.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-10-28 21:07+0000\n"
+"PO-Revision-Date: 2024-10-15 12:18+0000\n"
-"Last-Translator: ljansen <ljansen@users.noreply.translate.codeberg.org>\n"
+"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
 "Language-Team: Dutch <https://translate.codeberg.org/projects/searxng/"
 "searxng/nl/>\n"
 "Language: nl\n"
@@ -37,7 +36,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8.1\n"
+"X-Generator: Weblate 5.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -465,7 +464,7 @@ msgstr "Bereken {functions} van de opties"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr "Synoniemen"
+msgstr ""
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -1235,13 +1234,12 @@ msgid "Max time"
 msgstr "Max. duur"
 
 #: searx/templates/simple/preferences/favicon.html:2
-#, fuzzy
 msgid "Favicon Resolver"
-msgstr "favicon-resolver"
+msgstr ""
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr "Vertoon zoekresultaten naast favicons"
+msgstr ""
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""

searx/translations/pl/LC_MESSAGES/messages.po

@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-10-28 21:07+0000\n"
+"PO-Revision-Date: 2024-10-15 12:18+0000\n"
-"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n"
+"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
 "Language-Team: Polish <https://translate.codeberg.org/projects/searxng/"
 "searxng/pl/>\n"
 "Language: pl\n"
@@ -34,7 +34,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && ("
 "n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
 "n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-"X-Generator: Weblate 5.8.1\n"
+"X-Generator: Weblate 5.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -1230,7 +1230,7 @@ msgstr "Maksymalny czas"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr "Pobieranie favikony"
+msgstr ""
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"

searx/translations/pt/LC_MESSAGES/messages.po

@@ -19,14 +19,13 @@
 # gvlx <gvlx@users.noreply.translate.codeberg.org>, 2024.
 # ds451 <ds451@users.noreply.translate.codeberg.org>, 2024.
 # Pedro_Tresp <Pedro_Tresp@users.noreply.translate.codeberg.org>, 2024.
-# saltsnorter <saltsnorter@users.noreply.translate.codeberg.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-10-29 05:54+0000\n"
+"PO-Revision-Date: 2024-10-13 23:26+0000\n"
-"Last-Translator: saltsnorter <saltsnorter@users.noreply.translate.codeberg."
+"Last-Translator: Pedro_Tresp <Pedro_Tresp@users.noreply.translate.codeberg."
 "org>\n"
 "Language-Team: Portuguese <https://translate.codeberg.org/projects/searxng/"
 "searxng/pt/>\n"
@@ -35,7 +34,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 5.8.1\n"
+"X-Generator: Weblate 5.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -176,7 +175,7 @@ msgstr "escuro"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr "preto"
+msgstr ""
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -1229,11 +1228,11 @@ msgstr "Tempo máximo"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr "Solucionador do Favicon"
+msgstr ""
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr "Monstra os favicons nos proximos os resultados"
+msgstr ""
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""

searx/translations/pt_BR/LC_MESSAGES/messages.po

@@ -30,14 +30,13 @@
 # Pyrbor <Pyrbor@users.noreply.translate.codeberg.org>, 2024.
 # rodgui <rodgui@users.noreply.translate.codeberg.org>, 2024.
 # rafablog77 <rafablog77@users.noreply.translate.codeberg.org>, 2024.
-# Juno Takano <jutty@users.noreply.translate.codeberg.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-10-31 12:16+0000\n"
+"PO-Revision-Date: 2024-10-15 12:18+0000\n"
-"Last-Translator: Juno Takano <jutty@users.noreply.translate.codeberg.org>\n"
+"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
 "Language-Team: Portuguese (Brazil) <https://translate.codeberg.org/projects/"
 "searxng/searxng/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -45,7 +44,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.8.1\n"
+"X-Generator: Weblate 5.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -186,7 +185,7 @@ msgstr "escuro"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr "preto"
+msgstr ""
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -473,7 +472,7 @@ msgstr "Computar {functions} dos argumentos"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr "Sinônimos"
+msgstr ""
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -1244,7 +1243,7 @@ msgstr "Tempo máximo"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr "Resolvedor de Favicons"
+msgstr ""
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"

searx/translations/vi/LC_MESSAGES/messages.po

@@ -12,19 +12,19 @@
 # tvminh19 <tvminh19@users.noreply.translate.codeberg.org>, 2024.
 msgid ""
 msgstr ""
-"Project-Id-Version: searx\n"
+"Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-10-26 21:13+0000\n"
+"PO-Revision-Date: 2024-08-07 01:02+0000\n"
-"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
+"Last-Translator: tvminh19 <tvminh19@users.noreply.translate.codeberg.org>"
-"Language-Team: Vietnamese <https://translate.codeberg.org/projects/searxng/"
+"\n"
-"searxng/vi/>\n"
 "Language: vi\n"
+"Language-Team: Vietnamese "
+"<https://translate.codeberg.org/projects/searxng/searxng/vi/>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8.1\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -186,7 +186,7 @@ msgstr "Nhiệt độ trung bình."
 #. WEATHER_TERMS['CLOUD COVER']
 #: searx/engines/open_meteo.py:91 searx/searxng.msg
 msgid "Cloud cover"
-msgstr "Mây che phủ"
+msgstr ""
 
 #. WEATHER_TERMS['CONDITION']
 #: searx/engines/duckduckgo_weather.py:45 searx/engines/wttr.py:51
@@ -283,7 +283,7 @@ msgstr ""
 #: searx/engines/duckduckgo_weather.py:58 searx/engines/open_meteo.py:86
 #: searx/engines/wttr.py:62 searx/searxng.msg
 msgid "Wind"
-msgstr "Gió"
+msgstr ""
 
 #. SOCIAL_MEDIA_TERMS['SUBSCRIBERS']
 #: searx/engines/lemmy.py:85 searx/searxng.msg
@@ -1990,3 +1990,4 @@ msgstr "ẩn phim"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "Các trình tìm kiếm không nhận được kết quả"
+

searx/translations/zh_Hant_TW/LC_MESSAGES/messages.po

@@ -28,19 +28,18 @@
 # hugoalh <hugoalh@users.noreply.translate.codeberg.org>, 2024.
 msgid ""
 msgstr ""
-"Project-Id-Version: searx\n"
+"Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-10-26 21:13+0000\n"
+"PO-Revision-Date: 2024-08-12 04:00+0000\n"
-"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
+"Last-Translator: hugoalh <hugoalh@users.noreply.translate.codeberg.org>\n"
-"Language-Team: Chinese (Traditional Han script) <https://translate.codeberg."
-"org/projects/searxng/searxng/zh_Hant/>\n"
 "Language: zh_Hant_TW\n"
+"Language-Team: Chinese (Traditional) "
+"<https://translate.codeberg.org/projects/searxng/searxng/zh_Hant/>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8.1\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -181,7 +180,7 @@ msgstr "黑暗"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr "黑色"
+msgstr ""
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -468,7 +467,7 @@ msgstr "計算 {functions} 參數"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr "同義詞"
+msgstr ""
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -943,7 +942,7 @@ msgstr "來自搜尋引擎的訊息"
 
 #: searx/templates/simple/elements/engines_msg.html:7
 msgid "seconds"
-msgstr "秒"
+msgstr ""
 
 #: searx/templates/simple/elements/search_url.html:3
 msgid "Search URL"
@@ -1207,11 +1206,11 @@ msgstr "最大時間"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr "網站圖標搜索器"
+msgstr ""
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr "在搜尋結果旁顯示網站圖標"
+msgstr ""
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""
@@ -1912,3 +1911,4 @@ msgstr "隱藏影片"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "引擎無法擷取結果"
+