Merge a6c8780891 into b07c0ae39f

The test.coverage cause a lot of failed CI jobs for reasons that cannot be
explained.  As we do not monitor the coverage anyway, it is superfluous to run
this job, especially as it only has a disruptive effect on the CI.

BTW and the CI action upload-artifact@v3 is deprecated [1]

[1] https://github.com/actions/upload-artifact?tab=readme-ov-file#actionsupload-artifact

Related: https://github.com/searxng/searxng/issues/3983
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

.github/workflows/integration.yml

@@ -45,14 +45,6 @@ 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

.pylintrc

@@ -338,6 +338,7 @@ valid-metaclass-classmethod-first-arg=mcs
 
 # Maximum number of arguments for function / method
 max-args=8
+max-positional-arguments=14
 
 # Maximum number of attributes for a class (see R0902).
 max-attributes=20

requirements-dev.txt

@@ -2,14 +2,14 @@ mock==5.1.0
 nose2[coverage_plugin]==0.15.1
 cov-core==1.15.0
 black==24.3.0
-pylint==3.2.7
+pylint==3.3.1
 splinter==0.21.0
 selenium==4.25.0
-Pallets-Sphinx-Themes==2.1.3
+Pallets-Sphinx-Themes==2.3.0
 Sphinx==7.4.7
-sphinx-issues==4.1.0
+sphinx-issues==5.0.0
 sphinx-jinja==2.0.2
-sphinx-tabs==3.4.5
+sphinx-tabs==3.4.7
 sphinxcontrib-programoutput==0.17
 sphinx-autobuild==2024.10.3
 sphinx-notfound-page==1.0.4

requirements.txt

@@ -9,13 +9,13 @@ python-dateutil==2.9.0.post0
 pyyaml==6.0.2
 httpx[http2]==0.24.1
 Brotli==1.1.0
-uvloop==0.20.0
+uvloop==0.21.0
 httpx-socks[asyncio]==0.7.7
 setproctitle==1.3.3
 redis==5.0.8
 markdown-it-py==3.0.0
 fasttext-predict==0.9.2.2
-pytomlpp==1.0.13; python_version < '3.11'
-pydantic==2.9.2
+tomli==2.0.2; python_version < '3.11'
+msgspec==0.18.6
 eval_type_backport; python_version < '3.9'
 typer-slim==0.12.5

searx/botdetection/config.py

@@ -14,17 +14,7 @@ import typing
 import logging
 import pathlib
 
-try:
-    import tomllib
-
-    pytomlpp = None
-    USE_TOMLLIB = True
-except ImportError:
-    import pytomlpp
-
-    tomllib = None
-    USE_TOMLLIB = False
-
+from ..compat import tomllib
 
 __all__ = ['Config', 'UNSET', 'SchemaIssue']
 
@@ -183,19 +173,10 @@ class Config:
 
 
 def toml_load(file_name):
-    if USE_TOMLLIB:
-        # Python >= 3.11
-        try:
-            with open(file_name, "rb") as f:
-                return tomllib.load(f)
-        except tomllib.TOMLDecodeError as exc:
-            msg = str(exc).replace('\t', '').replace('\n', ' ')
-            log.error("%s: %s", file_name, msg)
-            raise
-    # fallback to pytomlpp for Python < 3.11
     try:
-        return pytomlpp.load(file_name)
-    except pytomlpp.DecodeError as exc:
+        with open(file_name, "rb") as f:
+            return tomllib.load(f)
+    except tomllib.TOMLDecodeError as exc:
         msg = str(exc).replace('\t', '').replace('\n', ' ')
         log.error("%s: %s", file_name, msg)
         raise

searx/data/currencies.json

@@ -82,7 +82,7 @@
             "af": "Albanese lek",
             "ar": "ليك ألباني",
             "bg": "Албански лек",
-            "ca": "lek",
+            "ca": "Lek (moneda)",
             "cs": "Albánský lek",
             "cy": "Lek",
             "da": "Lek",
@@ -383,6 +383,7 @@
             "nl": "Azerbeidzjaanse manat",
             "oc": "Manat",
             "pa": "ਅਜ਼ਰਬਾਈਜਾਨੀ ਮਨਾਤ",
+            "pap": "Manat Azerbaijano",
             "pl": "Manat azerski",
             "pt": "Manat azeri",
             "ro": "Manat azer",
@@ -606,6 +607,7 @@
             "pt": "Franco do Burúndi",
             "ro": "franc burundez",
             "ru": "бурундийский франк",
+            "sk": "Burundský frank",
             "sl": "burundijski frank",
             "sr": "бурундски франак",
             "sv": "Burundisk franc",
@@ -1327,6 +1329,7 @@
             "pl": "escudo Zielonego Przylądka",
             "pt": "escudo cabo-verdiano",
             "ru": "Эскудо Кабо-Верде",
+            "sk": "Kapverdské escudo",
             "sl": "zelenortski eskudo",
             "sr": "зеленортски ескудо",
             "sv": "Kapverdisk escudo",
@@ -1405,6 +1408,7 @@
             "pl": "frank Dżibuti",
             "pt": "franco do Jibuti",
             "ru": "Франк Джибути",
+            "sk": "Džibutský frank",
             "sr": "џибутски франак",
             "sv": "Djiboutisk franc",
             "tr": "Cibuti frangı",
@@ -1518,6 +1522,7 @@
             "pt": "dinar argelino",
             "ro": "Dinar algerian",
             "ru": "алжирский динар",
+            "sk": "Alžírský dinár",
             "sl": "alžirski dinar",
             "sr": "алжирски динар",
             "sv": "Algerisk dinar",
@@ -1969,6 +1974,7 @@
             "pl": "frank gwinejski",
             "pt": "Franco da Guiné",
             "ru": "Гвинейский франк",
+            "sk": "Guinejský frank",
             "sl": "gvinejski frank",
             "sr": "гвинејски франак",
             "sv": "Guinesisk franc",
@@ -2689,6 +2695,7 @@
             "pt": "Franco comoriano",
             "ro": "Franc comorian",
             "ru": "Франк Комор",
+            "sk": "Komorský frank",
             "sr": "коморски франак",
             "sv": "Komoransk franc",
             "tr": "Komor frangı",
@@ -2986,6 +2993,7 @@
             "pt": "rúpia do Sri Lanka",
             "ru": "ланкийская рупия",
             "si": "ශ්රී ලංකා රුපියල",
+            "sk": "Srílanská rupia",
             "sl": "šrilanška rupija",
             "sr": "шриланчанска рупија",
             "sv": "Lankesisk rupie",
@@ -3059,7 +3067,7 @@
             "uk": "Лоті"
         },
         "LYD": {
-            "ar": "دينار ليبي",
+            "ar": "دينار ذهبي",
             "bg": "Либийски динар",
             "ca": "dinar libi",
             "cs": "Libyjský dinár",
@@ -3121,6 +3129,7 @@
             "pt": "Dirham marroquino",
             "ro": "Dirham marocan",
             "ru": "марокканский дирхам",
+            "sk": "Marocký dirham",
             "sl": "maroški dirham",
             "sr": "марокански дирхам",
             "sv": "Marockansk dirham",
@@ -3140,6 +3149,7 @@
             "et": "Moldova leu",
             "fi": "Moldovan leu",
             "fr": "leu moldave",
+            "gl": "leu moldovo",
             "he": "לאו מולדובני",
             "hr": "moldavski lej",
             "hu": "moldován lej",
@@ -3371,6 +3381,7 @@
             "pl": "Ugija",
             "pt": "Uguia",
             "ru": "Мавританская угия",
+            "sk": "Mauritánska ukíjá",
             "sr": "мауританска огија",
             "sv": "Mauretansk ouguiya",
             "tr": "Ugiya",
@@ -3816,6 +3827,7 @@
             "sl": "novozelandski dolar",
             "sr": "новозеландски долар",
             "sv": "Nyzeeländsk dollar",
+            "th": "ดอลลาร์นิวซีแลนด์",
             "tr": "Yeni Zelanda doları",
             "uk": "новозеландський долар",
             "vi": "Đô la New Zealand"
@@ -5386,12 +5398,14 @@
             "ja": "スム",
             "ko": "우즈베키스탄 숨",
             "lt": "Uzbekijos sumas",
+            "lv": "Uzbekistānas soms",
             "nl": "Oezbeekse sum",
             "pa": "ਉਜ਼ਬੇਕਿਸਤਾਨੀ ਸੋਮ",
             "pl": "Sum",
             "pt": "som usbeque",
             "ro": "Som uzbec",
             "ru": "узбекский сум",
+            "sk": "Uzbecký som",
             "sr": "узбекистански сом",
             "sv": "Uzbekistansk som",
             "tr": "Özbekistan somu",
@@ -5645,7 +5659,7 @@
             "eo": "specialaj rajtoj de enspezo",
             "es": "Derechos Especiales de Giro",
             "eu": "igorpen eskubide bereziak",
-            "fi": "Erityisnosto-oikeus",
+            "fi": "erityisnosto-oikeus",
             "fr": "droits de tirage spéciaux",
             "hr": "Posebna prava vučenja",
             "hu": "különleges lehívási jog",
@@ -5655,6 +5669,7 @@
             "ko": "특별인출권",
             "lt": "Specialiosios skolinimosi teisės",
             "lv": "Speciālās aizņēmuma tiesības",
+            "ms": "hak pengeluaran khas",
             "nl": "speciale trekkingsrechten",
             "oc": "Drechs de tiratge Especials",
             "pl": "specjalne prawa ciągnienia",
@@ -5837,7 +5852,7 @@
             "lt": "Randas",
             "lv": "Dienvidāfrikas rands",
             "ml": "സൗത്ത് ആഫ്രിക്കൻ റാൻഡ്",
-            "ms": "Rand",
+            "ms": "Rand Afrika Selatan",
             "nl": "Zuid-Afrikaanse rand",
             "oc": "Rand sudafrican",
             "pl": "Rand",
@@ -5900,6 +5915,7 @@
             "ko": "짐바브웨 골드",
             "nl": "Zimbabwe Gold",
             "pl": "Złoto Zimbabwe",
+            "pt": "Ouro do Zimbábue",
             "ru": "зимбабвийский золотой",
             "sk": "zimbabwiansky zlatý",
             "sl": "zimbabvejski gold",
@@ -7817,6 +7833,7 @@
         "eritrese nakfa": "ERN",
         "erityinen nosto oikeus": "XDR",
         "erityiset nosto oikeudet": "XDR",
+        "erityisnosto oikeudet": "XDR",
         "erityisnosto oikeus": "XDR",
         "ermeni dramı": "AMD",
         "ermenistan dramı": "AMD",
@@ -8372,6 +8389,8 @@
         "haitský gourde": "HTG",
         "haïtiaanse gourde": "HTG",
         "hak penarikan khusus": "XDR",
+        "hak pengeluaran khas": "XDR",
+        "hak pengeluaran khusus": "XDR",
         "halalas": "SAR",
         "hegoafrikar rand": "ZAR",
         "heller": "CZK",
@@ -9115,6 +9134,7 @@
         "leu da roménia": "RON",
         "leu da romênia": "RON",
         "leu de moldàvia": "MDL",
+        "leu de moldova": "MDL",
         "leu moldau": "MDL",
         "leu moldave": "MDL",
         "leu moldavo": "MDL",
@@ -9122,6 +9142,7 @@
         "leu moldofa": "MDL",
         "leu moldova": "MDL",
         "leu moldovenesc": "MDL",
+        "leu moldovo": "MDL",
         "leu romanès": "RON",
         "leu romanés": "RON",
         "leu romanian": "RON",
@@ -9437,6 +9458,7 @@
         "manat azerbaijandar": "AZN",
         "manat azerbaijanês": "AZN",
         "manat azerbaijano": "AZN",
+        "manat azerbaitjanés": "AZN",
         "manat azerbaiyano": "AZN",
         "manat azerbaïdjanais": "AZN",
         "manat azerbejdżański": "AZN",
@@ -9520,6 +9542,7 @@
         "mauritanijska ouguja": "MRU",
         "mauritanijska uguija": "MRU",
         "mauritániai ouguiya": "MRU",
+        "mauritánska ukíjá": "MRU",
         "mauritánská ukíjá": "MRU",
         "mauritānijas oguja": "MRU",
         "mauritiaanse roepee": "MUR",
@@ -9985,6 +10008,7 @@
         "ouguiya mauritana": "MRU",
         "ouguiya mauritanien": "MRU",
         "ouguiya mawritania": "MRU",
+        "ouro do zimbábue": "ZWG",
         "örmény dram": "AMD",
         "östkaribisk dollar": "XCD",
         "özbekistan somu": "UZS",
@@ -10796,6 +10820,7 @@
         "salomona dolaro": "SBD",
         "salomondollar": "SBD",
         "salomonen dollar": "SBD",
+        "salomoninsaarten dollari": "SBD",
         "salomonsaarten dollari": "SBD",
         "salomonskootočni dolar": "SBD",
         "salüng": "THB",
@@ -11152,6 +11177,7 @@
         "srilankansk rupee": "LKR",
         "srilankanske rupee": "LKR",
         "srí lanka i rúpia": "LKR",
+        "srílanská rupia": "LKR",
         "srílanská rupie": "LKR",
         "srpski dinar": "RSD",
         "ssp": "SSP",
@@ -11415,6 +11441,7 @@
         "tengue": "KZT",
         "tengue cazaque": "KZT",
         "teňňe": "TMT",
+        "tetri": "GEL",
         "thai baht": "THB",
         "thai bát": "THB",
         "thailandiar baht": "THB",
@@ -11539,10 +11566,10 @@
         "turkisk lira": "TRY",
         "turkiska lira": "TRY",
         "turkmeense manat": "TMT",
+        "turkmen manat": "TMT",
         "turkmena manato": "TMT",
         "turkmenistan manat": "TMT",
         "turkmenistan new manat": "TMT",
-        "turkmenistani manat": "TMT",
         "turkmenistani new manat": "TMT",
         "turkmenistanin manat": "TMT",
         "turkmenistansk manat": "TMT",
@@ -11708,6 +11735,7 @@
         "uzbekistano sumas": "UZS",
         "uzbekistansk som": "UZS",
         "uzbekistanski som": "UZS",
+        "uzbekistānas soms": "UZS",
         "uzs": "UZS",
         "új zélandi dollár": "NZD",
         "ürdün dinarı": "JOD",
@@ -11861,6 +11889,7 @@
         "yuan cinese": "CNY",
         "yuan renmimbi": "CNY",
         "yuan renminbi": "CNY",
+        "yuan rmb": "CNY",
         "yuans": "CNY",
         "yuán chino": "CNY",
         "z$": "ZWL",
@@ -13734,6 +13763,7 @@
         "دينار بحريني": "BHD",
         "دينار تونسي": "TND",
         "دينار جزائري": "DZD",
+        "دينار ذهبي": "LYD",
         "دينار سوداني": "SDG",
         "دينار صربي": "RSD",
         "دينار عراقي": "IQD",
@@ -14326,6 +14356,7 @@
             "USD",
             "TWD"
         ],
+        "ดอลลาร์นิวซีแลนด์": "NZD",
         "ดอลลาร์บรูไน": "BND",
         "ดอลลาร์สหรัฐ": "USD",
         "ดอลลาร์สิงคโปร์": "SGD",
@@ -14998,6 +15029,7 @@
         "ボツワナ・プラ": "BWP",
         "ボリバル・ソベラノ": "VES",
         "ボリビアーノ": "BOB",
+        "ポンド・スターリング": "GBP",
         "ポーランド・ズウォティ": [
             "PLZ",
             "PLN"
@@ -15063,7 +15095,6 @@
         "中華人民共和国の通貨": "CNY",
         "中部アフリカcfaフラン": "XAF",
         "人民元": "CNY",
-        "人民币": "CNY",
         "人民幣": "CNY",
         "元": [
             "HKD",

searx/data/useragents.json

@@ -5,7 +5,7 @@
     ],
     "ua": "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}",
     "versions": [
-        "130.0",
-        "129.0"
+        "132.0",
+        "131.0"
     ]
 }

searx/data/wikidata_units.json

@@ -832,7 +832,7 @@
     "Q104907390": {
         "si_name": "Q182429",
         "symbol": "nmi/h",
-        "to_si_factor": 0.514444
+        "to_si_factor": 0.5144444444444445
     },
     "Q104907398": {
         "si_name": "Q215571",
@@ -1336,7 +1336,7 @@
     },
     "Q106636307": {
         "si_name": "Q80842107",
-        "symbol": "μS/cm",
+        "symbol": "μS/cm-1",
         "to_si_factor": 0.0001
     },
     "Q106639711": {
@@ -4142,7 +4142,7 @@
     "Q23931103": {
         "si_name": "Q25343",
         "symbol": "nmi²",
-        "to_si_factor": 3434290.0120544
+        "to_si_factor": 3429904.0
     },
     "Q239830": {
         "si_name": "Q3395194",

searx/engines/annas_archive.py

@@ -34,10 +34,10 @@ Implementations
 """
 
 from typing import List, Dict, Any, Optional
-from urllib.parse import quote
+from urllib.parse import urlencode
 from lxml import html
 
-from searx.utils import extract_text, eval_xpath, eval_xpath_list
+from searx.utils import extract_text, eval_xpath, eval_xpath_getindex, 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 = False
+paging: bool = True
 
 # search-url
 base_url: str = "https://annas-archive.org"
@@ -99,9 +99,18 @@ 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
-    params["url"] = base_url + f"/search?lang={lang or ''}&content={aa_content}&ext={aa_ext}&sort={aa_sort}&q={q}"
+    args = {
+        '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
 
 
@@ -128,12 +137,12 @@ def response(resp) -> List[Dict[str, Optional[str]]]:
 def _get_result(item):
     return {
         'template': 'paper.html',
-        'url': base_url + item.xpath('./@href')[0],
+        'url': base_url + extract_text(eval_xpath_getindex(item, './@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': item.xpath('.//img/@src')[0],
+        'thumbnail': extract_text(eval_xpath_getindex(item, './/img/@src', 0, default=None), allow_none=True),
     }
 
 

searx/engines/duckduckgo.py

@@ -18,13 +18,13 @@ from searx import (
 )
 from searx.utils import (
     eval_xpath,
-    eval_xpath_getindex,
     extract_text,
 )
 from searx.network import get  # see https://github.com/searxng/searxng/issues/762
 from searx import redisdb
 from searx.enginelib.traits import EngineTraits
 from searx.utils import extr
+from searx.exceptions import SearxEngineCaptchaException
 
 if TYPE_CHECKING:
     import logging
@@ -53,31 +53,33 @@ paging = True
 time_range_support = True
 safesearch = True  # user can't select but the results are filtered
 
-url = 'https://lite.duckduckgo.com/lite/'
-# url_ping = 'https://duckduckgo.com/t/sl_l'
+url = "https://html.duckduckgo.com/html"
 
 time_range_dict = {'day': 'd', 'week': 'w', 'month': 'm', 'year': 'y'}
 form_data = {'v': 'l', 'api': 'd.js', 'o': 'json'}
+__CACHE = []
 
 
-def cache_vqd(query, value):
+def _cache_key(data: dict):
+    return 'SearXNG_ddg_web_vqd' + redislib.secret_hash(f"{data['q']}//{data['kl']}")
+
+
+def cache_vqd(data: dict, value):
     """Caches a ``vqd`` value from a query."""
     c = redisdb.client()
     if c:
         logger.debug("cache vqd value: %s", value)
-        key = 'SearXNG_ddg_web_vqd' + redislib.secret_hash(query)
-        c.set(key, value, ex=600)
+        c.set(_cache_key(data), value, ex=600)
+
+    else:
+        logger.debug("MEM cache vqd value: %s", value)
+        if len(__CACHE) > 100:  # cache vqd from last 100 queries
+            __CACHE.pop(0)
+        __CACHE.append((_cache_key(data), value))
 
 
-def get_vqd(query):
-    """Returns the ``vqd`` that fits to the *query*.  If there is no ``vqd`` cached
-    (:py:obj:`cache_vqd`) the query is sent to DDG to get a vqd value from the
-    response.
-
-    .. hint::
-
-       If an empty string is returned there are no results for the ``query`` and
-       therefore no ``vqd`` value.
+def get_vqd(data):
+    """Returns the ``vqd`` that fits to the *query* (``data`` from HTTP POST).
 
     DDG's bot detection is sensitive to the ``vqd`` value.  For some search terms
     (such as extremely long search terms that are often sent by bots), no ``vqd``
@@ -105,28 +107,23 @@ def get_vqd(query):
     - DuckDuckGo News: ``https://duckduckgo.com/news.js??q=...&vqd=...``
 
     """
+
+    key = _cache_key(data)
     value = None
     c = redisdb.client()
     if c:
-        key = 'SearXNG_ddg_web_vqd' + redislib.secret_hash(query)
         value = c.get(key)
         if value or value == b'':
             value = value.decode('utf-8')
-            logger.debug("re-use cached vqd value: %s", value)
+            logger.debug("re-use CACHED vqd value: %s", value)
             return value
 
-    query_url = 'https://duckduckgo.com/?' + urlencode({'q': query})
-    res = get(query_url)
-    doc = lxml.html.fromstring(res.text)
-    for script in doc.xpath("//script[@type='text/javascript']"):
-        script = script.text
-        if 'vqd="' in script:
-            value = extr(script, 'vqd="', '"')
-            break
-    logger.debug("new vqd value: '%s'", value)
-    if value is not None:
-        cache_vqd(query, value)
-    return value
+    else:
+        for k, value in __CACHE:
+            if k == key:
+                logger.debug("MEM re-use CACHED vqd value: %s", value)
+                return value
+    return None
 
 
 def get_ddg_lang(eng_traits: EngineTraits, sxng_locale, default='en_US'):
@@ -154,9 +151,10 @@ def get_ddg_lang(eng_traits: EngineTraits, sxng_locale, default='en_US'):
 
     .. hint::
 
-       `DDG-lite <https://lite.duckduckgo.com/lite>`__ does not offer a language
-       selection to the user, only a region can be selected by the user
-       (``eng_region`` from the example above).  DDG-lite stores the selected
+       `DDG-lite <https://lite.duckduckgo.com/lite>`__ and the *no Javascript*
+       page https://html.duckduckgo.com/html do not offer a language selection
+       to the user, only a region can be selected by the user (``eng_region``
+       from the example above).  DDG-lite and *no Javascript* store the selected
        region in a cookie::
 
          params['cookies']['kl'] = eng_region  # 'ar-es'
@@ -240,10 +238,25 @@ def request(query, params):
 
     query = quote_ddg_bangs(query)
 
-    # request needs a vqd argument
-    vqd = get_vqd(query)
+    if len(query) >= 500:
+        # DDG does not accept queries with more than 499 chars
+        params["url"] = None
+        return
 
+    # Advanced search syntax ends in CAPTCHA
+    # https://duckduckgo.com/duckduckgo-help-pages/results/syntax/
+    query = [
+        x.removeprefix("site:").removeprefix("intitle:").removeprefix("inurl:").removeprefix("filetype:")
+        for x in query.split()
+    ]
     eng_region = traits.get_region(params['searxng_locale'], traits.all_locale)
+    if eng_region == "wt-wt":
+        # https://html.duckduckgo.com/html sets an empty value for "all".
+        eng_region = ""
+
+    params['data']['kl'] = eng_region
+    params['cookies']['kl'] = eng_region
+
     # eng_lang = get_ddg_lang(traits, params['searxng_locale'])
 
     params['url'] = url
@@ -251,45 +264,82 @@ def request(query, params):
     params['data']['q'] = query
 
     # The API is not documented, so we do some reverse engineering and emulate
-    # what https://lite.duckduckgo.com/lite/ does when you press "next Page"
-    # link again and again ..
+    # what https://html.duckduckgo.com/html does when you press "next Page" link
+    # again and again ..
 
     params['headers']['Content-Type'] = 'application/x-www-form-urlencoded'
-    params['data']['vqd'] = vqd
 
-    # initial page does not have an offset
+    params['headers']['Sec-Fetch-Dest'] = "document"
+    params['headers']['Sec-Fetch-Mode'] = "navigate"  # at least this one is used by ddg's bot detection
+    params['headers']['Sec-Fetch-Site'] = "same-origin"
+    params['headers']['Sec-Fetch-User'] = "?1"
+
+    # Form of the initial search page does have empty values in the form
+    if params['pageno'] == 1:
+
+        params['data']['b'] = ""
+
+    params['data']['df'] = ''
+    if params['time_range'] in time_range_dict:
+
+        params['data']['df'] = time_range_dict[params['time_range']]
+        params['cookies']['df'] = time_range_dict[params['time_range']]
+
     if params['pageno'] == 2:
+
         # second page does have an offset of 20
         offset = (params['pageno'] - 1) * 20
         params['data']['s'] = offset
         params['data']['dc'] = offset + 1
 
     elif params['pageno'] > 2:
+
         # third and following pages do have an offset of 20 + n*50
         offset = 20 + (params['pageno'] - 2) * 50
         params['data']['s'] = offset
         params['data']['dc'] = offset + 1
 
-    # initial page does not have additional data in the input form
     if params['pageno'] > 1:
 
+        # initial page does not have these additional data in the input form
         params['data']['o'] = form_data.get('o', 'json')
         params['data']['api'] = form_data.get('api', 'd.js')
         params['data']['nextParams'] = form_data.get('nextParams', '')
         params['data']['v'] = form_data.get('v', 'l')
-        params['headers']['Referer'] = 'https://lite.duckduckgo.com/'
+        params['headers']['Referer'] = url
 
-    params['data']['kl'] = eng_region
-    params['cookies']['kl'] = eng_region
+        # from here on no more params['data'] shuld be set, since this dict is
+        # needed to get a vqd value from the cache ..
 
-    params['data']['df'] = ''
-    if params['time_range'] in time_range_dict:
-        params['data']['df'] = time_range_dict[params['time_range']]
-        params['cookies']['df'] = time_range_dict[params['time_range']]
+        vqd = get_vqd(params['data'])
+
+        # Certain conditions must be met in order to call up one of the
+        # following pages ...
+
+        if vqd:
+            params['data']['vqd'] = vqd  # follow up pages / requests needs a vqd argument
+        else:
+            # Don't try to call follow up pages without a vqd value.  DDG
+            # recognizes this as a request from a bot.  This lowers the
+            # reputation of the SearXNG IP and DDG starts to activate CAPTCHAs.
+            params["url"] = None
+            return
+
+        if params['searxng_locale'].startswith("zh"):
+            # Some locales (at least China) do not have a "next page" button and ddg
+            # will return a HTTP/2 403 Forbidden for a request of such a page.
+            params["url"] = None
+            return
 
     logger.debug("param data: %s", params['data'])
     logger.debug("param cookies: %s", params['cookies'])
-    return params
+
+
+def is_ddg_captcha(dom):
+    """In case of CAPTCHA ddg response its own *not a Robot* dialog and is not
+    redirected to a CAPTCHA page."""
+
+    return bool(eval_xpath(dom, "//form[@id='challenge-form']"))
 
 
 def response(resp):
@@ -300,35 +350,33 @@ def response(resp):
     results = []
     doc = lxml.html.fromstring(resp.text)
 
-    result_table = eval_xpath(doc, '//html/body/form/div[@class="filters"]/table')
+    if is_ddg_captcha(doc):
+        # set suspend time to zero is OK --> ddg does not block the IP
+        raise SearxEngineCaptchaException(suspended_time=0, message=f"CAPTCHA ({resp.search_params['data'].get('kl')})")
 
-    if len(result_table) == 2:
-        # some locales (at least China) does not have a "next page" button and
-        # the layout of the HTML tables is different.
-        result_table = result_table[1]
-    elif not len(result_table) >= 3:
-        # no more results
-        return []
-    else:
-        result_table = result_table[2]
-        # update form data from response
-        form = eval_xpath(doc, '//html/body/form/div[@class="filters"]/table//input/..')
-        if len(form):
+    form = eval_xpath(doc, '//input[@name="vqd"]/..')
+    if len(form):
+        # some locales (at least China) does not have a "next page" button
+        form = form[0]
+        form_vqd = eval_xpath(form, '//input[@name="vqd"]/@value')[0]
 
-            form = form[0]
-            form_data['v'] = eval_xpath(form, '//input[@name="v"]/@value')[0]
-            form_data['api'] = eval_xpath(form, '//input[@name="api"]/@value')[0]
-            form_data['o'] = eval_xpath(form, '//input[@name="o"]/@value')[0]
-            logger.debug('form_data: %s', form_data)
+        cache_vqd(resp.search_params["data"], form_vqd)
 
-    tr_rows = eval_xpath(result_table, './/tr')
-    # In the last <tr> is the form of the 'previous/next page' links
-    tr_rows = tr_rows[:-1]
+    # just select "web-result" and ignore results of class "result--ad result--ad--small"
+    for div_result in eval_xpath(doc, '//div[@id="links"]/div[contains(@class, "web-result")]'):
 
-    len_tr_rows = len(tr_rows)
-    offset = 0
+        item = {}
+        title = eval_xpath(div_result, './/h2/a')
+        if not title:
+            # this is the "No results." item in the result list
+            continue
+        item["title"] = extract_text(title)
+        item["url"] = eval_xpath(div_result, './/h2/a/@href')[0]
+        item["content"] = extract_text(eval_xpath(div_result, './/a[contains(@class, "result__snippet")]')[0])
 
-    zero_click_info_xpath = '//html/body/form/div/table[2]/tr[2]/td/text()'
+        results.append(item)
+
+    zero_click_info_xpath = '//div[@id="zero_click_abstract"]'
     zero_click = extract_text(eval_xpath(doc, zero_click_info_xpath)).strip()
 
     if zero_click and "Your IP address is" not in zero_click and "Your user agent:" not in zero_click:
@@ -341,33 +389,6 @@ def response(resp):
             }
         )
 
-    while len_tr_rows >= offset + 4:
-
-        # assemble table rows we need to scrap
-        tr_title = tr_rows[offset]
-        tr_content = tr_rows[offset + 1]
-        offset += 4
-
-        # ignore sponsored Adds <tr class="result-sponsored">
-        if tr_content.get('class') == 'result-sponsored':
-            continue
-
-        a_tag = eval_xpath_getindex(tr_title, './/td//a[@class="result-link"]', 0, None)
-        if a_tag is None:
-            continue
-
-        td_content = eval_xpath_getindex(tr_content, './/td[@class="result-snippet"]', 0, None)
-        if td_content is None:
-            continue
-
-        results.append(
-            {
-                'title': a_tag.text_content(),
-                'content': extract_text(td_content),
-                'url': a_tag.get('href'),
-            }
-        )
-
     return results
 
 

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[@data-sncf="1"]'
+content_xpath = './/div[contains(@data-sncf, "1")]'
 
 # Suggestions are links placed in a *card-section*, we extract only the text
 # from the links not the links itself.

searx/engines/hackernews.py

@@ -57,7 +57,11 @@ def request(query, params):
 
         if params['time_range']:
             search_type = 'search_by_date'
-            timestamp = (datetime.now() - relativedelta(**{f"{params['time_range']}s": 1})).timestamp()
+            timestamp = (
+                # pylint: disable=unexpected-keyword-arg
+                datetime.now()
+                - relativedelta(**{f"{params['time_range']}s": 1})  # type: ignore
+            ).timestamp()
             query_params["numericFilters"] = f"created_at_i>{timestamp}"
 
     params["url"] = f"{base_url}/{search_type}?{urlencode(query_params)}"

searx/engines/mojeek.py

@@ -1,12 +1,15 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 """Mojeek (general, images, news)"""
 
+from typing import TYPE_CHECKING
+
 from datetime import datetime
 from urllib.parse import urlencode
 from lxml import html
 
 from dateutil.relativedelta import relativedelta
 from searx.utils import eval_xpath, eval_xpath_list, extract_text
+from searx.enginelib.traits import EngineTraits
 
 about = {
     'website': 'https://mojeek.com',
@@ -42,6 +45,18 @@ news_url_xpath = './/h2/a/@href'
 news_title_xpath = './/h2/a'
 news_content_xpath = './/p[@class="s"]'
 
+language_param = 'lb'
+region_param = 'arc'
+
+_delta_kwargs = {'day': 'days', 'week': 'weeks', 'month': 'months', 'year': 'years'}
+
+if TYPE_CHECKING:
+    import logging
+
+    logger = logging.getLogger()
+
+traits: EngineTraits
+
 
 def init(_):
     if search_type not in ('', 'images', 'news'):
@@ -53,13 +68,16 @@ def request(query, params):
         'q': query,
         'safe': min(params['safesearch'], 1),
         'fmt': search_type,
+        language_param: traits.get_language(params['searxng_locale'], traits.custom['language_all']),
+        region_param: traits.get_region(params['searxng_locale'], traits.custom['region_all']),
     }
 
     if search_type == '':
         args['s'] = 10 * (params['pageno'] - 1)
 
     if params['time_range'] and search_type != 'images':
-        args["since"] = (datetime.now() - relativedelta(**{f"{params['time_range']}s": 1})).strftime("%Y%m%d")
+        kwargs = {_delta_kwargs[params['time_range']]: 1}
+        args["since"] = (datetime.now() - relativedelta(**kwargs)).strftime("%Y%m%d")  # type: ignore
         logger.debug(args["since"])
 
     params['url'] = f"{base_url}/search?{urlencode(args)}"
@@ -94,7 +112,7 @@ def _image_results(dom):
                 'template': 'images.html',
                 'url': extract_text(eval_xpath(result, image_url_xpath)),
                 'title': extract_text(eval_xpath(result, image_title_xpath)),
-                'img_src': base_url + extract_text(eval_xpath(result, image_img_src_xpath)),
+                'img_src': base_url + extract_text(eval_xpath(result, image_img_src_xpath)),  # type: ignore
                 'content': '',
             }
         )
@@ -130,3 +148,31 @@ def response(resp):
         return _news_results(dom)
 
     raise ValueError(f"Invalid search type {search_type}")
+
+
+def fetch_traits(engine_traits: EngineTraits):
+    # pylint: disable=import-outside-toplevel
+    from searx import network
+    from searx.locales import get_official_locales, region_tag
+    from babel import Locale, UnknownLocaleError
+    import contextlib
+
+    resp = network.get(base_url + "/preferences", headers={'Accept-Language': 'en-US,en;q=0.5'})
+    dom = html.fromstring(resp.text)  # type: ignore
+
+    languages = eval_xpath_list(dom, f'//select[@name="{language_param}"]/option/@value')
+
+    engine_traits.custom['language_all'] = languages[0]
+
+    for code in languages[1:]:
+        with contextlib.suppress(UnknownLocaleError):
+            locale = Locale(code)
+            engine_traits.languages[locale.language] = code
+
+    regions = eval_xpath_list(dom, f'//select[@name="{region_param}"]/option/@value')
+
+    engine_traits.custom['region_all'] = regions[1]
+
+    for code in regions[2:]:
+        for locale in get_official_locales(code, engine_traits.languages):
+            engine_traits.regions[region_tag(locale)] = code

searx/engines/openlibrary.py

@@ -0,0 +1,71 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+"""Open library (books)
+"""
+from urllib.parse import urlencode
+import re
+
+from dateutil import parser
+
+about = {
+    'website': 'https://openlibrary.org',
+    'wikidata_id': 'Q1201876',
+    'require_api_key': False,
+    'use_official_api': False,
+    'official_api_documentation': 'https://openlibrary.org/developers/api',
+}
+
+paging = True
+categories = []
+
+base_url = "https://openlibrary.org"
+results_per_page = 10
+
+
+def request(query, params):
+    args = {
+        'q': query,
+        'page': params['pageno'],
+        'limit': results_per_page,
+    }
+    params['url'] = f"{base_url}/search.json?{urlencode(args)}"
+    return params
+
+
+def _parse_date(date):
+    try:
+        return parser.parse(date)
+    except parser.ParserError:
+        return None
+
+
+def response(resp):
+    results = []
+
+    for item in resp.json().get("docs", []):
+        cover = None
+        if 'lending_identifier_s' in item:
+            cover = f"https://archive.org/services/img/{item['lending_identifier_s']}"
+
+        published = item.get('publish_date')
+        if published:
+            published_dates = [date for date in map(_parse_date, published) if date]
+            if published_dates:
+                published = min(published_dates)
+
+        if not published:
+            published = parser.parse(str(item.get('first_published_year')))
+
+        result = {
+            'template': 'paper.html',
+            'url': f"{base_url}{item['key']}",
+            'title': item['title'],
+            'content': re.sub(r"\{|\}", "", item['first_sentence'][0]) if item.get('first_sentence') else '',
+            'isbn': item.get('isbn', [])[:5],
+            'authors': item.get('author_name', []),
+            'thumbnail': cover,
+            'publishedDate': published,
+            'tags': item.get('subject', [])[:10] + item.get('place', [])[:10],
+        }
+        results.append(result)
+
+    return results

searx/exceptions.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 """Exception types raised by SearXNG modules.
 """
+from __future__ import annotations
 
 from typing import Optional, Union
 
@@ -61,7 +62,7 @@ class SearxEngineAccessDeniedException(SearxEngineResponseException):
     """This settings contains the default suspended time (default 86400 sec / 1
     day)."""
 
-    def __init__(self, suspended_time: int = None, message: str = 'Access denied'):
+    def __init__(self, suspended_time: int | None = None, message: str = 'Access denied'):
         """Generic exception to raise when an engine denies access to the results.
 
         :param suspended_time: How long the engine is going to be suspended in
@@ -70,12 +71,13 @@ class SearxEngineAccessDeniedException(SearxEngineResponseException):
         :param message: Internal message.  Defaults to ``Access denied``
         :type message: str
         """
-        suspended_time = suspended_time or self._get_default_suspended_time()
+        if suspended_time is None:
+            suspended_time = self._get_default_suspended_time()
         super().__init__(message + ', suspended_time=' + str(suspended_time))
         self.suspended_time = suspended_time
         self.message = message
 
-    def _get_default_suspended_time(self):
+    def _get_default_suspended_time(self) -> int:
         from searx import get_setting  # pylint: disable=C0415
 
         return get_setting(self.SUSPEND_TIME_SETTING)
@@ -88,7 +90,7 @@ class SearxEngineCaptchaException(SearxEngineAccessDeniedException):
     """This settings contains the default suspended time (default 86400 sec / 1
     day)."""
 
-    def __init__(self, suspended_time=None, message='CAPTCHA'):
+    def __init__(self, suspended_time: int | None = None, message='CAPTCHA'):
         super().__init__(message=message, suspended_time=suspended_time)
 
 
@@ -102,7 +104,7 @@ class SearxEngineTooManyRequestsException(SearxEngineAccessDeniedException):
     """This settings contains the default suspended time (default 3660 sec / 1
     hour)."""
 
-    def __init__(self, suspended_time=None, message='Too many request'):
+    def __init__(self, suspended_time: int | None = None, message='Too many request'):
         super().__init__(message=message, suspended_time=suspended_time)
 
 

searx/favicons/__init__.py

@@ -22,8 +22,9 @@ def init():
     # pylint: disable=import-outside-toplevel
 
     from . import config, cache, proxy
+    from .. import settings_loader
 
-    cfg_file = pathlib.Path("/etc/searxng/favicons.toml")
+    cfg_file = (settings_loader.get_user_cfg_folder() or pathlib.Path("/etc/searxng")) / "favicons.toml"
     if not cfg_file.exists():
         if is_active():
             logger.error(f"missing favicon config: {cfg_file}")
@@ -34,4 +35,4 @@ def init():
     cache.init(cfg.cache)
     proxy.init(cfg.proxy)
 
-    del cache, config, proxy, cfg
+    del cache, config, proxy, cfg, settings_loader

searx/favicons/cache.py

@@ -20,17 +20,17 @@
 from __future__ import annotations
 from typing import Literal
 
+import os
 import abc
 import dataclasses
 import hashlib
 import logging
-import pathlib
 import sqlite3
 import tempfile
 import time
 import typer
 
-from pydantic import BaseModel
+import msgspec
 
 from searx import sqlitedb
 from searx import logger
@@ -90,7 +90,7 @@ def init(cfg: "FaviconCacheConfig"):
         raise NotImplementedError(f"favicons db_type '{cfg.db_type}' is unknown")
 
 
-class FaviconCacheConfig(BaseModel):
+class FaviconCacheConfig(msgspec.Struct):  # pylint: disable=too-few-public-methods
     """Configuration of the favicon cache."""
 
     db_type: Literal["sqlite", "mem"] = "sqlite"
@@ -103,7 +103,7 @@ class FaviconCacheConfig(BaseModel):
       :py:obj:`.cache.FaviconCacheMEM` (not recommended)
     """
 
-    db_url: pathlib.Path = pathlib.Path(tempfile.gettempdir()) / "faviconcache.db"
+    db_url: str = tempfile.gettempdir() + os.sep + "faviconcache.db"
     """URL of the SQLite DB, the path to the database file."""
 
     HOLD_TIME: int = 60 * 60 * 24 * 30  # 30 days

searx/favicons/config.py

@@ -4,9 +4,8 @@
 from __future__ import annotations
 
 import pathlib
-from pydantic import BaseModel
+import msgspec
 
-from searx.compat import tomllib
 from .cache import FaviconCacheConfig
 from .proxy import FaviconProxyConfig
 
@@ -19,7 +18,7 @@ TOML_CACHE_CFG: dict[str, "FaviconConfig"] = {}
 DEFAULT_CFG_TOML_PATH = pathlib.Path(__file__).parent / "favicons.toml"
 
 
-class FaviconConfig(BaseModel):
+class FaviconConfig(msgspec.Struct):  # pylint: disable=too-few-public-methods
     """The class aggregates configurations of the favicon tools"""
 
     cfg_schema: int
@@ -28,10 +27,10 @@ class FaviconConfig(BaseModel):
     By specifying a version, it is possible to ensure downward compatibility in
     the event of future changes to the configuration schema"""
 
-    cache: FaviconCacheConfig = FaviconCacheConfig()
+    cache: FaviconCacheConfig = msgspec.field(default_factory=FaviconCacheConfig)
     """Setup of the :py:obj:`.cache.FaviconCacheConfig`."""
 
-    proxy: FaviconProxyConfig = FaviconProxyConfig()
+    proxy: FaviconProxyConfig = msgspec.field(default_factory=FaviconProxyConfig)
     """Setup of the :py:obj:`.proxy.FaviconProxyConfig`."""
 
     @classmethod
@@ -45,18 +44,22 @@ class FaviconConfig(BaseModel):
             return cached
 
         with cfg_file.open("rb") as f:
+            data = f.read()
 
-            cfg = tomllib.load(f)
-            cfg = cfg.get("favicons", cfg)
+        cfg = msgspec.toml.decode(data, type=_FaviconConfig)
+        schema = cfg.favicons.cfg_schema
+        if schema != CONFIG_SCHEMA:
+            raise ValueError(
+                f"config schema version {CONFIG_SCHEMA} is needed, version {schema} is given in {cfg_file}"
+            )
 
-            schema = cfg.get("cfg_schema")
-            if schema != CONFIG_SCHEMA:
-                raise ValueError(
-                    f"config schema version {CONFIG_SCHEMA} is needed, version {schema} is given in {cfg_file}"
-                )
+        cfg = cfg.favicons
+        if use_cache and cached:
+            TOML_CACHE_CFG[str(cfg_file.resolve())] = cfg
 
-            cfg = cls(**cfg)
-            if use_cache and cached:
-                TOML_CACHE_CFG[str(cfg_file.resolve())] = cfg
+        return cfg
 
-            return cfg
+
+class _FaviconConfig(msgspec.Struct):  # pylint: disable=too-few-public-methods
+    # wrapper struct for root object "favicons."
+    favicons: FaviconConfig

searx/favicons/proxy.py

@@ -12,7 +12,7 @@ import urllib.parse
 
 import flask
 from httpx import HTTPError
-from pydantic import BaseModel
+import msgspec
 
 from searx import get_setting
 
@@ -41,7 +41,7 @@ def _initial_resolver_map():
     return d
 
 
-class FaviconProxyConfig(BaseModel):
+class FaviconProxyConfig(msgspec.Struct):
     """Configuration of the favicon proxy."""
 
     max_age: int = 60 * 60 * 24 * 7  # seven days
@@ -59,7 +59,7 @@ class FaviconProxyConfig(BaseModel):
     outgoing request of the resolver.  By default, the value from
     :ref:`outgoing.request_timeout <settings outgoing>` setting is used."""
 
-    resolver_map: dict[str, str] = _initial_resolver_map()
+    resolver_map: dict[str, str] = msgspec.field(default_factory=_initial_resolver_map)
     """The resolver_map is a key / value dictionary where the key is the name of
     the resolver and the value is the fully qualifying name (fqn) of resolver's
     function (the callable).  The resolvers from the python module

searx/limiter.py

@@ -128,9 +128,6 @@ _INSTALLED = False
 LIMITER_CFG_SCHEMA = Path(__file__).parent / "limiter.toml"
 """Base configuration (schema) of the botdetection."""
 
-LIMITER_CFG = Path('/etc/searxng/limiter.toml')
-"""Local Limiter configuration."""
-
 CFG_DEPRECATED = {
     # "dummy.old.foo": "config 'dummy.old.foo' exists only for tests.  Don't use it in your real project config."
 }
@@ -138,8 +135,12 @@ CFG_DEPRECATED = {
 
 def get_cfg() -> config.Config:
     global CFG  # pylint: disable=global-statement
+
     if CFG is None:
-        CFG = config.Config.from_toml(LIMITER_CFG_SCHEMA, LIMITER_CFG, CFG_DEPRECATED)
+        from . import settings_loader  # pylint: disable=import-outside-toplevel
+
+        cfg_file = (settings_loader.get_user_cfg_folder() or Path("/etc/searxng")) / "limiter.toml"
+        CFG = config.Config.from_toml(LIMITER_CFG_SCHEMA, cfg_file, CFG_DEPRECATED)
     return CFG
 
 

searx/plugins/__init__.py

@@ -227,6 +227,8 @@ def plugin_module_names():
 
 def initialize(app):
     for module_name, external in plugin_module_names():
-        plugin = load_and_initialize_plugin(module_name, external, (app, settings))
-        if plugin:
-            plugins.register(plugin)
+        # it is possible to block plugins from being registered into plugin chain in settings.yml
+        if module_name not in settings['blocked_plugins']:
+            plugin = load_and_initialize_plugin(module_name, external, (app, settings))
+            if plugin:
+                plugins.register(plugin)

searx/plugins/calculator.py

@@ -3,9 +3,13 @@
 """
 
 import ast
+import re
 import operator
 from multiprocessing import Process, Queue
+from typing import Callable
 
+import flask
+import babel
 from flask_babel import gettext
 
 from searx.plugins import logger
@@ -19,7 +23,7 @@ plugin_id = 'calculator'
 
 logger = logger.getChild(plugin_id)
 
-operators = {
+operators: dict[type, Callable] = {
     ast.Add: operator.add,
     ast.Sub: operator.sub,
     ast.Mult: operator.mul,
@@ -39,11 +43,15 @@ def _eval_expr(expr):
     >>> _eval_expr('1 + 2*3**(4^5) / (6 + -7)')
     -5.0
     """
-    return _eval(ast.parse(expr, mode='eval').body)
+    try:
+        return _eval(ast.parse(expr, mode='eval').body)
+    except ZeroDivisionError:
+        # This is undefined
+        return ""
 
 
 def _eval(node):
-    if isinstance(node, ast.Constant) and isinstance(node.value, int):
+    if isinstance(node, ast.Constant) and isinstance(node.value, (int, float)):
         return node.value
 
     if isinstance(node, ast.BinOp):
@@ -93,6 +101,19 @@ def post_search(_request, search):
     # replace commonly used math operators with their proper Python operator
     query = query.replace("x", "*").replace(":", "/")
 
+    # use UI language
+    ui_locale = babel.Locale.parse(flask.request.preferences.get_value('locale'), sep='-')
+
+    # parse the number system in a localized way
+    def _decimal(match: re.Match) -> str:
+        val = match.string[match.start() : match.end()]
+        val = babel.numbers.parse_decimal(val, ui_locale, numbering_system="latn")
+        return str(val)
+
+    decimal = ui_locale.number_symbols["latn"]["decimal"]
+    group = ui_locale.number_symbols["latn"]["group"]
+    query = re.sub(f"[0-9]+[{decimal}|{group}][0-9]+[{decimal}|{group}]?[0-9]?", _decimal, query)
+
     # only numbers and math operators are accepted
     if any(str.isalpha(c) for c in query):
         return True
@@ -102,10 +123,8 @@ def post_search(_request, search):
 
     # Prevent the runtime from being longer than 50 ms
     result = timeout_func(0.05, _eval_expr, query_py_formatted)
-    if result is None:
+    if result is None or result == "":
         return True
-    result = str(result)
-
-    if result != query:
-        search.result_container.answers['calculate'] = {'answer': f"{query} = {result}"}
+    result = babel.numbers.format_decimal(result, locale=ui_locale)
+    search.result_container.answers['calculate'] = {'answer': f"{search.search_query.query} = {result}"}
     return True

searx/search/processors/online_currency.py

@@ -23,7 +23,7 @@ def name_to_iso4217(name):
     currency = CURRENCIES['names'].get(name, [name])
     if isinstance(currency, str):
         return currency
-    return currency[0]
+    return currency[-1]
 
 
 def iso4217_to_name(iso4217, language):

searx/settings.yml

@@ -218,6 +218,12 @@ outgoing:
 #   - plugin2
 #   - ...
 
+# Plugins listed here will be loaded, but will not be registered into plugins chain.
+# The engine will not use them to process queries.
+#
+#blocked_plugins:
+#  - searx.plugins.self_info
+
 # Comment or un-comment plugin to activate / deactivate by default.
 #
 # enabled_plugins:
@@ -1283,6 +1289,12 @@ engines:
       require_api_key: false
       results: JSON
 
+  - name: openlibrary
+    engine: openlibrary
+    shortcut: ol
+    timeout: 5
+    disabled: true
+
   - name: openmeteo
     engine: open_meteo
     shortcut: om

searx/settings_defaults.py

@@ -235,6 +235,7 @@ SCHEMA = {
     },
     'plugins': SettingsValue(list, []),
     'enabled_plugins': SettingsValue((None, list), None),
+    'blocked_plugins': SettingsValue(list, []),
     'checker': {
         'off_when_debug': SettingsValue(bool, True, None),
         'scheduling': SettingsValue((None, dict), None, None),

searx/static/themes/simple/src/less/definitions.less

@@ -277,7 +277,7 @@
 @results-margin: 0.125rem;
 @result-padding: 1rem;
 @results-image-row-height: 12rem;
-@results-image-row-height-phone: 6rem;
+@results-image-row-height-phone: 10rem;
 @search-width: 44rem;
 // heigh of #search, see detail.less
 @search-height: 7.6rem;

searx/static/themes/simple/src/less/search.less

@@ -380,9 +380,9 @@ html.no-js #clear_search.hide_if_nojs {
 }
 
 .favicon img {
-  height: 1.8rem;
-  width: 1.8rem;
-  border-radius: 20%;
+  height: 1.5rem;
+  width: 1.5rem;
+  border-radius: 10%;
   background-color: var(--color-favicon-background-color);
   border: 1px solid var(--color-favicon-border-color);
   display: flex;

searx/static/themes/simple/src/less/style.less

@@ -456,6 +456,7 @@ article[data-vim-selected].category-social {
   margin: 0.25rem;
   border: none !important;
   height: @results-image-row-height;
+  width: unset;
 
   & > a {
     position: relative;
@@ -1107,6 +1108,7 @@ summary.title {
     margin: 0;
     height: @results-image-row-height-phone;
     background: var(--color-base-background-mobile);
+    width: unset;
   }
 
   .infobox {

searx/sxng_locales.py

@@ -16,9 +16,9 @@ sxng_locales = (
     ('bg', 'Български', '', 'Bulgarian', '\U0001f310'),
     ('bg-BG', 'Български', 'България', 'Bulgarian', '\U0001f1e7\U0001f1ec'),
     ('ca', 'Català', '', 'Catalan', '\U0001f310'),
-    ('ca-ES', 'Català', 'Espanya', 'Catalan', '\U0001f1ea\U0001f1f8'),
     ('cs', 'Čeština', '', 'Czech', '\U0001f310'),
     ('cs-CZ', 'Čeština', 'Česko', 'Czech', '\U0001f1e8\U0001f1ff'),
+    ('cy', 'Cymraeg', '', 'Welsh', '\U0001f310'),
     ('da', 'Dansk', '', 'Danish', '\U0001f310'),
     ('da-DK', 'Dansk', 'Danmark', 'Danish', '\U0001f1e9\U0001f1f0'),
     ('de', 'Deutsch', '', 'German', '\U0001f310'),
@@ -56,6 +56,8 @@ sxng_locales = (
     ('fr-CA', 'Français', 'Canada', 'French', '\U0001f1e8\U0001f1e6'),
     ('fr-CH', 'Français', 'Suisse', 'French', '\U0001f1e8\U0001f1ed'),
     ('fr-FR', 'Français', 'France', 'French', '\U0001f1eb\U0001f1f7'),
+    ('ga', 'Gaeilge', '', 'Irish', '\U0001f310'),
+    ('gd', 'Gàidhlig', '', 'Scottish Gaelic', '\U0001f310'),
     ('gl', 'Galego', '', 'Galician', '\U0001f310'),
     ('he', 'עברית', '', 'Hebrew', '\U0001f1ee\U0001f1f1'),
     ('hi', 'हिन्दी', '', 'Hindi', '\U0001f310'),
@@ -92,6 +94,7 @@ sxng_locales = (
     ('ru-RU', 'Русский', 'Россия', 'Russian', '\U0001f1f7\U0001f1fa'),
     ('sk', 'Slovenčina', '', 'Slovak', '\U0001f310'),
     ('sl', 'Slovenščina', '', 'Slovenian', '\U0001f310'),
+    ('sq', 'Shqip', '', 'Albanian', '\U0001f310'),
     ('sv', 'Svenska', '', 'Swedish', '\U0001f310'),
     ('sv-SE', 'Svenska', 'Sverige', 'Swedish', '\U0001f1f8\U0001f1ea'),
     ('ta', 'தமிழ்', '', 'Tamil', '\U0001f310'),
@@ -100,10 +103,8 @@ sxng_locales = (
     ('tr', 'Türkçe', '', 'Turkish', '\U0001f310'),
     ('tr-TR', 'Türkçe', 'Türkiye', 'Turkish', '\U0001f1f9\U0001f1f7'),
     ('uk', 'Українська', '', 'Ukrainian', '\U0001f310'),
-    ('uk-UA', 'Українська', 'Україна', 'Ukrainian', '\U0001f1fa\U0001f1e6'),
     ('ur', 'اردو', '', 'Urdu', '\U0001f310'),
     ('vi', 'Tiếng Việt', '', 'Vietnamese', '\U0001f310'),
-    ('vi-VN', 'Tiếng Việt', 'Việt Nam', 'Vietnamese', '\U0001f1fb\U0001f1f3'),
     ('zh', '中文', '', 'Chinese', '\U0001f310'),
     ('zh-CN', '中文', '中国', 'Chinese', '\U0001f1e8\U0001f1f3'),
     ('zh-HK', '中文', '中國香港特別行政區', 'Chinese', '\U0001f1ed\U0001f1f0'),

searx/translations/bg/LC_MESSAGES/messages.po

@@ -12,20 +12,23 @@
 # Salif Mehmed <mail@salif.eu>, 2023, 2024.
 # return42 <return42@users.noreply.translate.codeberg.org>, 2024.
 # krlsk <krlsk@users.noreply.translate.codeberg.org>, 2024.
+# stoychevww <stoychevww@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-05-25 08:18+0000\n"
-"Last-Translator: krlsk <krlsk@users.noreply.translate.codeberg.org>\n"
+"PO-Revision-Date: 2024-10-13 03:30+0000\n"
+"Last-Translator: stoychevww <stoychevww@users.noreply.translate.codeberg.org>"
+"\n"
+"Language-Team: Bulgarian <https://translate.codeberg.org/projects/searxng/"
+"searxng/bg/>\n"
 "Language: bg\n"
-"Language-Team: Bulgarian "
-"<https://translate.codeberg.org/projects/searxng/searxng/bg/>\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "MIME-Version: 1.0\n"
 "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.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -166,7 +169,7 @@ msgstr "тъмен"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr ""
+msgstr "черно"
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -334,17 +337,17 @@ msgstr "Автор"
 #. SOCIAL_MEDIA_TERMS['THREAD OPEN']
 #: searx/engines/discourse.py:149 searx/searxng.msg
 msgid "open"
-msgstr ""
+msgstr "отворено"
 
 #. SOCIAL_MEDIA_TERMS['THREAD CLOSED']
 #: searx/engines/discourse.py:149 searx/searxng.msg
 msgid "closed"
-msgstr ""
+msgstr "Затворено"
 
 #. SOCIAL_MEDIA_TERMS['THREAD ANSWERED']
 #: searx/engines/discourse.py:160 searx/searxng.msg
 msgid "answered"
-msgstr ""
+msgstr "Отговорено"
 
 #: searx/webapp.py:332
 msgid "No item found"
@@ -453,7 +456,7 @@ msgstr "Изчислете {functions} на аргументите"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr ""
+msgstr "Синоними"
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -1975,4 +1978,3 @@ msgstr "скрий видеото"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "Търсачките не можаха да намерят резултати"
-

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-06 14:31+0000\n"
+"PO-Revision-Date: 2024-10-26 21:13+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.7.2\n"
+"X-Generator: Weblate 5.8.1\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 "repos"
+msgstr "repositorios"
 
 #. CATEGORY_GROUPS['SOFTWARE_WIKIS']
 #: searx/searxng.msg

searx/translations/et/LC_MESSAGES/messages.po

@@ -17,7 +17,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-05 08:07+0000\n"
+"PO-Revision-Date: 2024-10-21 20:07+0000\n"
 "Last-Translator: Priit Jõerüüt <jrtcdbrg@users.noreply.translate.codeberg."
 "org>\n"
 "Language-Team: Estonian <https://translate.codeberg.org/projects/searxng/"
@@ -1155,8 +1155,8 @@ msgid ""
 "Note: specifying custom settings in the search URL can reduce privacy by "
 "leaking data to the clicked result sites."
 msgstr ""
-"Märkus: täpsemate seadete määramine otsingu URLis võib vähendada "
-"privaatsust, lekitades andmed klõpsatud tulemuste saitidele."
+"Märkus: lekitades andmed klõpsatud tulemuste saitidele võib täpsemate "
+"seadete määramine otsingu URLis vähendada privaatsust."
 
 #: searx/templates/simple/preferences/cookies.html:35
 msgid "URL to restore your preferences in another browser"

searx/translations/fr/LC_MESSAGES/messages.po

@@ -25,20 +25,22 @@
 # wags07 <wags07@users.noreply.translate.codeberg.org>, 2024.
 # Aeris1One <Aeris1One@users.noreply.translate.codeberg.org>, 2024.
 # kratos <kratos@users.noreply.translate.codeberg.org>, 2024.
+# hemie143 <hemie143@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-09-24 19:18+0000\n"
-"Last-Translator: kratos <kratos@users.noreply.translate.codeberg.org>\n"
+"PO-Revision-Date: 2024-10-18 07:22+0000\n"
+"Last-Translator: hemie143 <hemie143@users.noreply.translate.codeberg.org>\n"
+"Language-Team: French <https://translate.codeberg.org/projects/searxng/"
+"searxng/fr/>\n"
 "Language: fr\n"
-"Language-Team: French "
-"<https://translate.codeberg.org/projects/searxng/searxng/fr/>\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
 "MIME-Version: 1.0\n"
 "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.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -179,7 +181,7 @@ msgstr "sombre"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr ""
+msgstr "noir"
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -466,7 +468,7 @@ msgstr "Calcule les {functions} des arguments"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr ""
+msgstr "Synonymes"
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -1235,11 +1237,11 @@ msgstr "Temps max"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr ""
+msgstr "Résolveur de Favicon"
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr ""
+msgstr "Affiche les favicons à côté des résultats de recherche"
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""
@@ -2013,4 +2015,3 @@ msgstr "cacher la vidéo"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "Les moteurs ne peuvent pas récupérer de résultats"
-

searx/translations/nl/LC_MESSAGES/messages.po

@@ -22,21 +22,22 @@
 # 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"
+"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-09-05 06:18+0000\n"
-"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>"
-"\n"
+"PO-Revision-Date: 2024-10-28 21:07+0000\n"
+"Last-Translator: ljansen <ljansen@users.noreply.translate.codeberg.org>\n"
+"Language-Team: Dutch <https://translate.codeberg.org/projects/searxng/"
+"searxng/nl/>\n"
 "Language: nl\n"
-"Language-Team: Dutch "
-"<https://translate.codeberg.org/projects/searxng/searxng/nl/>\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "MIME-Version: 1.0\n"
 "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"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -177,7 +178,7 @@ msgstr "donker"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr ""
+msgstr "zwart"
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -464,7 +465,7 @@ msgstr "Bereken {functions} van de opties"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr ""
+msgstr "Synoniemen"
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -1234,12 +1235,13 @@ msgid "Max time"
 msgstr "Max. duur"
 
 #: searx/templates/simple/preferences/favicon.html:2
+#, fuzzy
 msgid "Favicon Resolver"
-msgstr ""
+msgstr "favicon-resolver"
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr ""
+msgstr "Vertoon zoekresultaten naast favicons"
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""
@@ -2004,4 +2006,3 @@ msgstr "verberg video"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "Zoekmachines konden geen resultaten ophalen"
-

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-08 13:41+0000\n"
-"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
+"PO-Revision-Date: 2024-10-28 21:07+0000\n"
+"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\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.7.2\n"
+"X-Generator: Weblate 5.8.1\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -1230,11 +1230,11 @@ msgstr "Maksymalny czas"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr ""
+msgstr "Pobieranie favikony"
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr ""
+msgstr "Wyświetlanie faviconów obok wyników wyszukiwania"
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""

searx/translations/pt/LC_MESSAGES/messages.po

@@ -18,21 +18,24 @@
 # diodio <diodio@users.noreply.translate.codeberg.org>, 2024.
 # 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"
+"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-09-05 06:18+0000\n"
-"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>"
-"\n"
+"PO-Revision-Date: 2024-10-29 05:54+0000\n"
+"Last-Translator: saltsnorter <saltsnorter@users.noreply.translate.codeberg."
+"org>\n"
+"Language-Team: Portuguese <https://translate.codeberg.org/projects/searxng/"
+"searxng/pt/>\n"
 "Language: pt\n"
-"Language-Team: Portuguese "
-"<https://translate.codeberg.org/projects/searxng/searxng/pt/>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
 "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"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -173,7 +176,7 @@ msgstr "escuro"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr ""
+msgstr "preto"
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -460,7 +463,7 @@ msgstr "Calcular {functions} dos argumentos"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr ""
+msgstr "Sinônimos"
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -695,7 +698,7 @@ msgstr "Comprimento"
 
 #: searx/templates/simple/macros.html:41
 msgid "Views"
-msgstr ""
+msgstr "Viazualisações"
 
 #: searx/templates/simple/macros.html:42
 #: searx/templates/simple/result_templates/files.html:34
@@ -1226,11 +1229,11 @@ msgstr "Tempo máximo"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr ""
+msgstr "Solucionador do Favicon"
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr ""
+msgstr "Monstra os favicons nos proximos os resultados"
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""
@@ -1997,4 +2000,3 @@ msgstr "esconder vídeo"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "Mecanismos não podem recuperar resultados"
-

searx/translations/pt_BR/LC_MESSAGES/messages.po

@@ -30,21 +30,22 @@
 # 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"
+"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-09-05 06:18+0000\n"
-"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>"
-"\n"
+"PO-Revision-Date: 2024-10-31 12:16+0000\n"
+"Last-Translator: Juno Takano <jutty@users.noreply.translate.codeberg.org>\n"
+"Language-Team: Portuguese (Brazil) <https://translate.codeberg.org/projects/"
+"searxng/searxng/pt_BR/>\n"
 "Language: pt_BR\n"
-"Language-Team: Portuguese (Brazil) "
-"<https://translate.codeberg.org/projects/searxng/searxng/pt_BR/>\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
 "MIME-Version: 1.0\n"
 "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"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -185,7 +186,7 @@ msgstr "escuro"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr ""
+msgstr "preto"
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -472,7 +473,7 @@ msgstr "Computar {functions} dos argumentos"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr ""
+msgstr "Sinônimos"
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -1243,11 +1244,11 @@ msgstr "Tempo máximo"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr ""
+msgstr "Resolvedor de Favicons"
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr ""
+msgstr "Exibir favicons próximo aos resultados da pesquisa"
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""
@@ -2018,4 +2019,3 @@ msgstr "ocultar vídeo"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "Os motores de busca não conseguiram obter resultados"
-

searx/translations/tr/LC_MESSAGES/messages.po

@@ -24,19 +24,19 @@
 # ulsaa <ulsaa@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-09-05 06:18+0000\n"
-"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>"
-"\n"
+"PO-Revision-Date: 2024-10-15 12:18+0000\n"
+"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
+"Language-Team: Turkish <https://translate.codeberg.org/projects/searxng/"
+"searxng/tr/>\n"
 "Language: tr\n"
-"Language-Team: Turkish "
-"<https://translate.codeberg.org/projects/searxng/searxng/tr/>\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "MIME-Version: 1.0\n"
 "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.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 
 #. CONSTANT_NAMES['NO_SUBGROUPING']
@@ -177,7 +177,7 @@ msgstr "karanlık"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr ""
+msgstr "siyah"
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -464,7 +464,7 @@ msgstr "Bağımsız değişkenlerin {functions} değerini hesapla"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr ""
+msgstr "Eş Anlamlılar"
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -1231,11 +1231,11 @@ msgstr "En fazla zaman"
 
 #: searx/templates/simple/preferences/favicon.html:2
 msgid "Favicon Resolver"
-msgstr ""
+msgstr "Favicon Çözümleyicisi"
 
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr ""
+msgstr "Arama sonuçlarının yanında favsimgelerini göster"
 
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""
@@ -1990,4 +1990,3 @@ msgstr "görüntüyü gizle"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "Motorlar sonuçları alamıyor"
-

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-08-07 01:02+0000\n"
-"Last-Translator: tvminh19 <tvminh19@users.noreply.translate.codeberg.org>"
-"\n"
+"PO-Revision-Date: 2024-10-26 21:13+0000\n"
+"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
+"Language-Team: Vietnamese <https://translate.codeberg.org/projects/searxng/"
+"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 ""
+msgstr "Mây che phủ"
 
 #. 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 ""
+msgstr "Gió"
 
 #. SOCIAL_MEDIA_TERMS['SUBSCRIBERS']
 #: searx/engines/lemmy.py:85 searx/searxng.msg
@@ -1990,4 +1990,3 @@ 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,18 +28,19 @@
 # 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-08-12 04:00+0000\n"
-"Last-Translator: hugoalh <hugoalh@users.noreply.translate.codeberg.org>\n"
+"PO-Revision-Date: 2024-10-26 21:13+0000\n"
+"Last-Translator: return42 <return42@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']
@@ -180,7 +181,7 @@ msgstr "黑暗"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr ""
+msgstr "黑色"
 
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@@ -467,7 +468,7 @@ msgstr "計算 {functions} 參數"
 
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr ""
+msgstr "同義詞"
 
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@@ -942,7 +943,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"
@@ -1206,11 +1207,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 ""
@@ -1911,4 +1912,3 @@ msgstr "隱藏影片"
 
 #~ msgid "Engines cannot retrieve results"
 #~ msgstr "引擎無法擷取結果"
-

searx/webapp.py

@@ -517,7 +517,7 @@ def pre_request():
         preferences.parse_dict({"language": language})
         logger.debug('set language %s (from browser)', preferences.get_value("language"))
 
-    # locale is defined neither in settings nor in preferences
+    # UI locale is defined neither in settings nor in preferences
     # use browser headers
     if not preferences.get_value("locale"):
         locale = _get_browser_language(request, LOCALE_NAMES.keys())

searxng_extra/update/update_engine_traits.py

@@ -101,7 +101,7 @@ def fetch_traits_map():
 def filter_locales(traits_map: EngineTraitsMap):
     """Filter language & region tags by a threshold."""
 
-    min_eng_per_region = 15
+    min_eng_per_region = 18
     min_eng_per_lang = 20
 
     _ = {}

tests/unit/test_locales.py

@@ -32,12 +32,10 @@ class TestLocales(SearxTestCase):
 
     @parameterized.expand(
         [
-            ('ca-es', 'ca-ES'),
             ('de-at', 'de-AT'),
             ('de-de', 'de-DE'),
             ('en-UK', 'en-GB'),
             ('fr-be', 'fr-BE'),
-            ('fr-be', 'fr-BE'),
             ('fr-ca', 'fr-CA'),
             ('fr-ch', 'fr-CH'),
             ('zh-cn', 'zh-CN'),

tests/unit/test_plugin_calculator.py

@@ -0,0 +1,103 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# pylint: disable=missing-module-docstring
+
+import flask
+from parameterized.parameterized import parameterized
+from searx import plugins
+from searx import preferences
+from tests import SearxTestCase
+from .test_utils import random_string
+
+from .test_plugins import get_search_mock
+
+
+class PluginCalculator(SearxTestCase):  # pylint: disable=missing-class-docstring
+
+    def setUp(self):
+        from searx import webapp  # pylint: disable=import-outside-toplevel
+
+        self.webapp = webapp
+        self.store = plugins.PluginStore()
+        plugin = plugins.load_and_initialize_plugin('searx.plugins.calculator', False, (None, {}))
+        self.store.register(plugin)
+        self.preferences = preferences.Preferences(["simple"], ["general"], {}, self.store)
+        self.preferences.parse_dict({"locale": "en"})
+
+    def test_plugin_store_init(self):
+        self.assertEqual(1, len(self.store.plugins))
+
+    def test_single_page_number_true(self):
+        with self.webapp.app.test_request_context():
+            flask.request.preferences = self.preferences
+            search = get_search_mock(query=random_string(10), pageno=2)
+            result = self.store.call(self.store.plugins, 'post_search', flask.request, search)
+
+        self.assertTrue(result)
+        self.assertNotIn('calculate', search.result_container.answers)
+
+    def test_long_query_true(self):
+        with self.webapp.app.test_request_context():
+            flask.request.preferences = self.preferences
+            search = get_search_mock(query=random_string(101), pageno=1)
+            result = self.store.call(self.store.plugins, 'post_search', flask.request, search)
+
+        self.assertTrue(result)
+        self.assertNotIn('calculate', search.result_container.answers)
+
+    def test_alpha_true(self):
+        with self.webapp.app.test_request_context():
+            flask.request.preferences = self.preferences
+            search = get_search_mock(query=random_string(10), pageno=1)
+            result = self.store.call(self.store.plugins, 'post_search', flask.request, search)
+
+        self.assertTrue(result)
+        self.assertNotIn('calculate', search.result_container.answers)
+
+    @parameterized.expand(
+        [
+            ("1+1", "2", "en"),
+            ("1-1", "0", "en"),
+            ("1*1", "1", "en"),
+            ("1/1", "1", "en"),
+            ("1**1", "1", "en"),
+            ("1^1", "1", "en"),
+            ("1,000.0+1,000.0", "2,000", "en"),
+            ("1.0+1.0", "2", "en"),
+            ("1.0-1.0", "0", "en"),
+            ("1.0*1.0", "1", "en"),
+            ("1.0/1.0", "1", "en"),
+            ("1.0**1.0", "1", "en"),
+            ("1.0^1.0", "1", "en"),
+            ("1.000,0+1.000,0", "2.000", "de"),
+            ("1,0+1,0", "2", "de"),
+            ("1,0-1,0", "0", "de"),
+            ("1,0*1,0", "1", "de"),
+            ("1,0/1,0", "1", "de"),
+            ("1,0**1,0", "1", "de"),
+            ("1,0^1,0", "1", "de"),
+        ]
+    )
+    def test_localized_query(self, operation: str, contains_result: str, lang: str):
+        with self.webapp.app.test_request_context():
+            self.preferences.parse_dict({"locale": lang})
+            flask.request.preferences = self.preferences
+            search = get_search_mock(query=operation, lang=lang, pageno=1)
+            result = self.store.call(self.store.plugins, 'post_search', flask.request, search)
+
+        self.assertTrue(result)
+        self.assertIn('calculate', search.result_container.answers)
+        self.assertIn(contains_result, search.result_container.answers['calculate']['answer'])
+
+    @parameterized.expand(
+        [
+            "1/0",
+        ]
+    )
+    def test_invalid_operations(self, operation):
+        with self.webapp.app.test_request_context():
+            flask.request.preferences = self.preferences
+            search = get_search_mock(query=operation, pageno=1)
+            result = self.store.call(self.store.plugins, 'post_search', flask.request, search)
+
+        self.assertTrue(result)
+        self.assertNotIn('calculate', search.result_container.answers)

tests/unit/test_plugin_hash.py

@@ -0,0 +1,51 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# pylint: disable=missing-module-docstring, invalid-name
+
+from mock import Mock
+from parameterized.parameterized import parameterized
+from searx import plugins
+from tests import SearxTestCase
+
+from .test_plugins import get_search_mock
+
+
+class PluginHashTest(SearxTestCase):  # pylint: disable=missing-class-docstring
+    def setUp(self):
+        self.store = plugins.PluginStore()
+        plugin = plugins.load_and_initialize_plugin('searx.plugins.hash_plugin', False, (None, {}))
+        self.store.register(plugin)
+
+    def test_plugin_store_init(self):
+        self.assertEqual(1, len(self.store.plugins))
+
+    @parameterized.expand(
+        [
+            ('md5 test', 'md5 hash digest: 098f6bcd4621d373cade4e832627b4f6'),
+            ('sha1 test', 'sha1 hash digest: a94a8fe5ccb19ba61c4c0873d391e987982fbbd3'),
+            ('sha224 test', 'sha224 hash digest: 90a3ed9e32b2aaf4c61c410eb925426119e1a9dc53d4286ade99a809'),
+            ('sha256 test', 'sha256 hash digest: 9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08'),
+            (
+                'sha384 test',
+                'sha384 hash digest: 768412320f7b0aa5812fce428dc4706b3c'
+                'ae50e02a64caa16a782249bfe8efc4b7ef1ccb126255d196047dfedf1'
+                '7a0a9',
+            ),
+            (
+                'sha512 test',
+                'sha512 hash digest: ee26b0dd4af7e749aa1a8ee3c10ae9923f6'
+                '18980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5'
+                'fa9ad8e6f57f50028a8ff',
+            ),
+        ]
+    )
+    def test_hash_digest_new(self, query: str, hash_str: str):
+        request = Mock(remote_addr='127.0.0.1')
+        search = get_search_mock(query=query, pageno=1)
+        self.store.call(self.store.plugins, 'post_search', request, search)
+        self.assertIn(hash_str, search.result_container.answers['hash']['answer'])
+
+    def test_md5_bytes_no_answer(self):
+        request = Mock(remote_addr='127.0.0.1')
+        search = get_search_mock(query=b'md5 test', pageno=2)
+        self.store.call(self.store.plugins, 'post_search', request, search)
+        self.assertNotIn('hash', search.result_container.answers)

tests/unit/test_plugin_self_info.py

@@ -0,0 +1,65 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# pylint: disable=missing-module-docstring, invalid-name
+
+from mock import Mock
+from parameterized.parameterized import parameterized
+
+from searx import (
+    plugins,
+    limiter,
+    botdetection,
+)
+from tests import SearxTestCase
+from .test_plugins import get_search_mock
+
+
+class PluginIPSelfInfo(SearxTestCase):  # pylint: disable=missing-class-docstring
+    def setUp(self):
+        plugin = plugins.load_and_initialize_plugin('searx.plugins.self_info', False, (None, {}))
+        self.store = plugins.PluginStore()
+        self.store.register(plugin)
+        cfg = limiter.get_cfg()
+        botdetection.init(cfg, None)
+
+    def test_plugin_store_init(self):
+        self.assertEqual(1, len(self.store.plugins))
+
+    def test_ip_in_answer(self):
+        request = Mock()
+        request.remote_addr = '127.0.0.1'
+        request.headers = {'X-Forwarded-For': '1.2.3.4, 127.0.0.1', 'X-Real-IP': '127.0.0.1'}
+        search = get_search_mock(query='ip', pageno=1)
+        self.store.call(self.store.plugins, 'post_search', request, search)
+        self.assertIn('127.0.0.1', search.result_container.answers["ip"]["answer"])
+
+    def test_ip_not_in_answer(self):
+        request = Mock()
+        request.remote_addr = '127.0.0.1'
+        request.headers = {'X-Forwarded-For': '1.2.3.4, 127.0.0.1', 'X-Real-IP': '127.0.0.1'}
+        search = get_search_mock(query='ip', pageno=2)
+        self.store.call(self.store.plugins, 'post_search', request, search)
+        self.assertNotIn('ip', search.result_container.answers)
+
+    @parameterized.expand(
+        [
+            'user-agent',
+            'What is my User-Agent?',
+        ]
+    )
+    def test_user_agent_in_answer(self, query: str):
+        request = Mock(user_agent=Mock(string='Mock'))
+        search = get_search_mock(query=query, pageno=1)
+        self.store.call(self.store.plugins, 'post_search', request, search)
+        self.assertIn('Mock', search.result_container.answers["user-agent"]["answer"])
+
+    @parameterized.expand(
+        [
+            'user-agent',
+            'What is my User-Agent?',
+        ]
+    )
+    def test_user_agent_not_in_answer(self, query: str):
+        request = Mock(user_agent=Mock(string='Mock'))
+        search = get_search_mock(query=query, pageno=2)
+        self.store.call(self.store.plugins, 'post_search', request, search)
+        self.assertNotIn('user-agent', search.result_container.answers)

tests/unit/test_plugins.py

@@ -1,19 +1,15 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 # pylint: disable=missing-module-docstring
 
+import babel
 from mock import Mock
-from parameterized.parameterized import parameterized
-
-from searx import (
-    plugins,
-    limiter,
-    botdetection,
-)
-
+from searx import plugins
 from tests import SearxTestCase
 
 
 def get_search_mock(query, **kwargs):
+    lang = kwargs.get("lang", "en-US")
+    kwargs["locale"] = babel.Locale.parse(lang, sep="-")
     return Mock(search_query=Mock(query=query, **kwargs), result_container=Mock(answers={}))
 
 
@@ -52,97 +48,3 @@ class PluginStoreTest(SearxTestCase):  # pylint: disable=missing-class-docstring
         request = Mock()
         store.call([testplugin], 'asdf', request, Mock())
         self.assertTrue(getattr(testplugin, 'asdf').called)  # pylint: disable=E1101
-
-
-class PluginIPSelfInfo(SearxTestCase):  # pylint: disable=missing-class-docstring
-    def setUp(self):
-        plugin = plugins.load_and_initialize_plugin('searx.plugins.self_info', False, (None, {}))
-        self.store = plugins.PluginStore()
-        self.store.register(plugin)
-        cfg = limiter.get_cfg()
-        botdetection.init(cfg, None)
-
-    def test_plugin_store_init(self):
-        self.assertEqual(1, len(self.store.plugins))
-
-    def test_ip_in_answer(self):
-        request = Mock()
-        request.remote_addr = '127.0.0.1'
-        request.headers = {'X-Forwarded-For': '1.2.3.4, 127.0.0.1', 'X-Real-IP': '127.0.0.1'}
-        search = get_search_mock(query='ip', pageno=1)
-        self.store.call(self.store.plugins, 'post_search', request, search)
-        self.assertIn('127.0.0.1', search.result_container.answers["ip"]["answer"])
-
-    def test_ip_not_in_answer(self):
-        request = Mock()
-        request.remote_addr = '127.0.0.1'
-        request.headers = {'X-Forwarded-For': '1.2.3.4, 127.0.0.1', 'X-Real-IP': '127.0.0.1'}
-        search = get_search_mock(query='ip', pageno=2)
-        self.store.call(self.store.plugins, 'post_search', request, search)
-        self.assertNotIn('ip', search.result_container.answers)
-
-    @parameterized.expand(
-        [
-            'user-agent',
-            'What is my User-Agent?',
-        ]
-    )
-    def test_user_agent_in_answer(self, query: str):
-        request = Mock(user_agent=Mock(string='Mock'))
-        search = get_search_mock(query=query, pageno=1)
-        self.store.call(self.store.plugins, 'post_search', request, search)
-        self.assertIn('Mock', search.result_container.answers["user-agent"]["answer"])
-
-    @parameterized.expand(
-        [
-            'user-agent',
-            'What is my User-Agent?',
-        ]
-    )
-    def test_user_agent_not_in_answer(self, query: str):
-        request = Mock(user_agent=Mock(string='Mock'))
-        search = get_search_mock(query=query, pageno=2)
-        self.store.call(self.store.plugins, 'post_search', request, search)
-        self.assertNotIn('user-agent', search.result_container.answers)
-
-
-class PluginHashTest(SearxTestCase):  # pylint: disable=missing-class-docstring
-    def setUp(self):
-        self.store = plugins.PluginStore()
-        plugin = plugins.load_and_initialize_plugin('searx.plugins.hash_plugin', False, (None, {}))
-        self.store.register(plugin)
-
-    def test_plugin_store_init(self):
-        self.assertEqual(1, len(self.store.plugins))
-
-    @parameterized.expand(
-        [
-            ('md5 test', 'md5 hash digest: 098f6bcd4621d373cade4e832627b4f6'),
-            ('sha1 test', 'sha1 hash digest: a94a8fe5ccb19ba61c4c0873d391e987982fbbd3'),
-            ('sha224 test', 'sha224 hash digest: 90a3ed9e32b2aaf4c61c410eb925426119e1a9dc53d4286ade99a809'),
-            ('sha256 test', 'sha256 hash digest: 9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08'),
-            (
-                'sha384 test',
-                'sha384 hash digest: 768412320f7b0aa5812fce428dc4706b3c'
-                'ae50e02a64caa16a782249bfe8efc4b7ef1ccb126255d196047dfedf1'
-                '7a0a9',
-            ),
-            (
-                'sha512 test',
-                'sha512 hash digest: ee26b0dd4af7e749aa1a8ee3c10ae9923f6'
-                '18980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5'
-                'fa9ad8e6f57f50028a8ff',
-            ),
-        ]
-    )
-    def test_hash_digest_new(self, query: str, hash_str: str):
-        request = Mock(remote_addr='127.0.0.1')
-        search = get_search_mock(query=query, pageno=1)
-        self.store.call(self.store.plugins, 'post_search', request, search)
-        self.assertIn(hash_str, search.result_container.answers['hash']['answer'])
-
-    def test_md5_bytes_no_answer(self):
-        request = Mock(remote_addr='127.0.0.1')
-        search = get_search_mock(query=b'md5 test', pageno=2)
-        self.store.call(self.store.plugins, 'post_search', request, search)
-        self.assertNotIn('hash', search.result_container.answers)

tests/unit/test_toml.py

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# pylint: disable=missing-module-docstring
+
+from tests import SearxTestCase
+from searx import compat
+from searx.favicons.config import DEFAULT_CFG_TOML_PATH
+
+
+class CompatTest(SearxTestCase):  # pylint: disable=missing-class-docstring
+
+    def test_toml(self):
+        with DEFAULT_CFG_TOML_PATH.open("rb") as f:
+            _ = compat.tomllib.load(f)

tests/unit/test_utils.py

@@ -1,16 +1,21 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 # pylint: disable=missing-module-docstring, invalid-name
 
+import random
+import string
 import lxml.etree
 from lxml import html
 from parameterized.parameterized import parameterized
 
 from searx.exceptions import SearxXPathSyntaxException, SearxEngineXPathException
 from searx import utils
-
 from tests import SearxTestCase
 
 
+def random_string(length, choices=string.ascii_letters):
+    return ''.join(random.choice(choices) for _ in range(length))
+
+
 class TestUtils(SearxTestCase):  # pylint: disable=missing-class-docstring
     def test_gen_useragent(self):
         self.assertIsInstance(utils.gen_useragent(), str)
@@ -234,4 +239,4 @@ class TestXPathUtils(SearxTestCase):  # pylint: disable=missing-class-docstring
         self.assertIsNone(l)
 
         with self.assertRaises(ValueError):
-            utils.detect_language(None)
+            utils.detect_language(None)  # type: ignore

tests/unit/test_webapp.py

@@ -4,6 +4,7 @@
 import logging
 import json
 from urllib.parse import ParseResult
+import babel
 from mock import Mock
 from searx.results import Timing
 
@@ -82,6 +83,7 @@ class ViewsTestCase(SearxTestCase):  # pylint: disable=missing-class-docstring,
                 redirect_url=None,
                 engine_data={},
             )
+            search_self.search_query.locale = babel.Locale.parse("en-US", sep='-')
 
         self.setattr4test(Search, 'search', search_mock)