eda8934 · searx · git.iko.soy

git.iko.soy/searx

[mod] searx.search.EngineRef: remove from_bang parameter

from_bang is True when the user query contains a bang. In this case the category is also set to 'none'. from_bang only usage was in searx.webadapter.parse_specific : if from_bang is True, then the EngineRef category is ignored and force to 'none'. This commit also removes the searx.webadapter.parse_sepecific function.

commiteda8934f1548ed228d00a0196b61d35585ea11bc authorAlexandre Flament <alex@al-f.net> dateFri 18 Dec 2020, 12:19 (6 years ago) parent995ba2f

5 files changed+12−24

compare with master

unifiedsplit

searx/query.py+2−2 searx/search/__init__.py+4−5 searx/webadapter.py+1−12 tests/unit/test_search.py+4−4 tests/unit/test_standalone_searx.py+1−1

searx/query.py+2−2

@@ -125,12 +125,12 @@ class RawTextQuery:

125125 searx_query_part = True

126126 engine_name = engine_shortcuts[prefix]

127127 if engine_name in engines:

128− self.enginerefs.append(EngineRef(engine_name, 'none', True))

128+ self.enginerefs.append(EngineRef(engine_name, 'none'))

129129

130130 # check if prefix is equal with engine name

131131 elif prefix in engines:

132132 searx_query_part = True

133− self.enginerefs.append(EngineRef(prefix, 'none', True))

133+ self.enginerefs.append(EngineRef(prefix, 'none'))

134134

135135 # check if prefix is equal with categorie name

136136 elif prefix in categories:

searx/search/__init__.py+4−5

@@ -52,18 +52,17 @@ def initialize(settings_engines=None):

5252

5353class EngineRef:

5454

55− __slots__ = 'name', 'category', 'from_bang'

55+ __slots__ = 'name', 'category'

5656

57− def __init__(self, name: str, category: str, from_bang: bool=False):

57+ def __init__(self, name: str, category: str):

5858 self.name = name

5959 self.category = category

60− self.from_bang = from_bang

6160

6261 def __repr__(self):

63− return "EngineRef({!r}, {!r}, {!r})".format(self.name, self.category, self.from_bang)

62+ return "EngineRef({!r}, {!r})".format(self.name, self.category)

6463

6564 def __eq__(self, other):

66− return self.name == other.name and self.category == other.category and self.from_bang == other.from_bang

65+ return self.name == other.name and self.category == other.category

6766

6867

6968class SearchQuery:

searx/webadapter.py+1−12

@@ -109,17 +109,6 @@ def parse_timeout(form: Dict[str, str], raw_text_query: RawTextQuery) -> Optiona

109109 raise SearxParameterException('timeout_limit', timeout_limit)

110110

111111

112−def parse_specific(raw_text_query: RawTextQuery) -> Tuple[List[EngineRef], List[str]]:

113− query_engineref_list = raw_text_query.enginerefs

114− additional_categories = set()

115− for engineref in raw_text_query.enginerefs:

116− if engineref.from_bang:

117− additional_categories.add('none')

118− else:

119− additional_categories.add(engineref.category)

120− return query_engineref_list

121−

122−

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

124113 if name == 'categories':

125114 query_categories.extend(categ for categ in map(str.strip, value.split(',')) if categ in categories)

@@ -232,7 +221,7 @@ def get_search_query_from_webapp(preferences: Preferences, form: Dict[str, str])

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

233222 # if engines are calculated from query,

234223 # set categories by using that informations

235− query_engineref_list = parse_specific(raw_text_query)

224+ query_engineref_list = raw_text_query.enginerefs

236225 else:

237226 # otherwise, using defined categories to

238227 # calculate which engines should be used

tests/unit/test_search.py+4−4

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

2323class SearchQueryTestCase(SearxTestCase):

2424

2525 def test_repr(self):

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

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

2727 self.assertEqual(repr(s),

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

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

2929

3030 def test_eq(self):

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

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

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

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

3333 self.assertEqual(s, s)

3434 self.assertNotEqual(s, t)

3535

tests/unit/test_standalone_searx.py+1−1

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

101101 args = sas.parse_argument(['rain', ])

102102 search_q = sas.get_search_query(args)

103103 self.assertTrue(search_q)

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

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

105105 'all', 0, 1, None, None, None))

106106

107107 def test_no_parsed_url(self):