995ba2f · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

[mod] searx.search.SearchQuery: remove categories parameter

995ba2fAlexandre Flament6 years ago

searx/search/__init__.py+11−10

compare with master

unifiedsplit

@@ -69,22 +69,20 @@ class EngineRef:

69class SearchQuery:

70 """container for all the search parameters (query, language, etc...)"""

72− __slots__ = 'query', 'engineref_list', 'categories', 'lang', 'safesearch', 'pageno', 'time_range',\

72+ __slots__ = 'query', 'engineref_list', 'lang', 'safesearch', 'pageno', 'time_range',\

73 'timeout_limit', 'external_bang'

75 def __init__(self,

76 query: str,

77 engineref_list: typing.List[EngineRef],

78− categories: typing.List[str],

79− lang: str,

78+ lang: str='all',

80− safesearch: int,

79+ safesearch: int=0,

81− pageno: int,

80+ pageno: int=1,

82− time_range: typing.Optional[str],

81+ time_range: typing.Optional[str]=None,

83 timeout_limit: typing.Optional[float]=None,

82 timeout_limit: typing.Optional[float]=None,

84 external_bang: typing.Optional[str]=None):

83 external_bang: typing.Optional[str]=None):

85 self.query = query

84 self.query = query

86 self.engineref_list = engineref_list

85 self.engineref_list = engineref_list

87− self.categories = categories

88 self.lang = lang

86 self.lang = lang

89 self.safesearch = safesearch

87 self.safesearch = safesearch

90 self.pageno = pageno

88 self.pageno = pageno

@@ -92,15 +90,18 @@ class SearchQuery:

92 self.timeout_limit = timeout_limit

90 self.timeout_limit = timeout_limit

93 self.external_bang = external_bang

91 self.external_bang = external_bang

93+ @property

94+ def categories(self):

95+ return list(set(map(lambda engineref: engineref.category, self.engineref_list)))

96+

95 def __repr__(self):

97 def __repr__(self):

96− return "SearchQuery({!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r})".\

98+ return "SearchQuery({!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r})".\

97− format(self.query, self.engineref_list, self.categories, self.lang, self.safesearch,

99+ format(self.query, self.engineref_list, self.lang, self.safesearch,

98 self.pageno, self.time_range, self.timeout_limit, self.external_bang)

100 self.pageno, self.time_range, self.timeout_limit, self.external_bang)

101

100 def __eq__(self, other):

102 def __eq__(self, other):

101 return self.query == other.query\

103 return self.query == other.query\

102 and self.engineref_list == other.engineref_list\

104 and self.engineref_list == other.engineref_list\

103− and self.categories == self.categories\

104 and self.lang == other.lang\

105 and self.lang == other.lang\

105 and self.safesearch == other.safesearch\

106 and self.safesearch == other.safesearch\

106 and self.pageno == other.pageno\

107 and self.pageno == other.pageno\

searx/webadapter.py+7−13

@@ -117,8 +117,7 @@ def parse_specific(raw_text_query: RawTextQuery) -> Tuple[List[EngineRef], List[

117 additional_categories.add('none')

118 else:

119 additional_categories.add(engineref.category)

120− query_categories = list(additional_categories)

121− return query_engineref_list, query_categories

120+ return query_engineref_list

122

121

123

122

124def parse_category_form(query_categories: List[str], name: str, value: str) -> None:

123def parse_category_form(query_categories: List[str], name: str, value: str) -> None:

@@ -171,8 +170,7 @@ def get_engineref_from_category_list(category_list: List[str], disabled_engines:

171 return result

170 return result

172

171

173

172

174−def parse_generic(preferences: Preferences, form: Dict[str, str], disabled_engines: List[str])\

173+def parse_generic(preferences: Preferences, form: Dict[str, str], disabled_engines: List[str]) -> List[EngineRef]:

175− -> Tuple[List[EngineRef], List[str]]:

176 query_engineref_list = []

174 query_engineref_list = []

177 query_categories = []

175 query_categories = []

178

176

@@ -195,8 +193,6 @@ def parse_generic(preferences: Preferences, form: Dict[str, str], disabled_engin

195 if query_categories:

193 if query_categories:

196 # add engines from referenced by the "categories" parameter and the "category_*"" parameters

194 # add engines from referenced by the "categories" parameter and the "category_*"" parameters

197 query_engineref_list.extend(get_engineref_from_category_list(query_categories, disabled_engines))

195 query_engineref_list.extend(get_engineref_from_category_list(query_categories, disabled_engines))

198− # get categories from the query_engineref_list

199− query_categories = list(set(engine.category for engine in query_engineref_list))

200 else:

196 else:

201 # no "engines" parameters in the form

197 # no "engines" parameters in the form

202 if not query_categories:

198 if not query_categories:

@@ -208,7 +204,7 @@ def parse_generic(preferences: Preferences, form: Dict[str, str], disabled_engin

208 # declared under the specific categories

204 # declared under the specific categories

209 query_engineref_list.extend(get_engineref_from_category_list(query_categories, disabled_engines))

205 query_engineref_list.extend(get_engineref_from_category_list(query_categories, disabled_engines))

210

206

211− return query_engineref_list, query_categories

207+ return query_engineref_list

212

208

213

209

214def get_search_query_from_webapp(preferences: Preferences, form: Dict[str, str])\

210def get_search_query_from_webapp(preferences: Preferences, form: Dict[str, str])\

@@ -236,20 +232,18 @@ def get_search_query_from_webapp(preferences: Preferences, form: Dict[str, str])

236 if not is_locked('categories') and raw_text_query.enginerefs and raw_text_query.specific:

232 if not is_locked('categories') and raw_text_query.enginerefs and raw_text_query.specific:

237 # if engines are calculated from query,

233 # if engines are calculated from query,

238 # set categories by using that informations

234 # set categories by using that informations

239− query_engineref_list, query_categories = parse_specific(raw_text_query)

235+ query_engineref_list = parse_specific(raw_text_query)

240 else:

236 else:

241 # otherwise, using defined categories to

237 # otherwise, using defined categories to

242 # calculate which engines should be used

238 # calculate which engines should be used

243− query_engineref_list, query_categories = parse_generic(preferences, form, disabled_engines)

239+ query_engineref_list = parse_generic(preferences, form, disabled_engines)

244

240

245 query_engineref_list = deduplicate_engineref_list(query_engineref_list)

241 query_engineref_list = deduplicate_engineref_list(query_engineref_list)

246 query_engineref_list, query_engineref_list_unknown, query_engineref_list_notoken =\

242 query_engineref_list, query_engineref_list_unknown, query_engineref_list_notoken =\

247 validate_engineref_list(query_engineref_list, preferences)

243 validate_engineref_list(query_engineref_list, preferences)

248

244

249− return (SearchQuery(query, query_engineref_list, query_categories,

250− query_lang, query_safesearch, query_pageno,

245+ return (SearchQuery(query, query_engineref_list, query_lang, query_safesearch, query_pageno,

251− query_time_range, query_timeout,

246+ query_time_range, query_timeout, external_bang=external_bang),

252− external_bang=external_bang),

253 raw_text_query,

247 raw_text_query,

254 query_engineref_list_unknown,

248 query_engineref_list_unknown,

255 query_engineref_list_notoken)

249 query_engineref_list_notoken)

tests/unit/test_search.py+11−11

@@ -23,13 +23,13 @@ TEST_ENGINES = [

23class SearchQueryTestCase(SearxTestCase):

25 def test_repr(self):

26− s = SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, '1', 5.0, 'g')

26+ s = SearchQuery('test', [EngineRef('bing', 'general', False)], 'all', 0, 1, '1', 5.0, 'g')

27 self.assertEqual(repr(s),

28− "SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, '1', 5.0, 'g')") # noqa

28+ "SearchQuery('test', [EngineRef('bing', 'general', False)], 'all', 0, 1, '1', 5.0, 'g')") # noqa

30 def test_eq(self):

31− s = SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, None, None, None)

31+ s = SearchQuery('test', [EngineRef('bing', 'general', False)], 'all', 0, 1, None, None, None)

32− t = SearchQuery('test', [EngineRef('google', 'general', False)], ['general'], 'all', 0, 1, None, None, None)

32+ t = SearchQuery('test', [EngineRef('google', 'general', False)], 'all', 0, 1, None, None, None)

33 self.assertEqual(s, s)

34 self.assertNotEqual(s, t)

@@ -43,7 +43,7 @@ class SearchTestCase(SearxTestCase):

43 def test_timeout_simple(self):

44 searx.search.max_request_timeout = None

45 search_query = SearchQuery('test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')],

46− ['general'], 'en-US', SAFESEARCH, PAGENO, None, None)

46+ 'en-US', SAFESEARCH, PAGENO, None, None)

47 search = searx.search.Search(search_query)

48 search.search()

49 self.assertEqual(search.actual_timeout, 3.0)

@@ -51,7 +51,7 @@ class SearchTestCase(SearxTestCase):

51 def test_timeout_query_above_default_nomax(self):

52 searx.search.max_request_timeout = None

53 search_query = SearchQuery('test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')],

54− ['general'], 'en-US', SAFESEARCH, PAGENO, None, 5.0)

54+ 'en-US', SAFESEARCH, PAGENO, None, 5.0)

55 search = searx.search.Search(search_query)

56 search.search()

57 self.assertEqual(search.actual_timeout, 3.0)

@@ -59,7 +59,7 @@ class SearchTestCase(SearxTestCase):

59 def test_timeout_query_below_default_nomax(self):

60 searx.search.max_request_timeout = None

61 search_query = SearchQuery('test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')],

62− ['general'], 'en-US', SAFESEARCH, PAGENO, None, 1.0)

62+ 'en-US', SAFESEARCH, PAGENO, None, 1.0)

63 search = searx.search.Search(search_query)

64 search.search()

65 self.assertEqual(search.actual_timeout, 1.0)

@@ -67,7 +67,7 @@ class SearchTestCase(SearxTestCase):

67 def test_timeout_query_below_max(self):

68 searx.search.max_request_timeout = 10.0

69 search_query = SearchQuery('test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')],

70− ['general'], 'en-US', SAFESEARCH, PAGENO, None, 5.0)

70+ 'en-US', SAFESEARCH, PAGENO, None, 5.0)

71 search = searx.search.Search(search_query)

72 search.search()

73 self.assertEqual(search.actual_timeout, 5.0)

@@ -75,7 +75,7 @@ class SearchTestCase(SearxTestCase):

75 def test_timeout_query_above_max(self):

76 searx.search.max_request_timeout = 10.0

77 search_query = SearchQuery('test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')],

78− ['general'], 'en-US', SAFESEARCH, PAGENO, None, 15.0)

78+ 'en-US', SAFESEARCH, PAGENO, None, 15.0)

79 search = searx.search.Search(search_query)

80 search.search()

81 self.assertEqual(search.actual_timeout, 10.0)

@@ -83,7 +83,7 @@ class SearchTestCase(SearxTestCase):

83 def test_external_bang(self):

84 search_query = SearchQuery('yes yes',

85 [EngineRef(PUBLIC_ENGINE_NAME, 'general')],

86− ['general'], 'en-US', SAFESEARCH, PAGENO, None, None,

86+ 'en-US', SAFESEARCH, PAGENO, None, None,

87 external_bang="yt")

88 search = searx.search.Search(search_query)

89 results = search.search()

@@ -92,7 +92,7 @@ class SearchTestCase(SearxTestCase):

93 search_query = SearchQuery('youtube never gonna give you up',

94 [EngineRef(PUBLIC_ENGINE_NAME, 'general')],

95− ['general'], 'en-US', SAFESEARCH, PAGENO, None, None)

95+ 'en-US', SAFESEARCH, PAGENO, None, None)

97 search = searx.search.Search(search_query)

98 results = search.search()

tests/unit/test_standalone_searx.py+1−1

@@ -102,7 +102,7 @@ class StandaloneSearx(SearxTestCase):

102 search_q = sas.get_search_query(args)

103 self.assertTrue(search_q)

104 self.assertEqual(search_q, SearchQuery('rain', [EngineRef('engine1', 'general', False)],

105− ['general'], 'all', 0, 1, None, None, None))

105+ 'all', 0, 1, None, None, None))

106

107 def test_no_parsed_url(self):

108 """test no_parsed_url func"""