OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

Merge pull request #2185 from dalf/rawtextquery-auto-parse

Browse source 
[mod] searx.RawTextQuery: the constructor call parse_query
This commit is contained in:
Alexandre Flament 2020-09-12 15:33:03 +02:00 committed by GitHub
commit ae07f4a211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
searx/query.py
View file

@ -45,10 +45,11 @@ class RawTextQuery:
self.timeout_limit = None self.timeout_limit = None
self.external_bang = None self.external_bang = None
self.specific = False self.specific = False
self._parse_query()
# parse query, if tags are set, which # parse query, if tags are set, which
# change the search engine or search-language # change the search engine or search-language
def parse_query(self): def _parse_query(self):
self.query_parts = [] self.query_parts = []
# split query, including whitespaces # split query, including whitespaces

1
searx/search.py
View file

@ -266,7 +266,6 @@ def get_search_query_from_webapp(preferences, form):
# parse query, if tags are set, which change # parse query, if tags are set, which change
# the serch engine or search-language # the serch engine or search-language
raw_text_query = RawTextQuery(form['q'], disabled_engines) raw_text_query = RawTextQuery(form['q'], disabled_engines)
raw_text_query.parse_query()
# set query # set query
query = raw_text_query.getSearchQuery() query = raw_text_query.getSearchQuery()

1
searx/webapp.py
View file

@ -737,7 +737,6 @@ def autocompleter():
# parse query # parse query
raw_text_query = RawTextQuery(str(request.form.get('q', b'')), disabled_engines) raw_text_query = RawTextQuery(str(request.form.get('q', b'')), disabled_engines)
raw_text_query.parse_query()
# check if search query is set # check if search query is set
if not raw_text_query.getSearchQuery(): if not raw_text_query.getSearchQuery():

9
tests/unit/test_query.py
View file

@ -7,7 +7,6 @@ class TestQuery(SearxTestCase):
def test_simple_query(self): def test_simple_query(self):
query_text = 'the query' query_text = 'the query'
query = RawTextQuery(query_text, []) query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), query_text) self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 1) self.assertEqual(len(query.query_parts), 1)
@ -19,7 +18,6 @@ class TestQuery(SearxTestCase):
query_text = 'the query' query_text = 'the query'
full_query = ':' + language + ' ' + query_text full_query = ':' + language + ' ' + query_text
query = RawTextQuery(full_query, []) query = RawTextQuery(full_query, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), full_query) self.assertEqual(query.getFullQuery(), full_query)
self.assertEqual(len(query.query_parts), 3) self.assertEqual(len(query.query_parts), 3)
@ -32,7 +30,6 @@ class TestQuery(SearxTestCase):
query_text = 'the query' query_text = 'the query'
full_query = ':' + language + ' ' + query_text full_query = ':' + language + ' ' + query_text
query = RawTextQuery(full_query, []) query = RawTextQuery(full_query, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), full_query) self.assertEqual(query.getFullQuery(), full_query)
self.assertEqual(len(query.query_parts), 3) self.assertEqual(len(query.query_parts), 3)
@ -44,7 +41,6 @@ class TestQuery(SearxTestCase):
query_text = 'the query' query_text = 'the query'
full_query = ':' + language + ' ' + query_text full_query = ':' + language + ' ' + query_text
query = RawTextQuery(full_query, []) query = RawTextQuery(full_query, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), full_query) self.assertEqual(query.getFullQuery(), full_query)
self.assertEqual(len(query.query_parts), 3) self.assertEqual(len(query.query_parts), 3)
@ -56,7 +52,6 @@ class TestQuery(SearxTestCase):
query_text = 'the query' query_text = 'the query'
full_query = ':' + language + ' ' + query_text full_query = ':' + language + ' ' + query_text
query = RawTextQuery(full_query, []) query = RawTextQuery(full_query, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), full_query) self.assertEqual(query.getFullQuery(), full_query)
self.assertEqual(len(query.query_parts), 1) self.assertEqual(len(query.query_parts), 1)
@ -66,7 +61,6 @@ class TestQuery(SearxTestCase):
def test_timeout_below100(self): def test_timeout_below100(self):
query_text = '<3 the query' query_text = '<3 the query'
query = RawTextQuery(query_text, []) query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), query_text) self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 3) self.assertEqual(len(query.query_parts), 3)
@ -76,7 +70,6 @@ class TestQuery(SearxTestCase):
def test_timeout_above100(self): def test_timeout_above100(self):
query_text = '<350 the query' query_text = '<350 the query'
query = RawTextQuery(query_text, []) query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), query_text) self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 3) self.assertEqual(len(query.query_parts), 3)
@ -86,7 +79,6 @@ class TestQuery(SearxTestCase):
def test_timeout_above1000(self): def test_timeout_above1000(self):
query_text = '<3500 the query' query_text = '<3500 the query'
query = RawTextQuery(query_text, []) query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), query_text) self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 3) self.assertEqual(len(query.query_parts), 3)
@ -97,7 +89,6 @@ class TestQuery(SearxTestCase):
# invalid number: it is not bang but it is part of the query # invalid number: it is not bang but it is part of the query
query_text = '<xxx the query' query_text = '<xxx the query'
query = RawTextQuery(query_text, []) query = RawTextQuery(query_text, [])
query.parse_query()
self.assertEqual(query.getFullQuery(), query_text) self.assertEqual(query.getFullQuery(), query_text)
self.assertEqual(len(query.query_parts), 1) self.assertEqual(len(query.query_parts), 1)