diff options
| -rw-r--r-- | searx/query.py | 4 | ||||
| -rw-r--r-- | searx/search/__init__.py | 9 | ||||
| -rw-r--r-- | searx/webadapter.py | 13 | ||||
| -rw-r--r-- | tests/unit/test_search.py | 8 | ||||
| -rw-r--r-- | tests/unit/test_standalone_searx.py | 2 |
5 files changed, 12 insertions, 24 deletions
diff --git a/searx/query.py b/searx/query.py index 422cd57b5..e61e24f2c 100644 --- a/searx/query.py +++ b/searx/query.py @@ -125,12 +125,12 @@ class RawTextQuery: searx_query_part = True engine_name = engine_shortcuts[prefix] if engine_name in engines: - self.enginerefs.append(EngineRef(engine_name, 'none', True)) + self.enginerefs.append(EngineRef(engine_name, 'none')) # check if prefix is equal with engine name elif prefix in engines: searx_query_part = True - self.enginerefs.append(EngineRef(prefix, 'none', True)) + self.enginerefs.append(EngineRef(prefix, 'none')) # check if prefix is equal with categorie name elif prefix in categories: diff --git a/searx/search/__init__.py b/searx/search/__init__.py index e9e4f5640..0d45f0b7c 100644 --- a/searx/search/__init__.py +++ b/searx/search/__init__.py @@ -52,18 +52,17 @@ def initialize(settings_engines=None): class EngineRef: - __slots__ = 'name', 'category', 'from_bang' + __slots__ = 'name', 'category' - def __init__(self, name: str, category: str, from_bang: bool=False): + def __init__(self, name: str, category: str): self.name = name self.category = category - self.from_bang = from_bang def __repr__(self): - return "EngineRef({!r}, {!r}, {!r})".format(self.name, self.category, self.from_bang) + return "EngineRef({!r}, {!r})".format(self.name, self.category) def __eq__(self, other): - return self.name == other.name and self.category == other.category and self.from_bang == other.from_bang + return self.name == other.name and self.category == other.category class SearchQuery: diff --git a/searx/webadapter.py b/searx/webadapter.py index 7bec42651..0ad82c62c 100644 --- a/searx/webadapter.py +++ b/searx/webadapter.py @@ -109,17 +109,6 @@ def parse_timeout(form: Dict[str, str], raw_text_query: RawTextQuery) -> Optiona raise SearxParameterException('timeout_limit', timeout_limit) -def parse_specific(raw_text_query: RawTextQuery) -> Tuple[List[EngineRef], List[str]]: - query_engineref_list = raw_text_query.enginerefs - additional_categories = set() - for engineref in raw_text_query.enginerefs: - if engineref.from_bang: - additional_categories.add('none') - else: - additional_categories.add(engineref.category) - return query_engineref_list - - def parse_category_form(query_categories: List[str], name: str, value: str) -> None: if name == 'categories': 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]) if not is_locked('categories') and raw_text_query.enginerefs and raw_text_query.specific: # if engines are calculated from query, # set categories by using that informations - query_engineref_list = parse_specific(raw_text_query) + query_engineref_list = raw_text_query.enginerefs else: # otherwise, using defined categories to # calculate which engines should be used diff --git a/tests/unit/test_search.py b/tests/unit/test_search.py index 08b41e062..72732032e 100644 --- a/tests/unit/test_search.py +++ b/tests/unit/test_search.py @@ -23,13 +23,13 @@ TEST_ENGINES = [ class SearchQueryTestCase(SearxTestCase): def test_repr(self): - s = SearchQuery('test', [EngineRef('bing', 'general', False)], 'all', 0, 1, '1', 5.0, 'g') + s = SearchQuery('test', [EngineRef('bing', 'general')], 'all', 0, 1, '1', 5.0, 'g') self.assertEqual(repr(s), - "SearchQuery('test', [EngineRef('bing', 'general', False)], 'all', 0, 1, '1', 5.0, 'g')") # noqa + "SearchQuery('test', [EngineRef('bing', 'general')], 'all', 0, 1, '1', 5.0, 'g')") # noqa def test_eq(self): - s = SearchQuery('test', [EngineRef('bing', 'general', False)], 'all', 0, 1, None, None, None) - t = SearchQuery('test', [EngineRef('google', 'general', False)], 'all', 0, 1, None, None, None) + s = SearchQuery('test', [EngineRef('bing', 'general')], 'all', 0, 1, None, None, None) + t = SearchQuery('test', [EngineRef('google', 'general')], 'all', 0, 1, None, None, None) self.assertEqual(s, s) self.assertNotEqual(s, t) diff --git a/tests/unit/test_standalone_searx.py b/tests/unit/test_standalone_searx.py index d16bfe809..6cc230e6c 100644 --- a/tests/unit/test_standalone_searx.py +++ b/tests/unit/test_standalone_searx.py @@ -101,7 +101,7 @@ class StandaloneSearx(SearxTestCase): args = sas.parse_argument(['rain', ]) search_q = sas.get_search_query(args) self.assertTrue(search_q) - self.assertEqual(search_q, SearchQuery('rain', [EngineRef('engine1', 'general', False)], + self.assertEqual(search_q, SearchQuery('rain', [EngineRef('engine1', 'general')], 'all', 0, 1, None, None, None)) def test_no_parsed_url(self): |