df12ed6 · searx · git.iko.soy

git.iko.soy/searx

[mod] searx.RawTextQuery: the constructor call parse_query

commitdf12ed6e5563e9c78c98ca31ee11ce5fc508bc2a authorAlexandre Flament <alex@al-f.net> dateWed 9 Sep 2020, 12:17 (6 years ago) parent2370234

4 files changed+2−12

compare with master

unifiedsplit

searx/query.py+2−1 searx/search.py−1 searx/webapp.py−1 tests/unit/test_query.py−9

searx/query.py+2−1

@@ -45,10 +45,11 @@ class RawTextQuery:

4545 self.timeout_limit = None

4646 self.external_bang = None

4747 self.specific = False

48+ self._parse_query()

4849

4950 # parse query, if tags are set, which

5051 # change the search engine or search-language

51− def parse_query(self):

52+ def _parse_query(self):

5253 self.query_parts = []

5354

5455 # split query, including whitespaces

searx/search.py−1

@@ -266,7 +266,6 @@ def get_search_query_from_webapp(preferences, form):

266266 # parse query, if tags are set, which change

267267 # the serch engine or search-language

268268 raw_text_query = RawTextQuery(form['q'], disabled_engines)

269− raw_text_query.parse_query()

270269

271270 # set query

272271 query = raw_text_query.getSearchQuery()

searx/webapp.py−1

@@ -737,7 +737,6 @@ def autocompleter():

737737

738738 # parse query

739739 raw_text_query = RawTextQuery(str(request.form.get('q', b'')), disabled_engines)

740− raw_text_query.parse_query()

741740

742741 # check if search query is set

743742 if not raw_text_query.getSearchQuery():

tests/unit/test_query.py−9

@@ -7,7 +7,6 @@ class TestQuery(SearxTestCase):

77 def test_simple_query(self):

88 query_text = 'the query'

99 query = RawTextQuery(query_text, [])

10− query.parse_query()

1110

1211 self.assertEqual(query.getFullQuery(), query_text)

1312 self.assertEqual(len(query.query_parts), 1)

@@ -19,7 +18,6 @@ class TestQuery(SearxTestCase):

1918 query_text = 'the query'

2019 full_query = ':' + language + ' ' + query_text

2120 query = RawTextQuery(full_query, [])

22− query.parse_query()

2321

2422 self.assertEqual(query.getFullQuery(), full_query)

2523 self.assertEqual(len(query.query_parts), 3)

@@ -32,7 +30,6 @@ class TestQuery(SearxTestCase):

3230 query_text = 'the query'

3331 full_query = ':' + language + ' ' + query_text

3432 query = RawTextQuery(full_query, [])

35− query.parse_query()

3633

3734 self.assertEqual(query.getFullQuery(), full_query)

3835 self.assertEqual(len(query.query_parts), 3)

@@ -44,7 +41,6 @@ class TestQuery(SearxTestCase):

4441 query_text = 'the query'

4542 full_query = ':' + language + ' ' + query_text

4643 query = RawTextQuery(full_query, [])

47− query.parse_query()

4844

4945 self.assertEqual(query.getFullQuery(), full_query)

5046 self.assertEqual(len(query.query_parts), 3)

@@ -56,7 +52,6 @@ class TestQuery(SearxTestCase):

5652 query_text = 'the query'

5753 full_query = ':' + language + ' ' + query_text

5854 query = RawTextQuery(full_query, [])

59− query.parse_query()

6055

6156 self.assertEqual(query.getFullQuery(), full_query)

6257 self.assertEqual(len(query.query_parts), 1)

@@ -66,7 +61,6 @@ class TestQuery(SearxTestCase):

6661 def test_timeout_below100(self):

6762 query_text = '<3 the query'

6863 query = RawTextQuery(query_text, [])

69− query.parse_query()

7064

7165 self.assertEqual(query.getFullQuery(), query_text)

7266 self.assertEqual(len(query.query_parts), 3)

@@ -76,7 +70,6 @@ class TestQuery(SearxTestCase):

7670 def test_timeout_above100(self):

7771 query_text = '<350 the query'

7872 query = RawTextQuery(query_text, [])

79− query.parse_query()

8073

8174 self.assertEqual(query.getFullQuery(), query_text)

8275 self.assertEqual(len(query.query_parts), 3)

@@ -86,7 +79,6 @@ class TestQuery(SearxTestCase):

8679 def test_timeout_above1000(self):

8780 query_text = '<3500 the query'

8881 query = RawTextQuery(query_text, [])

89− query.parse_query()

9082

9183 self.assertEqual(query.getFullQuery(), query_text)

9284 self.assertEqual(len(query.query_parts), 3)

@@ -97,7 +89,6 @@ class TestQuery(SearxTestCase):

9789 # invalid number: it is not bang but it is part of the query

9890 query_text = '<xxx the query'

9991 query = RawTextQuery(query_text, [])

100− query.parse_query()

10192

10293 self.assertEqual(query.getFullQuery(), query_text)

10394 self.assertEqual(len(query.query_parts), 1)