git.iko.soy/searx
on master help sign in
[fix] fix searx.webadapter
d595007Alexandre Flament
searx/search.py+2−2
compare with master
unifiedsplit
@@ -72,11 +72,11 @@ class SearchQuery:
72 engineref_list: typing.List[EngineRef],
72 engineref_list: typing.List[EngineRef],
73 categories: typing.List[str],
73 categories: typing.List[str],
74 lang: str,
74 lang: str,
75− safesearch: bool,
75+ safesearch: int,
76 pageno: int,
76 pageno: int,
77 time_range: typing.Optional[str],
77 time_range: typing.Optional[str],
78 timeout_limit: typing.Optional[float]=None,
78 timeout_limit: typing.Optional[float]=None,
79− external_bang: typing.Optional[str]=False):
79+ external_bang: typing.Optional[str]=None):
80 self.query = query
80 self.query = query
81 self.engineref_list = engineref_list
81 self.engineref_list = engineref_list
82 self.categories = categories
82 self.categories = categories
searx/webadapter.py+35−23
@@ -11,7 +11,7 @@ from searx.preferences import Preferences
11# FIXME: does not fix "!music !soundcloud", because the categories are 'none' and 'music'
11# FIXME: does not fix "!music !soundcloud", because the categories are 'none' and 'music'
12def deduplicate_engineref_list(engineref_list: List[EngineRef]) -> List[EngineRef]:
12def deduplicate_engineref_list(engineref_list: List[EngineRef]) -> List[EngineRef]:
13 engineref_dict = {q.category + '|' + q.name: q for q in engineref_list}
13 engineref_dict = {q.category + '|' + q.name: q for q in engineref_list}
14− return engineref_dict.values()
14+ return list(engineref_dict.values())
15
15
16
16
17def validate_engineref_list(engineref_list: List[EngineRef], preferences: Preferences)\
17def validate_engineref_list(engineref_list: List[EngineRef], preferences: Preferences)\
@@ -82,7 +82,7 @@ def parse_safesearch(preferences: Preferences, form: Dict[str, str]) -> int:
82 return query_safesearch
82 return query_safesearch
83
83
84
84
85−def parse_time_range(form: Dict[str, str]) -> str:
85+def parse_time_range(form: Dict[str, str]) -> Optional[str]:
86 query_time_range = form.get('time_range')
86 query_time_range = form.get('time_range')
87 # check time_range
87 # check time_range
88 query_time_range = None if query_time_range in ('', 'None') else query_time_range
88 query_time_range = None if query_time_range in ('', 'None') else query_time_range
@@ -92,16 +92,16 @@ def parse_time_range(form: Dict[str, str]) -> str:
92
92
93
93
94def parse_timeout(form: Dict[str, str], raw_text_query: RawTextQuery) -> Optional[float]:
94def parse_timeout(form: Dict[str, str], raw_text_query: RawTextQuery) -> Optional[float]:
95− query_timeout = raw_text_query.timeout_limit
95+ timeout_limit = raw_text_query.timeout_limit
96− if query_timeout is None and 'timeout_limit' in form:
96+ if timeout_limit is None:
97− raw_time_limit = form.get('timeout_limit')
97+ timeout_limit = form.get('timeout_limit')
98− if raw_time_limit in ['None', '']:
98+
99+ if timeout_limit is None or timeout_limit in ['None', '']:
99− return None
100+ return None
100− else:
101− try:
101+ try:
102− return float(raw_time_limit)
102+ return float(timeout_limit)
103− except ValueError:
103+ except ValueError:
104− raise SearxParameterException('timeout_limit', raw_time_limit)
104+ raise SearxParameterException('timeout_limit', timeout_limit)
105
105
106
106
107def parse_specific(raw_text_query: RawTextQuery) -> Tuple[List[EngineRef], List[str]]:
107def parse_specific(raw_text_query: RawTextQuery) -> Tuple[List[EngineRef], List[str]]:
@@ -134,7 +134,7 @@ def parse_category_form(query_categories: List[str], name: str, value: str) -> N
134 query_categories.remove(category)
134 query_categories.remove(category)
135
135
136
136
137−def get_selected_categories(preferences: Preferences, form: Dict[str, str]) -> List[str]:
137+def get_selected_categories(preferences: Preferences, form: Optional[Dict[str, str]]) -> List[str]:
138 selected_categories = []
138 selected_categories = []
139
139
140 if form is not None:
140 if form is not None:
@@ -157,37 +157,49 @@ def get_selected_categories(preferences: Preferences, form: Dict[str, str]) -> L
157 return selected_categories
157 return selected_categories
158
158
159
159
160+def get_engineref_from_category_list(category_list: List[str], disabled_engines: List[str]) -> List[EngineRef]:
161+ result = []
162+ for categ in category_list:
163+ result.extend(EngineRef(engine.name, categ)
164+ for engine in categories[categ]
165+ if (engine.name, categ) not in disabled_engines)
166+ return result
167+
168+
160def parse_generic(preferences: Preferences, form: Dict[str, str], disabled_engines: List[str])\
169def parse_generic(preferences: Preferences, form: Dict[str, str], disabled_engines: List[str])\
161 -> Tuple[List[EngineRef], List[str]]:
170 -> Tuple[List[EngineRef], List[str]]:
162 query_engineref_list = []
171 query_engineref_list = []
163 query_categories = []
172 query_categories = []
164
173
165 # set categories/engines
174 # set categories/engines
166− load_default_categories = True
175+ explicit_engine_list = False
167 for pd_name, pd in form.items():
176 for pd_name, pd in form.items():
168 if pd_name == 'engines':
177 if pd_name == 'engines':
169 pd_engines = [EngineRef(engine_name, engines[engine_name].categories[0])
178 pd_engines = [EngineRef(engine_name, engines[engine_name].categories[0])
170 for engine_name in map(str.strip, pd.split(',')) if engine_name in engines]
179 for engine_name in map(str.strip, pd.split(',')) if engine_name in engines]
171 if pd_engines:
180 if pd_engines:
172 query_engineref_list.extend(pd_engines)
181 query_engineref_list.extend(pd_engines)
173− load_default_categories = False
182+ explicit_engine_list = True
174 else:
183 else:
175 parse_category_form(query_categories, pd_name, pd)
184 parse_category_form(query_categories, pd_name, pd)
176
185
177− if not load_default_categories:
186+ if explicit_engine_list:
187+ # explicit list of engines with the "engines" parameter in the form
178− if not query_categories:
188+ if query_categories:
189+ # add engines from referenced by the "categories" parameter and the "category_*"" parameters
190+ query_engineref_list.extend(get_engineref_from_category_list(query_categories, disabled_engines))
191+ # get categories from the query_engineref_list
179− query_categories = list(set(engine['category']
192+ query_categories = list(set(engine.category for engine in query_engineref_list))
180− for engine in query_engineref_list))
181 else:
193 else:
194+ # no "engines" parameters in the form
182 if not query_categories:
195 if not query_categories:
196+ # and neither "categories" parameter nor "category_*"" parameters in the form
197+ # -> get the categories from the preferences (the cookies or the settings)
183 query_categories = get_selected_categories(preferences, None)
198 query_categories = get_selected_categories(preferences, None)
184
199
185 # using all engines for that search, which are
200 # using all engines for that search, which are
186 # declared under the specific categories
201 # declared under the specific categories
187− for categ in query_categories:
202+ query_engineref_list.extend(get_engineref_from_category_list(query_categories, disabled_engines))
188− query_engineref_list.extend(EngineRef(engine.name, categ)
189− for engine in categories[categ]
190− if (engine.name, categ) not in disabled_engines)
191
203
192 return query_engineref_list, query_categories
204 return query_engineref_list, query_categories
193
205