[fix] ddg engine: if no vqd value can be determined, don't save None

Closes: https://github.com/searxng/searxng/issues/3370
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2024-04-08 09:15:46 +02:00 committed by Markus Heiser
parent bd6ff29f8f
commit f1a148f53e
1 changed files with 13 additions and 7 deletions

View File

@ -124,7 +124,8 @@ def get_vqd(query):
value = value[: value.index('"')] value = value[: value.index('"')]
break break
logger.debug("new vqd value: '%s'", value) logger.debug("new vqd value: '%s'", value)
cache_vqd(query, value) if value is not None:
cache_vqd(query, value)
return value return value
@ -221,13 +222,10 @@ ddg_lang_map = {
} }
def request(query, params): def quote_ddg_bangs(query):
# request needs a vqd argument
vqd = get_vqd(query)
# quote ddg bangs # quote ddg bangs
query_parts = [] query_parts = []
# for val in re.split(r'(\s+)', query): # for val in re.split(r'(\s+)', query):
for val in re.split(r'(\s+)', query): for val in re.split(r'(\s+)', query):
if not val.strip(): if not val.strip():
@ -235,7 +233,15 @@ def request(query, params):
if val.startswith('!') and external_bang.get_node(external_bang.EXTERNAL_BANGS, val[1:]): if val.startswith('!') and external_bang.get_node(external_bang.EXTERNAL_BANGS, val[1:]):
val = f"'{val}'" val = f"'{val}'"
query_parts.append(val) query_parts.append(val)
query = ' '.join(query_parts) return ' '.join(query_parts)
def request(query, params):
query = quote_ddg_bangs(query)
# request needs a vqd argument
vqd = get_vqd(query)
eng_region = traits.get_region(params['searxng_locale'], traits.all_locale) eng_region = traits.get_region(params['searxng_locale'], traits.all_locale)
# eng_lang = get_ddg_lang(traits, params['searxng_locale']) # eng_lang = get_ddg_lang(traits, params['searxng_locale'])