From cdb4927b8ba0aec61ae169b9e9b54a7e8f2f0e9f Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 15 Sep 2024 12:22:06 +0200 Subject: [fix] fetch_traits: brave, google, annas_archive & radio_browser This patch fixes a bug reported by CI "Fetch traits" [1] (brave) and improves other fetch traits functions (google, annas_archive & radio_browser). brave: File "/home/runner/work/searxng/searxng/searx/engines/brave.py", line 434, in fetch_traits sxng_tag = region_tag(babel.Locale.parse(ui_lang, sep='-')) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/runner/work/searxng/searxng/searx/locales.py", line 155, in region_tag Error: raise ValueError('%s missed a territory') google: change ERROR message about unknow UI language to INFO message radio_browser: country_list contains duplicates that differ only in upper/lower case annas_archive: for better diff; sort the persistence of the traits [1] https://github.com/searxng/searxng/actions/runs/10606312371/job/29433352518#step:6:41 Signed-off-by: Markus --- searx/engines/radio_browser.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'searx/engines/radio_browser.py') diff --git a/searx/engines/radio_browser.py b/searx/engines/radio_browser.py index c20580616..a8f07a638 100644 --- a/searx/engines/radio_browser.py +++ b/searx/engines/radio_browser.py @@ -165,10 +165,12 @@ def fetch_traits(engine_traits: EngineTraits): countrycodes = set() for region in country_list: - if region['iso_3166_1'] not in babel_reg_list: + # country_list contains duplicates that differ only in upper/lower case + _reg = region['iso_3166_1'].upper() + if _reg not in babel_reg_list: print(f"ERROR: region tag {region['iso_3166_1']} is unknown by babel") continue - countrycodes.add(region['iso_3166_1']) + countrycodes.add(_reg) countrycodes = list(countrycodes) countrycodes.sort() -- cgit v1.2.3