OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

[fix] engine brave - fetch traits (modified settings menu)

Browse source 
Brave has changed it settings menu fundamental.  Region codes are no longer in
the HTML page, we have to read the regional codes from a JS:

  https://cdn.search.brave.com/serp/v2/_app/immutable/chunks/parameters.734c106a.js

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2023-09-26 12:59:56 +02:00 committed by Markus Heiser
parent 3a456b1282
commit b428ccc5a0
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
searx/engines/brave.py
View file

@ -97,7 +97,6 @@ Implementations
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
import re
from urllib.parse import ( from urllib.parse import (
urlencode, urlencode,
urlparse, urlparse,
@ -354,7 +353,7 @@ def fetch_traits(engine_traits: EngineTraits):
"""Fetch :ref:`languages <brave languages>` and :ref:`regions <brave """Fetch :ref:`languages <brave languages>` and :ref:`regions <brave
regions>` from Brave.""" regions>` from Brave."""
# pylint: disable=import-outside-toplevel # pylint: disable=import-outside-toplevel, too-many-branches
import babel.languages import babel.languages
from searx.locales import region_tag, language_tag from searx.locales import region_tag, language_tag
@ -397,19 +396,26 @@ def fetch_traits(engine_traits: EngineTraits):
# search regions of brave # search regions of brave
engine_traits.all_locale = 'all' resp = get('https://cdn.search.brave.com/serp/v2/_app/immutable/chunks/parameters.734c106a.js', headers=headers)
for country in dom.xpath('//div[@id="sidebar"]//ul/li/div[contains(@class, "country")]'): if not resp.ok: # type: ignore
print("ERROR: response from Brave is not OK.")
flag = country.xpath('./span[contains(@class, "flag")]')[0] country_js = resp.text[resp.text.index("options:{all") + len('options:') :]
# country_name = extract_text(flag.xpath('./following-sibling::*')[0]) country_js = country_js[: country_js.index("},k={default")]
country_tag = re.search(r'flag-([^\s]*)\s', flag.xpath('./@class')[0]).group(1) # type: ignore country_tags = js_variable_to_python(country_js)
for k, v in country_tags.items():
if k == 'all':
engine_traits.all_locale = 'all'
continue
country_tag = v['value']
# add official languages of the country .. # add official languages of the country ..
for lang_tag in babel.languages.get_official_languages(country_tag, de_facto=True): for lang_tag in babel.languages.get_official_languages(country_tag, de_facto=True):
lang_tag = lang_map.get(lang_tag, lang_tag) lang_tag = lang_map.get(lang_tag, lang_tag)
sxng_tag = region_tag(babel.Locale.parse('%s_%s' % (lang_tag, country_tag.upper()))) sxng_tag = region_tag(babel.Locale.parse('%s_%s' % (lang_tag, country_tag.upper())))
# print("%-20s: %s <-- %s" % (country_name, country_tag, sxng_tag)) # print("%-20s: %s <-- %s" % (v['label'], country_tag, sxng_tag))
conflict = engine_traits.regions.get(sxng_tag) conflict = engine_traits.regions.get(sxng_tag)
if conflict: if conflict: