zaclys/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng synced 2024-01-01 19:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #740 from return42/fix-bang

Browse source 
[fix] get_bang_url: handle ambiguous !!bangs without error
This commit is contained in:
Alexandre Flament 2022-01-12 22:00:18 +01:00 • committed by GitHub
commit 687bdef410
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2794 additions and 2778 deletions
Download patch file Download diff file Expand all files Collapse all files

5503
searx/data/external_bangs.json
View file

File diff suppressed because it is too large Load diff

13
searx/external_bang.py
View file

@ -2,6 +2,8 @@
from searx.data import EXTERNAL_BANGS
LEAF_KEY = chr(16)
def get_node(external_bangs_db, bang):
node = external_bangs_db['trie']
@ -26,8 +28,8 @@ def get_bang_definition_and_ac(external_bangs_db, bang):
if k.startswith(after):
bang_ac_list.append(before + k)
elif isinstance(node, dict):
bang_definition = node.get('*')
bang_ac_list = [before + k for k in node.keys() if k != '*']
bang_definition = node.get(LEAF_KEY)
bang_ac_list = [before + k for k in node.keys() if k != LEAF_KEY]
elif isinstance(node, str):
bang_definition = node
bang_ac_list = []
@ -77,11 +79,14 @@ def get_bang_url(search_query, external_bangs_db=None):
:param search_query: This is a search_query object which contains preferences and the submitted queries.
:return: None if the bang was invalid, else a string of the redirect url.
"""
ret_val = None
if external_bangs_db is None:
external_bangs_db = EXTERNAL_BANGS
if search_query.external_bang:
bang_definition, _ = get_bang_definition_and_ac(external_bangs_db, search_query.external_bang)
return resolve_bang_definition(bang_definition, search_query.query)[0] if bang_definition else None
if bang_definition and isinstance(bang_definition, str):
ret_val = resolve_bang_definition(bang_definition, search_query.query)[0]
return None
return ret_val