on master help sign in
[mod] searx.query.RawTextQuery: getSearchQuery and changeSearchQuery rename to getQuery and changeQuery

getSearchQuery is confusing, the method returns a str not a SearchQuery object

commitedd8dccd07d5c9bbd5d73c74ee98d0a7ee585dd0 authorAlexandre Flament <alex@al-f.net> dateMon 14 Sep 2020, 10:11 (6 years ago) parentc4067a9
4 files changed+16−16
searx/autocomplete.py+6−6 searx/query.py+4−4 searx/search.py+1−1 searx/webapp.py+5−5
searx/autocomplete.py+6−6
@@ -38,22 +38,22 @@ def get(*args, **kwargs):
3838def searx_bang(full_query):
3939 '''check if the searchQuery contain a bang, and create fitting autocompleter results'''
4040 # check if there is a query which can be parsed
41− if len(full_query.getSearchQuery()) == 0:
41+ if len(full_query.getQuery()) == 0:
4242 return []
4343
4444 results = []
4545
4646 # check if current query stats with !bang
47− first_char = full_query.getSearchQuery()[0]
47+ first_char = full_query.getQuery()[0]
4848 if first_char == '!' or first_char == '?':
49− if len(full_query.getSearchQuery()) == 1:
49+ if len(full_query.getQuery()) == 1:
5050 # show some example queries
5151 # TODO, check if engine is not avaliable
5252 results.append(first_char + "images")
5353 results.append(first_char + "wikipedia")
5454 results.append(first_char + "osm")
5555 else:
56− engine_query = full_query.getSearchQuery()[1:]
56+ engine_query = full_query.getQuery()[1:]
5757
5858 # check if query starts with categorie name
5959 for categorie in categories:
@@ -72,14 +72,14 @@ def searx_bang(full_query):
7272
7373 # check if current query stats with :bang
7474 elif first_char == ':':
75− if len(full_query.getSearchQuery()) == 1:
75+ if len(full_query.getQuery()) == 1:
7676 # show some example queries
7777 results.append(":en")
7878 results.append(":en_us")
7979 results.append(":english")
8080 results.append(":united_kingdom")
8181 else:
82− engine_query = full_query.getSearchQuery()[1:]
82+ engine_query = full_query.getQuery()[1:]
8383
8484 for lc in language_codes:
8585 lang_id, lang_name, country, english_name = map(str.lower, lc)
searx/query.py+4−4
@@ -162,14 +162,14 @@ class RawTextQuery:
162162 # append query part to query_part list
163163 self.query_parts.append(query_part)
164164
165− def changeSearchQuery(self, search_query):
165+ def changeQuery(self, query):
166166 if len(self.query_parts):
167− self.query_parts[-1] = search_query
167+ self.query_parts[-1] = query
168168 else:
169− self.query_parts.append(search_query)
169+ self.query_parts.append(query)
170170 return self
171171
172− def getSearchQuery(self):
172+ def getQuery(self):
173173 if len(self.query_parts):
174174 return self.query_parts[-1]
175175 else:
searx/search.py+1−1
@@ -268,7 +268,7 @@ def get_search_query_from_webapp(preferences, form):
268268 raw_text_query = RawTextQuery(form['q'], disabled_engines)
269269
270270 # set query
271− query = raw_text_query.getSearchQuery()
271+ query = raw_text_query.getQuery()
272272
273273 # get and check page number
274274 pageno_param = form.get('pageno', '1')
searx/webapp.py+5−5
@@ -679,13 +679,13 @@ def index():
679679
680680 # suggestions: use RawTextQuery to get the suggestion URLs with the same bang
681681 suggestion_urls = list(map(lambda suggestion: {
682− 'url': raw_text_query.changeSearchQuery(suggestion).getFullQuery(),
682+ 'url': raw_text_query.changeQuery(suggestion).getFullQuery(),
683683 'title': suggestion
684684 },
685685 result_container.suggestions))
686686
687687 correction_urls = list(map(lambda correction: {
688− 'url': raw_text_query.changeSearchQuery(correction).getFullQuery(),
688+ 'url': raw_text_query.changeQuery(correction).getFullQuery(),
689689 'title': correction
690690 },
691691 result_container.corrections))
@@ -744,7 +744,7 @@ def autocompleter():
744744 raw_text_query = RawTextQuery(request.form.get('q', ''), disabled_engines)
745745
746746 # check if search query is set
747− if not raw_text_query.getSearchQuery():
747+ if not raw_text_query.getQuery():
748748 return '', 400
749749
750750 # run autocompleter
@@ -765,12 +765,12 @@ def autocompleter():
765765 else:
766766 language = language.split('-')[0]
767767 # run autocompletion
768− raw_results.extend(completer(raw_text_query.getSearchQuery(), language))
768+ raw_results.extend(completer(raw_text_query.getQuery(), language))
769769
770770 # parse results (write :language and !engine back to result string)
771771 results = []
772772 for result in raw_results:
773− raw_text_query.changeSearchQuery(result)
773+ raw_text_query.changeQuery(result)
774774
775775 # add parsed result
776776 results.append(raw_text_query.getFullQuery())