diff options
Diffstat (limited to 'searx/search/__init__.py')
| -rw-r--r-- | searx/search/__init__.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/searx/search/__init__.py b/searx/search/__init__.py index 99459c7a3..e9e4f5640 100644 --- a/searx/search/__init__.py +++ b/searx/search/__init__.py @@ -69,22 +69,20 @@ class EngineRef: class SearchQuery: """container for all the search parameters (query, language, etc...)""" - __slots__ = 'query', 'engineref_list', 'categories', 'lang', 'safesearch', 'pageno', 'time_range',\ + __slots__ = 'query', 'engineref_list', 'lang', 'safesearch', 'pageno', 'time_range',\ 'timeout_limit', 'external_bang' def __init__(self, query: str, engineref_list: typing.List[EngineRef], - categories: typing.List[str], - lang: str, - safesearch: int, - pageno: int, - time_range: typing.Optional[str], + lang: str='all', + safesearch: int=0, + pageno: int=1, + time_range: typing.Optional[str]=None, timeout_limit: typing.Optional[float]=None, external_bang: typing.Optional[str]=None): self.query = query self.engineref_list = engineref_list - self.categories = categories self.lang = lang self.safesearch = safesearch self.pageno = pageno @@ -92,15 +90,18 @@ class SearchQuery: self.timeout_limit = timeout_limit self.external_bang = external_bang + @property + def categories(self): + return list(set(map(lambda engineref: engineref.category, self.engineref_list))) + def __repr__(self): - return "SearchQuery({!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r})".\ - format(self.query, self.engineref_list, self.categories, self.lang, self.safesearch, + return "SearchQuery({!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r})".\ + format(self.query, self.engineref_list, self.lang, self.safesearch, self.pageno, self.time_range, self.timeout_limit, self.external_bang) def __eq__(self, other): return self.query == other.query\ and self.engineref_list == other.engineref_list\ - and self.categories == self.categories\ and self.lang == other.lang\ and self.safesearch == other.safesearch\ and self.pageno == other.pageno\ |