git.iko.soy/searx
on master help sign in
forward category to engine without highlighting on the ui
commit8cc529e9a3976e48676676600379ce43f690dd8c authorNoémi Ványi <sitbackandwait@gmail.com> dateThu 22 Mar 2018, 11:02 (9 years ago) parentd04e471
3 files changed+19−11
compare with master
unifiedsplit
searx/engines/findx.py+1−5 searx/query.py+11−4 searx/search.py+7−2
searx/engines/findx.py+1−5
@@ -33,12 +33,8 @@ type_map = {
3333
3434
3535def request(query, params):
36− category = 'general'
37− if 'category' in params and len(params['category']) == 1:
38− category = params['category'][0]
39−
4036 params['url'] = search_url.format(
41− category=type_map[category],
37+ category=type_map[params['category']],
4238 q=urlencode({
4339 'q': query,
4440 'page': params['pageno']
searx/query.py+11−4
@@ -107,14 +107,21 @@ class RawTextQuery(object):
107107 # check if prefix is equal with engine shortcut
108108 if prefix in engine_shortcuts:
109109 parse_next = True
110− self.engines.append({'category': 'none',
111− 'name': engine_shortcuts[prefix]})
110+ engine_name = engine_shortcuts[prefix]
111+ if engine_name in engines:
112+ for engine_category in engines[engine_name].categories:
113+ self.engines.append({'category': engine_category,
114+ 'name': engine_name,
115+ 'from_bang': True})
112116
113117 # check if prefix is equal with engine name
114118 elif prefix in engines:
115119 parse_next = True
116− self.engines.append({'category': 'none',
117− 'name': prefix})
120+ if prefix in engines:
121+ for engine_category in engines[engine_name].categories:
122+ self.engines.append({'category': engine_category,
123+ 'name': engine_name,
124+ 'from_bang': True})
118125
119126 # check if prefix is equal with categorie name
120127 elif prefix in categories:
searx/search.py+7−2
@@ -258,8 +258,13 @@ def get_search_query_from_webapp(preferences, form):
258258 # if engines are calculated from query,
259259 # set categories by using that informations
260260 if query_engines and raw_text_query.specific:
261− query_categories = list(set(engine['category']
262− for engine in query_engines))
261+ additional_categories = set()
262+ for engine in query_engines:
263+ if 'from_bang' in engine and engine['from_bang']:
264+ additional_categories.add('none')
265+ else:
266+ additional_categories.add(engine['category'])
267+ query_categories = list(additional_categories)
263268
264269 # otherwise, using defined categories to
265270 # calculate which engines should be used