diff --git a/requirements.txt b/requirements.txt index c5cc3fcc9..7b90ffe3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,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' +tomli==2.0.2; python_version < '3.11' pydantic==2.9.2 eval_type_backport; python_version < '3.9' typer-slim==0.12.5 diff --git a/searx/botdetection/config.py b/searx/botdetection/config.py index 147104205..2a982ba64 100644 --- a/searx/botdetection/config.py +++ b/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 diff --git a/searx/static/themes/simple/css/leaflet.css b/searx/static/themes/simple/css/leaflet.css index 5292e63a1..2961b7618 100644 Binary files a/searx/static/themes/simple/css/leaflet.css and b/searx/static/themes/simple/css/leaflet.css differ diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css b/searx/static/themes/simple/css/searxng-rtl.min.css index 3e55616b0..5d75852eb 100644 Binary files a/searx/static/themes/simple/css/searxng-rtl.min.css and b/searx/static/themes/simple/css/searxng-rtl.min.css differ diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css.map b/searx/static/themes/simple/css/searxng-rtl.min.css.map index d5b7a7488..16e551a13 100644 Binary files a/searx/static/themes/simple/css/searxng-rtl.min.css.map and b/searx/static/themes/simple/css/searxng-rtl.min.css.map differ diff --git a/searx/static/themes/simple/css/searxng.min.css b/searx/static/themes/simple/css/searxng.min.css index 40c9ef06b..d5d5c8c8c 100644 Binary files a/searx/static/themes/simple/css/searxng.min.css and b/searx/static/themes/simple/css/searxng.min.css differ diff --git a/searx/static/themes/simple/css/searxng.min.css.map b/searx/static/themes/simple/css/searxng.min.css.map index fea4d0b7e..02a076fc5 100644 Binary files a/searx/static/themes/simple/css/searxng.min.css.map and b/searx/static/themes/simple/css/searxng.min.css.map differ diff --git a/searx/static/themes/simple/img/img_load_error.svg b/searx/static/themes/simple/img/img_load_error.svg index 27ff0f056..5e3a0d62b 100644 Binary files a/searx/static/themes/simple/img/img_load_error.svg and b/searx/static/themes/simple/img/img_load_error.svg differ diff --git a/searx/static/themes/simple/img/searxng.svg b/searx/static/themes/simple/img/searxng.svg index e965ed242..685d55d5d 100644 Binary files a/searx/static/themes/simple/img/searxng.svg and b/searx/static/themes/simple/img/searxng.svg differ diff --git a/searx/static/themes/simple/js/leaflet.js b/searx/static/themes/simple/js/leaflet.js index a98a4116f..a3bf693d0 100644 Binary files a/searx/static/themes/simple/js/leaflet.js and b/searx/static/themes/simple/js/leaflet.js differ diff --git a/searx/static/themes/simple/js/searxng.head.min.js.map b/searx/static/themes/simple/js/searxng.head.min.js.map index 7ebfb58f1..aabf57d4e 100644 Binary files a/searx/static/themes/simple/js/searxng.head.min.js.map and b/searx/static/themes/simple/js/searxng.head.min.js.map differ diff --git a/searx/static/themes/simple/js/searxng.min.js.map b/searx/static/themes/simple/js/searxng.min.js.map index f40a03a70..6b284f15d 100644 Binary files a/searx/static/themes/simple/js/searxng.min.js.map and b/searx/static/themes/simple/js/searxng.min.js.map differ diff --git a/searx/static/themes/simple/src/less/search.less b/searx/static/themes/simple/src/less/search.less index 252af3844..fb5cd12f4 100644 --- a/searx/static/themes/simple/src/less/search.less +++ b/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; diff --git a/searx/templates/simple/icons.html b/searx/templates/simple/icons.html index 7ff4dfc16..6cbec3ee9 100644 --- a/searx/templates/simple/icons.html +++ b/searx/templates/simple/icons.html @@ -1,25 +1,25 @@ {# this file was generated by searx/static/themes/simple/gruntfile.js #} {%- set icons = { - 'warning':'', - 'close':'', - 'chevron-up-outline':'', - 'chevron-right':'', - 'chevron-left':'', - 'menu-outline':'', - 'ellipsis-vertical-outline':'', - 'magnet-outline':'', - 'globe-outline':'', - 'search-outline':'', - 'image-outline':'', - 'play-outline':'', - 'newspaper-outline':'', - 'location-outline':'', - 'musical-notes-outline':'', - 'layers-outline':'', - 'school-outline':'', - 'file-tray-full-outline':'', - 'people-outline':'', - 'heart-outline':'', + 'warning':'', + 'close':'', + 'chevron-up-outline':'', + 'chevron-right':'', + 'chevron-left':'', + 'menu-outline':'', + 'ellipsis-vertical-outline':'', + 'magnet-outline':'', + 'globe-outline':'', + 'search-outline':'', + 'image-outline':'', + 'play-outline':'', + 'newspaper-outline':'', + 'location-outline':'', + 'musical-notes-outline':'', + 'layers-outline':'', + 'school-outline':'', + 'file-tray-full-outline':'', + 'people-outline':'', + 'heart-outline':'', 'information-circle-outline':'', } diff --git a/searx/translations/et/LC_MESSAGES/messages.mo b/searx/translations/et/LC_MESSAGES/messages.mo index f9c068604..ffab91f70 100644 Binary files a/searx/translations/et/LC_MESSAGES/messages.mo and b/searx/translations/et/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/et/LC_MESSAGES/messages.po b/searx/translations/et/LC_MESSAGES/messages.po index 145622245..63d2fbe9c 100644 --- a/searx/translations/et/LC_MESSAGES/messages.po +++ b/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 \n" "Language-Team: Estonian