[fix] chatnoir: fails to extract API session parameters

Closes: https://github.com/searxng/searxng/issues/6545

client/simple/package-lock.json

@@ -15,8 +15,8 @@
         "swiped-events": "1.2.0"
       },
       "devDependencies": {
-        "@biomejs/biome": "2.5.9",
+        "@biomejs/biome": "2.5.10",
-        "@types/node": "^26.2.0",
+        "@types/node": "^26.3.0",
         "browserslist": "^4.28.8",
         "browserslist-to-esbuild": "^2.1.1",
         "edge.js": "^6.5.1",
@@ -27,9 +27,9 @@
         "stylelint": "^17.14.1",
         "stylelint-config-standard-less": "^4.1.0",
         "stylelint-prettier": "^5.0.3",
-        "svgo": "^4.0.2",
+        "svgo": "^4.1.0",
         "typescript": "~7.0.2",
-        "vite": "^8.2.1",
+        "vite": "^8.2.2",
         "vite-bundle-analyzer": "^1.3.9"
       }
     },
@@ -69,9 +69,9 @@
       }
     },
     "node_modules/@biomejs/biome": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.5.10.tgz",
-      "integrity": "sha512-KkgCvdHB4IhtpHpF564plA9jo6fDOwWGQ/3jvreLzgOtRLEDoPqr7QO9qejNA8jKwDsSkAKr77hqBHnyUbIw4g==",
+      "integrity": "sha512-WRKXARA3kTuiV5sxqTpobJ/I0MVd4vk3pOL6wnp5az4LntFIhWTj1RWZq3DI9PCEN3lXcqy7p5aqUHzvq8AXyQ==",
       "dev": true,
       "license": "MIT OR Apache-2.0",
       "bin": {
@@ -85,20 +85,20 @@
         "url": "https://opencollective.com/biome"
       },
       "optionalDependencies": {
-        "@biomejs/cli-darwin-arm64": "2.5.9",
+        "@biomejs/cli-darwin-arm64": "2.5.10",
-        "@biomejs/cli-darwin-x64": "2.5.9",
+        "@biomejs/cli-darwin-x64": "2.5.10",
-        "@biomejs/cli-linux-arm64": "2.5.9",
+        "@biomejs/cli-linux-arm64": "2.5.10",
-        "@biomejs/cli-linux-arm64-musl": "2.5.9",
+        "@biomejs/cli-linux-arm64-musl": "2.5.10",
-        "@biomejs/cli-linux-x64": "2.5.9",
+        "@biomejs/cli-linux-x64": "2.5.10",
-        "@biomejs/cli-linux-x64-musl": "2.5.9",
+        "@biomejs/cli-linux-x64-musl": "2.5.10",
-        "@biomejs/cli-win32-arm64": "2.5.9",
+        "@biomejs/cli-win32-arm64": "2.5.10",
-        "@biomejs/cli-win32-x64": "2.5.9"
+        "@biomejs/cli-win32-x64": "2.5.10"
       }
     },
     "node_modules/@biomejs/cli-darwin-arm64": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.5.10.tgz",
-      "integrity": "sha512-am22pX2aBqznqq1eMyIj/bZ++riF3Lk6ct7cbv+gQK0csFhr+d8O0RkOi2FF2qSgFgANbqNkIZ0/PxlnW2pLFg==",
+      "integrity": "sha512-ItCrxKK6SXVT6flYs0qIuBd4AA3TTTl4d66Re6YI2FuGZnN85NmuYNzkiTJUyYw8qBLv69L5zTUB6uyWd++h3Q==",
       "cpu": [
         "arm64"
       ],
@@ -113,9 +113,9 @@
       }
     },
     "node_modules/@biomejs/cli-darwin-x64": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.5.10.tgz",
-      "integrity": "sha512-l44KWDHLDvEnD0N/XcrVs7VXb3A18xL7QS3WB0eL93wbmk529ffIG55vleGCqaunpRUjLrdnjK05Qki1dsjylg==",
+      "integrity": "sha512-yLsPU9pAmtChXDu8vhKAzErqe+LeeYuwuUB2FZMkRitsmdodxsYRa9KHrFispsUHzzOu+9HB3nP/TQxyia+Sjw==",
       "cpu": [
         "x64"
       ],
@@ -130,9 +130,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-arm64": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.5.10.tgz",
-      "integrity": "sha512-ICaK+IYaVZvKbBxX2rwrPT0DdUDMnE9Vm3nQGe+mltQPmUg19pONzkPWGdY4FCsoreDETWDynvdt4ysCbF5gNQ==",
+      "integrity": "sha512-VG8uQW/86a1roLaIFvtIbEigxIdzdJ190oGyg1tV7VYeQtOS+x10sflk7WbuXgw91EtZX5DlIIIej1YqkNLlcg==",
       "cpu": [
         "arm64"
       ],
@@ -150,9 +150,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-arm64-musl": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.5.10.tgz",
-      "integrity": "sha512-7ImVPwBLCtkmpR5esd8RHhTqW94f0JLJQum6AneYcy94jRm18TaPPm7slaigGzFhfgt3QiD1Vj52LKmBAnKizA==",
+      "integrity": "sha512-t1QAKZwQJRB4dvgJSgFiQ4BNfNPChg69BNonz854qLVxnjT3UvDzQg9mbkTJRu35ZqU0Rw10A73J8Urgbg2RPw==",
       "cpu": [
         "arm64"
       ],
@@ -170,9 +170,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-x64": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.5.10.tgz",
-      "integrity": "sha512-z22Q/zFYSvbIJfW1CbfZPu4X8PddS6Qd2ORbc6h+aT6EcwAxUF3m6fA4HjNvA3TU4X0dTJRwNPB165ES3PJXzg==",
+      "integrity": "sha512-4O6T0eq2heoHZN0a9UX+rWQoxXEBaKf+lRi2hbsGlHneUz9BWXM76nEWMK7Eeq8gzMxR1khQB6BFpAASpeXqGg==",
       "cpu": [
         "x64"
       ],
@@ -190,9 +190,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-x64-musl": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.5.10.tgz",
-      "integrity": "sha512-RXGaD0o1/pTTguYw1aeDJh9ad6Lfrui0fI7mBderTyGr7WuUJkBIttgLkR3XJyoxOkkgfBDspaUT8wXArTqLZw==",
+      "integrity": "sha512-pgDDqp9JybHm2I0KRgzN6i4+lt8xu4iqxUwLzglUMmOmyRTU1AYBGKzh9sNMOtIjah7xoWvKHlLVetvyifzoiQ==",
       "cpu": [
         "x64"
       ],
@@ -210,9 +210,9 @@
       }
     },
     "node_modules/@biomejs/cli-win32-arm64": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.5.10.tgz",
-      "integrity": "sha512-nHK+/HHC+D0ogAHUxomgoSTdjImb6fmNNVTKmf0tyu4eDL1DqPKIHc+i+UL8+b0RnAu8224qo8F2tCVnaT0A3w==",
+      "integrity": "sha512-pxAbxduPO4xq/Cvgaa2lOrs9BB0hEXmmDqfMNP4ZOffGOkUrD1/QGw9UAMpFQpX2P8MqTIIRuQKcmetum4Oa6A==",
       "cpu": [
         "arm64"
       ],
@@ -227,9 +227,9 @@
       }
     },
     "node_modules/@biomejs/cli-win32-x64": {
-      "version": "2.5.9",
+      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.5.10.tgz",
-      "integrity": "sha512-Yiq0H56LjXSSw/hd9YkXgSLQfzyDJzbzU2TezozxyNw+uKWAqOtqGVvBfzKRRDiaFF5avGAhHdWKx7LtDOShUw==",
+      "integrity": "sha512-M+2dgBsl3lXRiTfgPVc2p3anS4Tocojke4rzFLScZ2Y/wmF+36dRb1iHCLiyGqOzQGyTplZH1HnEYviiAqi3nA==",
       "cpu": [
         "x64"
       ],
@@ -1577,9 +1577,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "26.2.0",
+      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.3.0.tgz",
-      "integrity": "sha512-5IviulTZeRNp2vAJ514cc/HUlY5nZ9fCbq9DMyC52BrhFZACo3nI0R7qBxhQmo/d27NFe96ur/b7Wwxklda+kg==",
+      "integrity": "sha512-L3fgrnchriRC2ExBflb8j4uZZURHZfQsmQeyVzhjcHW4kkwVyo8/0h1B2MVzMTrYUJYu6G7EWs14hW/L9putqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2284,17 +2284,17 @@
       }
     },
     "node_modules/css-select": {
-      "version": "5.2.2",
+      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-6.0.0.tgz",
-      "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==",
+      "integrity": "sha512-rZZVSLle8v0+EY8QAkDWrKhpgt6SA5OtHsgBnsj6ZaLb5dmDVOWUDtQitd9ydxxvEjhewNudS6eTVU7uOyzvXw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
+        "css-what": "^7.0.0",
-        "domhandler": "^5.0.2",
+        "domhandler": "^5.0.3",
-        "domutils": "^3.0.1",
+        "domutils": "^3.2.2",
-        "nth-check": "^2.0.1"
+        "nth-check": "^2.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/fb55"
@@ -2315,9 +2315,9 @@
       }
     },
     "node_modules/css-what": {
-      "version": "6.2.2",
+      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-7.0.0.tgz",
-      "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
+      "integrity": "sha512-wD5oz5xibMOPHzy13CyGmogB3phdvcDaB5t0W/Nr5Z2O/agcB8YwOz6e2Lsp10pNDzBoDO9nVa3RGs/2BttpHQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -4275,9 +4275,9 @@
       "optional": true
     },
     "node_modules/sax": {
-      "version": "1.6.0",
+      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.1.tgz",
-      "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
+      "integrity": "sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -4769,19 +4769,19 @@
       "dev": true
     },
     "node_modules/svgo": {
-      "version": "4.0.2",
+      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.1.0.tgz",
-      "integrity": "sha512-ekx94z1rRc5LDi6oSUaeRnYhd0UOJxdtQCL2rF8xpWxD3TPAsISWOrxezqGovqS38GRZOdpDfvQe3ts6F7nsng==",
+      "integrity": "sha512-bkxnTg1kSU0guhIBmibA6UUhrQmPVA1XsQLN+ylCd+UWzbnLkySOcXpyk1mrl05f+pcaCx2eHb+sp6BgMZWX+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "commander": "^11.1.0",
-        "css-select": "^5.1.0",
+        "css-select": "^6.0.0",
         "css-tree": "^3.0.1",
-        "css-what": "^6.1.0",
+        "css-what": "^7.0.0",
         "csso": "^5.0.5",
         "picocolors": "^1.1.1",
-        "sax": "^1.5.0"
+        "sax": "1.6.1"
       },
       "bin": {
         "svgo": "bin/svgo.js"
@@ -5044,16 +5044,16 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "8.2.1",
+      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.2.tgz",
-      "integrity": "sha512-EU/eS7BH3XROHh2YnBefjM6DBKA6ZeMZEYQbj7NLWg5wHYlhB8B/Mayd5XsgWq+NFYccDOTemRpdETWR6Ka/lw==",
+      "integrity": "sha512-cFKLV/PRgAUlIRm5WjMjJ86jrftzpqcgH+Us+DS8mI3CDNiH30Whrz8uHL3+MOLPAgqbMBAqWdAHAphOAM+z/Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "lightningcss": "^1.33.0",
         "picomatch": "^4.0.5",
-        "postcss": "^8.5.25",
+        "postcss": "^8.5.26",
-        "rolldown": "~1.2.1",
+        "rolldown": "~1.2.4",
         "tinyglobby": "^0.2.17"
       },
       "bin": {
@@ -5070,7 +5070,7 @@
       },
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
-        "@vitejs/devtools": "^0.4.0",
+        "@vitejs/devtools": "^0.4.0 || ^0.5.0",
         "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",

client/simple/package.json

@@ -29,8 +29,8 @@
     "swiped-events": "1.2.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.5.9",
+    "@biomejs/biome": "2.5.10",
-    "@types/node": "^26.2.0",
+    "@types/node": "^26.3.0",
     "browserslist": "^4.28.8",
     "browserslist-to-esbuild": "^2.1.1",
     "edge.js": "^6.5.1",
@@ -41,9 +41,9 @@
     "stylelint": "^17.14.1",
     "stylelint-config-standard-less": "^4.1.0",
     "stylelint-prettier": "^5.0.3",
-    "svgo": "^4.0.2",
+    "svgo": "^4.1.0",
     "typescript": "~7.0.2",
-    "vite": "^8.2.1",
+    "vite": "^8.2.2",
     "vite-bundle-analyzer": "^1.3.9"
   }
 }

searx/data/tracker_patterns.py

@@ -28,11 +28,11 @@ class TrackerPatternsDB:
 
     ctx_name = "data_tracker_patterns"
 
+    # ClearURL rule lists, the first one that responds HTTP 200 is used
     CLEAR_LIST_URL = [
-        # ClearURL rule lists, the first one that responds HTTP 200 is used
+        "https://cdn.jsdelivr.net/gh/clearurls/rules@refs/heads/gh-pages/data.minify.json",
-        "https://rules1.clearurls.xyz/data.minify.json",
         "https://rules2.clearurls.xyz/data.minify.json",
-        "https://raw.githubusercontent.com/ClearURLs/Rules/refs/heads/master/data.min.json",
+        "https://rules1.clearurls.xyz/data.minify.json",
     ]
 
     class Fields:

searx/engines/__init__.py

@@ -187,8 +187,9 @@ def set_loggers(engine: "Engine|types.ModuleType", engine_name: str):
 def update_engine_attributes(engine: "Engine | types.ModuleType", engine_data: dict[str, t.Any]):
     # pylint: disable=too-many-branches
 
-    # set engine attributes from engine_data
+    # set / update engine attributes from engine_data
     kvargs: dict[str, t.Any]
+    engine.about = getattr(engine, "about", EngineAbout())
     if isinstance(engine.about, EngineAbout):
         kvargs = {**msgspec.to_builtins(engine.about), **engine_data.get("about", {})}
     else:

searx/engines/adobe_stock.py

@@ -35,7 +35,7 @@ Implementation
 ==============
 
 """
-
+import typing as t
 from datetime import datetime, timedelta
 from urllib.parse import urlencode
 
@@ -85,7 +85,7 @@ Additional subcategories:
 # Do we need support for "free_collection" and "include_stock_enterprise"?
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if not categories:
         raise ValueError("adobe_stock engine: categories is unset")
 
@@ -100,9 +100,9 @@ def init(_):
         raise ValueError("adobe_stock engine: adobe_content_types is unset")
 
     if isinstance(adobe_content_types, list):
-        for t in adobe_content_types:
+        for content_type in adobe_content_types:
-            if t not in ADOBE_VALID_TYPES:
+            if content_type not in ADOBE_VALID_TYPES:
-                raise ValueError("adobe_stock engine: adobe_content_types: '%s' is invalid" % t)
+                raise ValueError("adobe_stock engine: adobe_content_types: '%s' is invalid" % content_type)
     else:
         raise ValueError(
             "adobe_stock engine: adobe_content_types must be a list of strings not %s" % type(adobe_content_types)

searx/engines/baidu.py

@@ -49,6 +49,9 @@ CACHE: EngineCache
 
 
 def setup(engine_settings: dict[str, t.Any]) -> bool:
+    if baidu_category not in ('general', 'images', 'it'):
+        raise SearxEngineAPIException(f"Unsupported category: {baidu_category}")
+
     global CACHE  # pylint: disable=global-statement
     CACHE = EngineCache(engine_settings["name"])
     return True
@@ -65,11 +68,6 @@ def get_image_cookies(headers: dict[str, str]) -> dict[str, str]:
     return cookies
 
 
-def init(_):
-    if baidu_category not in ('general', 'images', 'it'):
-        raise SearxEngineAPIException(f"Unsupported category: {baidu_category}")
-
-
 def request(query, params):
     page_num = params["pageno"]
 

searx/engines/boardreader.py

@@ -45,7 +45,7 @@ CACHE_SESSION_ID_KEY = "session_id_key"
 KEYWORD_RE = re.compile(r"\[\/?Keyword\]")
 
 
-def init(engine_settings: dict[str, t.Any]) -> bool:
+def setup(engine_settings: dict[str, t.Any]) -> bool:
     global CACHE  # pylint: disable=global-statement
     CACHE = EngineCache(engine_name=engine_settings["name"])
     return True

searx/engines/braveapi.py

@@ -40,7 +40,7 @@ if t.TYPE_CHECKING:
 about = {
     "website": "https://api.search.brave.com/",
     "wikidata_id": None,
-    "official_api_documentation": "https://api-dashboard.search.brave.com/documentation",
+    "official_api_documentation": "https://api-dashboard.search.brave.com/api-reference/web/search/get",
     "use_official_api": True,
     "require_api_key": True,
     "results": "JSON",
@@ -63,8 +63,10 @@ base_url = "https://api.search.brave.com/res/v1/web/search"
 time_range_map = {"day": "past_day", "week": "past_week", "month": "past_month", "year": "past_year"}
 """Mapping of SearXNG time ranges to Brave API time ranges."""
 
+max_page = 10
 
-def init(_):
+
+def setup(_: dict[str, t.Any]) -> bool | None:
     """Initialize the engine."""
     if not api_key:
         raise SearxEngineAPIException("No API key provided")
@@ -75,7 +77,7 @@ def request(query: str, params: "OnlineParams") -> None:
     search_args: dict[str, str | int | None] = {
         "q": query,
         "count": results_per_page,
-        "offset": (params["pageno"] - 1) * results_per_page,
+        "offset": params["pageno"] - 1,
         "text_decorations": False,
     }
 

searx/engines/chatnoir.py

@@ -41,7 +41,7 @@ search_index = "cw22"
 <https://www.chatnoir.eu/docs/api-general>`_ for a full list."""
 
 
-def _obtain_api_key() -> tuple[str, str, str]:
+def _obtain_api_key() -> tuple[str, str]:
     home_resp = get(base_url)
     if not home_resp.ok:
         raise SearxEngineAPIException("failed to obtain api key")
@@ -58,10 +58,9 @@ def _obtain_api_key() -> tuple[str, str, str]:
     )
     if not token_resp.ok:
         raise SearxEngineAPIException("failed to obtain api key")
-    session_id = token_resp.cookies["sessionid"]
     scraped_api_key = token_resp.json()["token"]["token"]
 
-    return csrf_token, session_id, scraped_api_key
+    return csrf_token, scraped_api_key
 
 
 def request(query: str, params: "OnlineParams"):
@@ -73,7 +72,7 @@ def request(query: str, params: "OnlineParams"):
 
         params["headers"].update(headers)
     else:
-        csrf_token, session_id, scraped_api_key = _obtain_api_key()
+        csrf_token, scraped_api_key = _obtain_api_key()
 
         headers = {
             "Authorization": f"Bearer {scraped_api_key}",
@@ -81,7 +80,7 @@ def request(query: str, params: "OnlineParams"):
         }
 
         params["headers"].update(headers)
-        params["cookies"] = {"csrftoken": session_id, "sessionid": session_id}
+        params["cookies"] = {"csrftoken": csrf_token}
 
     params["url"] = f"{base_url}/api/v1/_search"
     params["method"] = "POST"

searx/engines/chinaso.py

@@ -78,7 +78,7 @@ time_range_dict = {'day': '24h', 'week': '1w', 'month': '1m', 'year': '1y'}
 base_url = "https://www.chinaso.com"
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if chinaso_news_source not in t.get_args(ChinasoNewsSourceType):
         raise ValueError(f"Unsupported news source: {chinaso_news_source}")
 

searx/engines/command.py

@@ -74,6 +74,7 @@ Implementations
 ===============
 """
 
+import typing as t
 import re
 from os.path import expanduser, isabs, realpath, commonprefix
 from shlex import split as shlex_split
@@ -100,7 +101,7 @@ _command_logger = logger.getChild('command')
 _compiled_parse_regex = {}
 
 
-def init(engine_settings):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
     check_parsing_options(engine_settings)
 
     if 'command' not in engine_settings:

searx/engines/dogpile.py

@@ -36,7 +36,7 @@ base_url = "https://www.dogpile.com"
 safe_search_map = {0: "none", 1: "moderate", 2: "heavy"}
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if dogpile_categ not in ("search", "images", "videos", "news"):
         raise ValueError("invalid search type: %s" % dogpile_categ)
 

searx/engines/duckduckgo_extra.py

@@ -47,7 +47,7 @@ _HTTP_User_Agent: str = gen_useragent()
 send_accept_language_header = False
 
 
-def init(engine_settings: dict[str, t.Any]):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
 
     if engine_settings["ddg_category"] not in ["images", "videos", "news"]:
         raise ValueError(f"Unsupported DuckDuckGo category: {engine_settings['ddg_category']}")

searx/engines/duckduckgo_weather.py

@@ -109,7 +109,19 @@ def response(resp: SXNG_Response):
 
     json_data = loads(resp.text[resp.text.find('\n') + 1 : resp.text.rfind('\n') - 2])
 
-    geoloc = weather.GeoLocation.by_query(resp.search_params["query"])
+    location = json_data.get("location")
+    if not location:
+        return res
+
+    metadata = json_data.get("weatherAlerts", {}).get("metadata", {})
+    geoloc = weather.GeoLocation(
+        name=location,
+        latitude=metadata.get("latitude"),
+        longitude=metadata.get("longitude"),
+        elevation=0,
+        country_code=metadata.get("language").split("-")[-1],
+        timezone=json_data.get("location"),
+    )
 
     weather_answer = EngineResults.types.WeatherAnswer(
         current=_weather_data(geoloc, json_data["currentWeather"]),

searx/engines/elasticsearch.py

@@ -41,6 +41,7 @@ authentication configured to read from ``my-index`` index.
 
 """
 
+import typing as t
 from json import loads, dumps
 from searx.exceptions import SearxEngineAPIException
 from searx.result_types import EngineResults
@@ -68,7 +69,7 @@ show_metadata = False
 page_size = 10
 
 
-def init(engine_settings):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
     if 'query_type' in engine_settings and engine_settings['query_type'] not in _available_query_types:
         raise ValueError('unsupported query type', engine_settings['query_type'])
 

searx/engines/exaapi.py

@@ -78,7 +78,7 @@ content_max_characters: int = 500
 """Maximum characters for the requested content."""
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if not api_key:
         raise SearxEngineAPIException("No API key provided")
     if not 1 <= results_per_page <= 100:

searx/engines/fireball.py

@@ -47,7 +47,7 @@ CACHE_VALID_DURATION = 30 * 24 * 3600  # one month, same as website
 """Duration how long settings cookies are valid."""
 
 
-def init(engine_settings: dict[str, t.Any]):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
     global CACHE  # pylint: disable=global-statement
     CACHE = EngineCache(engine_settings["name"])
 

searx/engines/gitea.py

@@ -38,6 +38,7 @@ Implementation
 
 """
 
+import typing as t
 from urllib.parse import urlencode
 from dateutil import parser
 
@@ -77,7 +78,7 @@ page_size: int = 10
 """Maximum number of results per page (default 10)."""
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if not base_url:
         raise ValueError('gitea engine: base_url is unset')
 

searx/engines/heexy.py

@@ -1,127 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""Heexy_ is a minimalist search engine that focuses on privacy.
-
-Although it also supports news and videos, these are not implemented here
-because they usually return no result to very few irrelevant ones.
-
-It seems to use Bing internally, as the image thumbnails are loaded from Bing.
-
-.. _Heexy: https://docs.heexy.org/introduction
-
-"""
-
-from urllib.parse import urlencode
-
-import typing as t
-
-from searx.enginelib import EngineCache
-from searx.network import get
-from searx.exceptions import SearxEngineAPIException, SearxEngineAccessDeniedException
-from searx.result_types import EngineResults
-from searx.utils import gen_useragent
-
-if t.TYPE_CHECKING:
-    from searx.extended_types import SXNG_Response
-    from searx.search.processors import OnlineParams
-
-about = {
-    "website": "https://heexy.org",
-    "wikidata_id": None,
-    "official_api_documentation": None,
-    "use_official_api": False,
-    "require_api_key": False,
-    "results": "JSON",
-}
-
-paging = True
-safesearch = True
-
-categories = ["general"]
-heexy_categ = "web"
-"""Category to search in. Can be either "web" or "image"."""
-
-
-base_url = "https://heexy.org"
-api_url = "https://seapi.heexy.org"
-safe_search_map = {0: "off", 1: "on", 2: "on"}
-
-CACHE: EngineCache
-"""Cache for storing the ``X-Data-Cacheft`` token (acts like an API key)."""
-
-
-def setup(engine_settings: dict[str, t.Any]) -> bool:
-    global CACHE  # pylint: disable=global-statement
-
-    if heexy_categ not in ("web", "image"):
-        raise ValueError("invalid search category: %s" % heexy_categ)
-
-    CACHE = EngineCache(engine_settings["name"])
-    return True
-
-
-def _get_api_token(query: str) -> str:
-    """The API token is independent of the search query. We just need any query
-    to obtain it initially, and don't hardcode it here to decrease chances of
-    getting blocked. The token must be passed as ``X-Data-Cacheft`` header."""
-
-    cached_token: str = CACHE.get("token")
-    if cached_token:
-        return cached_token
-
-    resp = get(
-        f"{base_url}/search?q={query}", headers={"User-Agent": gen_useragent(), "Accept-Language": "en-US,en:q=0.9"}
-    )
-    if not resp.ok:
-        raise SearxEngineAPIException("failed to obtain request token: invalid response code")
-
-    token = resp.cookies["cacheft"]
-    if not token:
-        raise SearxEngineAPIException("failed to obtain request token: no token found")
-
-    CACHE.set("token", token, expire=3 * 60)
-    return token
-
-
-def request(query: str, params: "OnlineParams") -> None:
-    args = {
-        "q": query,
-        "page": params["pageno"],
-        "safe": safe_search_map[params["safesearch"]],
-    }
-    if params["searxng_locale"] != "all":
-        args["lang"] = params["searxng_locale"].split("-")[0]
-
-    params["url"] = f"{api_url}/search/{heexy_categ}?{urlencode(args)}"
-
-    params["headers"]["Origin"] = api_url
-    params["cookies"]["cacheft"] = _get_api_token(query)
-
-
-def response(resp: "SXNG_Response"):
-    res = EngineResults()
-
-    json_resp = resp.json()
-    if not json_resp["success"]:
-        raise SearxEngineAccessDeniedException()
-
-    result: dict[str, str]
-    for result in json_resp["results"]:
-        if heexy_categ == "web":
-            res.add(
-                res.types.MainResult(
-                    url=result["url"],
-                    title=result["title"],
-                    content=result["description"],
-                )
-            )
-        elif heexy_categ == "image":
-            res.add(
-                res.types.Image(
-                    title=result["description"],
-                    url=result["url"],
-                    thumbnail_src=result["image"],
-                    img_src=result["rawImage"],
-                )
-            )
-
-    return res

searx/engines/huggingface.py

@@ -33,6 +33,7 @@ Implementations
 
 """
 
+import typing as t
 from urllib.parse import urlencode
 from datetime import datetime
 
@@ -62,7 +63,7 @@ huggingface_endpoint = 'models'
 """
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if huggingface_endpoint not in ('datasets', 'models', 'spaces'):
         raise SearxEngineAPIException(f"Unsupported Hugging Face endpoint: {huggingface_endpoint}")
 

searx/engines/invidious.py

@@ -8,6 +8,7 @@ No public instance offer a public API now
 
 """
 
+import typing as t
 import time
 import random
 from urllib.parse import quote_plus, urlparse
@@ -34,7 +35,7 @@ time_range_support = True
 base_url: list[str] | str = []
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if not base_url:
         raise ValueError("missing invidious base_url")
 

searx/engines/kagi.py

@@ -87,7 +87,7 @@ api_key = ""
 """Kagi API key. Required for using this engine."""
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if not api_key:
         raise ValueError("api_key is required for using kagi")
 

searx/engines/luxxle.py

@@ -51,7 +51,7 @@ enable_http2 = False
 safe_search_map = {0: "Off", 1: "Moderate", 2: "Strict"}
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if luxxle_categ not in ("search", "images", "videos", "news"):
         raise ValueError("invalid luxxle category: %s" % luxxle_categ)
 

searx/engines/marginalia.py

@@ -164,7 +164,7 @@ def response(resp: SXNG_Response):
     return res
 
 
-def init(_: dict[str, t.Any]):
+def setup(_: dict[str, t.Any]) -> bool:
 
     if not api_key:
         logger.error("missing api_key: see https://about.marginalia-search.com/article/api")

searx/engines/mariadb_server.py

@@ -26,6 +26,8 @@ Implementations
 
 """
 
+import typing as t
+
 try:
     import mariadb  # pyright: ignore [reportMissingImports]
 except ImportError:
@@ -60,15 +62,17 @@ paging = True
 _connection = None
 
 
-def init(engine_settings):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
-    global _connection  # pylint: disable=global-statement
-
     if 'query_str' not in engine_settings:
         raise ValueError('query_str cannot be empty')
 
     if not engine_settings['query_str'].lower().startswith('select '):
         raise ValueError('only SELECT query is supported')
 
+
+def init(_):
+    global _connection  # pylint: disable=global-statement
+
     _connection = mariadb.connect(database=database, user=username, password=password, host=host, port=port)
 
 

searx/engines/meilisearch.py

@@ -35,7 +35,7 @@ Here is a simple example to query a Meilisearch instance:
 """
 
 # pylint: disable=global-statement
-
+import typing as t
 from json import dumps
 from searx.result_types import EngineResults
 from searx.extended_types import SXNG_Response
@@ -49,7 +49,7 @@ categories = ['general']
 paging = True
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if index == '':
         raise ValueError('index cannot be empty')
 

searx/engines/mojeek.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 """Mojeek (general, images, news)"""
 
+import typing as t
 from datetime import datetime
 from urllib.parse import urlencode
 
@@ -51,7 +52,7 @@ region_param = "arc"
 _delta_kwargs = {"day": "days", "week": "weeks", "month": "months", "year": "years"}
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if search_type not in ("", "images", "news"):
         raise ValueError(f"Invalid search type {search_type}")
 

searx/engines/mrs.py

@@ -19,6 +19,7 @@ Implementation
 ==============
 """
 
+import typing as t
 from urllib.parse import quote_plus
 
 about = {
@@ -37,7 +38,7 @@ matrix_url = "https://matrix.to"
 page_size = 20
 
 
-def init(engine_settings):  # pylint: disable=unused-argument
+def setup(_: dict[str, t.Any]) -> bool | None:
     """The ``base_url`` must be set in the configuration, if ``base_url`` is not
     set, a :py:obj:`ValueError` is raised during initialization.
 

searx/engines/mysql_server.py

@@ -25,6 +25,8 @@ Implementations
 
 """
 
+import typing as t
+
 from searx.result_types import EngineResults
 
 try:
@@ -60,15 +62,17 @@ paging = True
 _connection = None
 
 
-def init(engine_settings):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
-    global _connection  # pylint: disable=global-statement
-
     if 'query_str' not in engine_settings:
         raise ValueError('query_str cannot be empty')
 
     if not engine_settings['query_str'].lower().startswith('select '):
         raise ValueError('only SELECT query is supported')
 
+
+def init(_):
+    global _connection  # pylint: disable=global-statement
+
     _connection = mysql.connector.connect(
         database=database,
         user=username,

searx/engines/naver.py

@@ -2,6 +2,8 @@
 # pylint: disable=line-too-long
 """Naver for SearXNG"""
 
+import typing as t
+
 from urllib.parse import urlencode
 from lxml import html
 
@@ -67,7 +69,7 @@ naver_category_dict = {
 }
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if naver_category not in ('general', 'images', 'news', 'videos'):
         raise SearxEngineAPIException(f"Unsupported category: {naver_category}")
 

searx/engines/pexels.py

@@ -2,6 +2,7 @@
 """Pexels (images)"""
 
 import re
+import typing as t
 
 from urllib.parse import urlencode
 from lxml import html
@@ -46,9 +47,10 @@ CACHE: EngineCache
 enable_http2 = False
 
 
-def init(engine_settings):
+def setup(engine_settings: dict[str, t.Any]) -> bool:
     global CACHE  # pylint: disable=global-statement
     CACHE = EngineCache(engine_settings["name"])
+    return True
 
 
 def _get_secret_key():

searx/engines/postgresql.py

@@ -21,6 +21,8 @@ Implementations
 
 """
 
+import typing as t
+
 try:
     import psycopg2  # type: ignore
 except ImportError:
@@ -55,15 +57,17 @@ paging = True
 _connection = None
 
 
-def init(engine_settings):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
-    global _connection  # pylint: disable=global-statement
-
     if 'query_str' not in engine_settings:
         raise ValueError('query_str cannot be empty')
 
     if not engine_settings['query_str'].lower().startswith('select '):
         raise ValueError('only SELECT query is supported')
 
+
+def init(_):
+    global _connection  # pylint: disable=global-statement
+
     _connection = psycopg2.connect(
         database=database,
         user=username,

searx/engines/privacywall.py

@@ -61,7 +61,7 @@ video_page_map = {
 }
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if privacywall_category not in ("general", "images", "videos"):
         raise ValueError("invalid category: %s" % privacywall_category)
 

searx/engines/quark.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 """Quark (Shenma) search engine for searxng"""
 
+import typing as t
 from urllib.parse import urlencode
 from datetime import datetime
 import re
@@ -43,7 +44,7 @@ def is_alibaba_captcha(html):
     return bool(re.search(CAPTCHA_PATTERN, html))
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if quark_category not in ('general', 'images'):
         raise SearxEngineAPIException(f"Unsupported category: {quark_category}")
 

searx/engines/resulthunter.py

@@ -42,7 +42,7 @@ resulthunter_categ = "web"
 """Supported categories are ``web`` and ``images``."""
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if resulthunter_categ not in ("web", "images"):
         raise ValueError("invalid category: %s" % resulthunter_categ)
 

searx/engines/s1search.py

@@ -38,12 +38,10 @@ CACHE: EngineCache
 """Cache to store verification tokens for pagination."""
 
 
-def init(_):
+def setup(engine_settings: dict[str, t.Any]) -> bool:
     if not base_url:
         raise ValueError("base_url must be set")
 
-
-def setup(engine_settings: dict[str, t.Any]) -> bool:
     global CACHE  # pylint: disable=global-statement
     CACHE = EngineCache(engine_settings["name"])
     return True
@@ -82,7 +80,7 @@ def response(resp: "SXNG_Response") -> EngineResults:
             res.types.MainResult(
                 url=extract_text(eval_xpath(result, ".//a[contains(@class, 'title')]/@href")),
                 title=extract_text(eval_xpath(result, ".//a[contains(@class, 'title')]")),
-                content=extract_text(eval_xpath(result, ".//span[contains(@class, 'description') or @class='']")),
+                content=extract_text(eval_xpath(result, ".//span[contains(@class, 'description') or not(@class)]")),
             )
         )
 

searx/engines/solr.py

@@ -28,7 +28,7 @@ This is an example configuration for searching in the collection
 """
 
 # pylint: disable=global-statement
-
+import typing as t
 from urllib.parse import urlencode
 from searx.exceptions import SearxEngineAPIException
 from searx.result_types import EngineResults
@@ -46,7 +46,7 @@ _search_url = ''
 paging = True
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if collection == '':
         raise ValueError('collection cannot be empty')
 

searx/engines/soundcloud.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 """SoundCloud is a German audio streaming service."""
 
+import typing as t
 import re
 import datetime
 
@@ -115,9 +116,10 @@ def response(resp):
     return results
 
 
-def init(engine_settings):  # pylint: disable=unused-argument
+def setup(engine_settings: dict[str, t.Any]) -> bool:
     global CACHE  # pylint: disable=global-statement
     CACHE = EngineCache(engine_settings["name"])  # type:ignore
+    return True
 
 
 def get_client_id() -> str | None:

searx/engines/sqlite.py

@@ -66,7 +66,7 @@ limit = 10
 paging = True
 
 
-def init(engine_settings):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
     if 'query_str' not in engine_settings:
         raise ValueError('query_str cannot be empty')
 

searx/engines/startpage.py

@@ -165,7 +165,7 @@ CACHE: EngineCache
 seconds."""
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     global CACHE  # pylint: disable=global-statement
 
     # hint: all three startpage engines (WEB, Images & News) can/should use the

searx/engines/startpagina.py

@@ -39,7 +39,7 @@ page_size = 10
 api_url = "https://search.kompas.services"
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if startpagina_categ not in ("web", "images", "videos", "news"):
         raise ValueError("invalid search type: %s" % startpagina_categ)
 

searx/engines/swisscows.py

@@ -152,7 +152,7 @@ def generate_nonce_and_signature(base_path: str, args: dict[str, t.Any]) -> tupl
 maximum_page_size = {"web": 20, "images": 50, "videos": 10}
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if swisscows_category not in ("web", "images", "videos"):
         raise ValueError("illegal swisscows category: %s" % swisscows_category)
 

searx/engines/tiger.py

@@ -45,12 +45,10 @@ CACHE: EngineCache
 """Cache to store session codes (result of solved CAPTCHA)."""
 
 
-def init(_):
+def setup(engine_settings: dict[str, t.Any]) -> bool:
     if tiger_category not in ("Websuche", "News"):
         raise ValueError("invalid search category: %s" % tiger_category)
 
-
-def setup(engine_settings: dict[str, t.Any]) -> bool:
     global CACHE  # pylint: disable=global-statement
     CACHE = EngineCache(engine_settings["name"])
     return True

searx/engines/tonline.py

@@ -44,7 +44,7 @@ tonline_channel_map = {"images": "flickr", "videos": "yt"}
 language = "de"
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if tonline_categ not in ("web", "images", "videos", "news"):
         raise ValueError("invalid category: %s" % tonline_categ)
 

searx/engines/torznab.py

@@ -83,7 +83,7 @@ show_torrent_files: bool = False
 show_magnet_links: bool = True
 
 
-def init(engine_settings=None):  # pylint: disable=unused-argument
+def setup(_: dict[str, t.Any]) -> bool | None:
     """Initialize the engine."""
     if len(base_url) < 1:
         raise ValueError('missing torznab base_url')

searx/engines/tubearchivist.py

@@ -75,6 +75,7 @@ Implementations
 """
 
 
+import typing as t
 from urllib.parse import urlencode
 from dateutil.parser import parse
 from searx.utils import html_to_text, humanize_number
@@ -115,7 +116,7 @@ def absolute_url(relative_url):
     return f'{base_url.rstrip("/")}{relative_url}'
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if not base_url:
         raise ValueError('tubearchivist engine: base_url is unset')
     if not ta_token:

searx/engines/tusksearch.py

@@ -39,7 +39,7 @@ tusk_categ = "web"
 api_url = "https://api.tusksearch.com"
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if tusk_categ not in ("web", "images", "videos", "news"):
         raise ValueError("invalid search type: %s" % tusk_categ)
 

searx/engines/vuhuv.py

@@ -38,7 +38,7 @@ vuhuv_category = "general"
 category_map = {"general": 1, "images": 2, "videos": 3}
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     if vuhuv_category not in category_map:
         raise ValueError("invalid category: %s" % vuhuv_category)
 

searx/engines/wolframalpha_noapi.py

@@ -3,7 +3,7 @@
 Wolfram|Alpha (Science)
 """
 
-
+import typing as t
 from json import loads
 from urllib.parse import urlencode
 
@@ -51,7 +51,7 @@ CACHE: EngineCache
 seconds."""
 
 
-def init(engine_settings):
+def setup(engine_settings: dict[str, t.Any]) -> bool | None:
     global CACHE  # pylint: disable=global-statement
     CACHE = EngineCache(engine_settings["name"])  # type:ignore
 

searx/engines/yacy.py

@@ -52,7 +52,7 @@ Implementations
 """
 # pylint: disable=fixme
 
-
+import typing as t
 import random
 from json import loads
 from urllib.parse import urlencode
@@ -102,7 +102,7 @@ selected randomly.
 """
 
 
-def init(_):
+def setup(_: dict[str, t.Any]) -> bool | None:
     valid_types = [
         'text',
         'image',

searx/settings.yml

@@ -1296,22 +1296,6 @@ engines:
     shortcut: hn
     disabled: true
 
-  - name: heexy
-    engine: heexy
-    categories: general
-    heexy_categ: web
-    shortcut: he
-    disabled: true
-    inactive: true
-
-  - name: heexy images
-    engine: heexy
-    categories: images
-    heexy_categ: image
-    shortcut: hei
-    disabled: true
-    inactive: true
-
   - name: hex
     engine: hex
     shortcut: hex
@@ -3360,30 +3344,20 @@ engines:
       require_api_key: false
       results: JSON
 
-  # - name: webcrawler
+  # s1search engines / mirrors
-  #   engine: s1search
+  - name: metacrawler
-  #   shortcut: wc
-  #   base_url: https://www.webcrawler.com
-  #   disabled: true
-
-  # s1search yahoo engines / mirrors
-  # - name: excite
-  #   engine: s1search
-  #   shortcut: exc
-  #   base_url: https://results.excite.com.s1search.co
-  #   disabled: true
-
-  # - name: metacrawler
-  #   engine: s1search
-  #   shortcut: mec
-  #   base_url: https://search.metacrawler.com
-  #   disabled: true
-
-  - name: infospace
     engine: s1search
-    shortcut: ifs
+    shortcut: mec
-    base_url: https://search.infospace.com
+    base_url: https://search.metacrawler.com
     disabled: true
+    inactive: true
+
+  - name: zoo search
+    engine: s1search
+    shortcut: zoo
+    base_url: https://search.zoo.com
+    disabled: true
+    inactive: true
 
 # Doku engine lets you access to any Doku wiki instance:
 # A public one or a privete/corporate one.

tests/unit/engines/test_command.py

@@ -152,7 +152,7 @@ commit '''
             'date': r'Date: .*',
             'message': r'\n\n.*$',
         }
-        git_log_engine.init({"command": git_log_engine.command, "parse_regex": git_log_engine.parse_regex})
+        git_log_engine.setup({"command": git_log_engine.command, "parse_regex": git_log_engine.parse_regex})
         expected_results = [
             {
                 'commit': '35f9a8c81d162a361b826bbcd4a1081a4fbe76a7',