diff options
Diffstat (limited to 'searx/query.py')
| -rw-r--r-- | searx/query.py | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/searx/query.py b/searx/query.py index 79afa0245..6eba2cbd6 100644 --- a/searx/query.py +++ b/searx/query.py @@ -17,23 +17,22 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> ''' +import re + from searx.languages import language_codes from searx.engines import ( categories, engines, engine_shortcuts ) -import re -import sys -if sys.version_info[0] == 3: - unicode = str VALID_LANGUAGE_CODE = re.compile(r'^[a-z]{2,3}(-[a-zA-Z]{2})?$') -class RawTextQuery(object): +class RawTextQuery: """parse raw text query (the value from the html input)""" def __init__(self, query, disabled_engines): + assert isinstance(query, str) self.query = query self.disabled_engines = [] @@ -44,15 +43,17 @@ class RawTextQuery(object): self.engines = [] self.languages = [] self.timeout_limit = None + self.external_bang = None self.specific = False + self._parse_query() # parse query, if tags are set, which - # change the serch engine or search-language - def parse_query(self): + # change the search engine or search-language + def _parse_query(self): self.query_parts = [] # split query, including whitespaces - raw_query_parts = re.split(r'(\s+)' if isinstance(self.query, str) else b'(\s+)', self.query) + raw_query_parts = re.split(r'(\s+)', self.query) parse_next = True @@ -92,7 +93,7 @@ class RawTextQuery(object): # check if any language-code is equal with # declared language-codes for lc in language_codes: - lang_id, lang_name, country, english_name = map(unicode.lower, lc) + lang_id, lang_name, country, english_name = map(str.lower, lc) # if correct language-code is found # set it as new search-language @@ -120,6 +121,11 @@ class RawTextQuery(object): self.languages.append(lang) parse_next = True + # external bang + if query_part[0:2] == "!!": + self.external_bang = query_part[2:] + parse_next = True + continue # this force a engine or category if query_part[0] == '!' or query_part[0] == '?': prefix = query_part[1:].replace('-', ' ').replace('_', ' ') @@ -171,15 +177,15 @@ class RawTextQuery(object): def getFullQuery(self): # get full querry including whitespaces - return u''.join(self.query_parts) + return ''.join(self.query_parts) -class SearchQuery(object): +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): - self.query = query.encode('utf-8') + timeout_limit=None, preferences=None, external_bang=None): + self.query = query self.engines = engines self.categories = categories self.lang = lang @@ -188,6 +194,7 @@ class SearchQuery(object): 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 str(self.query) + ";" + str(self.engines) + return self.query + ";" + str(self.engines) |