[mod] add searx/webadapter.py

* move searx.search.get_search_query_from_webapp to searx.webadapter
* move searx.query.SearchQuery to searx.search
This commit is contained in:
Alexandre Flament 2020-09-22 13:59:27 +02:00
parent 21dbc7e852
commit 2dbc0de0cd
6 changed files with 221 additions and 220 deletions

View file

@ -178,23 +178,3 @@ class RawTextQuery:
def getFullQuery(self):
# get full querry including whitespaces
return ''.join(self.query_parts)
class SearchQuery:
"""container for all the search parameters (query, language, etc...)"""
def __init__(self, query, engines, categories, lang, safesearch, pageno, time_range,
timeout_limit=None, preferences=None, external_bang=None):
self.query = query
self.engines = engines
self.categories = categories
self.lang = lang
self.safesearch = safesearch
self.pageno = pageno
self.time_range = None if time_range in ('', 'None', None) else time_range
self.timeout_limit = timeout_limit
self.preferences = preferences
self.external_bang = external_bang
def __str__(self):
return self.query + ";" + str(self.engines)