2aef38c · searx · git.iko.soy

git.iko.soy/searx

[fix] resolve query_parts regression

commit2aef38c3b9d1fe93e9d665a49b10151d63d92392 authorAdam Tauber <asciimoo@gmail.com> dateMon 26 Oct 2020, 13:33 (6 years ago) parent0a44fa8

2 files changed+15−14

compare with master

unifiedsplit

searx/query.py+4−5 tests/unit/test_query.py+11−9

searx/query.py+4−5

@@ -59,8 +59,6 @@ class RawTextQuery:

5959 # part does only contain spaces, skip

6060 if query_part.isspace()\

6161 or query_part == '':

62− searx_query_part = True

63− self.query_parts.append(query_part)

6462 continue

6563

6664 # this force the timeout

@@ -147,8 +145,9 @@ class RawTextQuery:

147145 self.specific = True

148146

149147 # append query part to query_part list

150− self.query_parts.append(query_part)

151− if not searx_query_part:

148+ if searx_query_part:

149+ self.query_parts.append(query_part)

150+ else:

152151 self.user_query_parts.append(query_part)

153152

154153 def changeQuery(self, query):

@@ -160,4 +159,4 @@ class RawTextQuery:

160159

161160 def getFullQuery(self):

162161 # get full querry including whitespaces

163− return ''.join(self.query_parts)

162+ return '{0} {1}'.format(''.join(self.query_parts), self.getQuery()).strip()

tests/unit/test_query.py+11−9

@@ -9,7 +9,8 @@ class TestQuery(SearxTestCase):

99 query = RawTextQuery(query_text, [])

1010

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

12− self.assertEqual(len(query.query_parts), 3)

12+ self.assertEqual(len(query.query_parts), 0)

13+ self.assertEqual(len(query.user_query_parts), 2)

1314 self.assertEqual(len(query.languages), 0)

1415 self.assertFalse(query.specific)

1516

@@ -20,7 +21,7 @@ class TestQuery(SearxTestCase):

2021 query = RawTextQuery(full_query, [])

2122

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

23− self.assertEqual(len(query.query_parts), 5)

24+ self.assertEqual(len(query.query_parts), 1)

2425 self.assertEqual(len(query.languages), 1)

2526 self.assertIn(language, query.languages)

2627 self.assertFalse(query.specific)

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

3233 query = RawTextQuery(full_query, [])

3334

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

35− self.assertEqual(len(query.query_parts), 5)

36+ self.assertEqual(len(query.query_parts), 1)

3637 self.assertIn('en', query.languages)

3738 self.assertFalse(query.specific)

3839

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

4344 query = RawTextQuery(full_query, [])

4445

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

46− self.assertEqual(len(query.query_parts), 5)

47+ self.assertEqual(len(query.query_parts), 1)

4748 self.assertIn('all', query.languages)

4849 self.assertFalse(query.specific)

4950

@@ -54,7 +55,7 @@ class TestQuery(SearxTestCase):

5455 query = RawTextQuery(full_query, [])

5556

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

57− self.assertEqual(len(query.query_parts), 5)

58+ self.assertEqual(len(query.query_parts), 0)

5859 self.assertEqual(len(query.languages), 0)

5960 self.assertFalse(query.specific)

6061

@@ -63,7 +64,7 @@ class TestQuery(SearxTestCase):

6364 query = RawTextQuery(query_text, [])

6465

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

66− self.assertEqual(len(query.query_parts), 5)

67+ self.assertEqual(len(query.query_parts), 1)

6768 self.assertEqual(query.timeout_limit, 3)

6869 self.assertFalse(query.specific)

6970

@@ -72,7 +73,7 @@ class TestQuery(SearxTestCase):

7273 query = RawTextQuery(query_text, [])

7374

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

75− self.assertEqual(len(query.query_parts), 5)

76+ self.assertEqual(len(query.query_parts), 1)

7677 self.assertEqual(query.timeout_limit, 0.35)

7778 self.assertFalse(query.specific)

7879

@@ -81,7 +82,7 @@ class TestQuery(SearxTestCase):

8182 query = RawTextQuery(query_text, [])

8283

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

84− self.assertEqual(len(query.query_parts), 5)

85+ self.assertEqual(len(query.query_parts), 1)

8586 self.assertEqual(query.timeout_limit, 3.5)

8687 self.assertFalse(query.specific)

8788

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

9192 query = RawTextQuery(query_text, [])

9293

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

94− self.assertEqual(len(query.query_parts), 5)

95+ self.assertEqual(len(query.query_parts), 0)

96+ self.assertEqual(query.getQuery(), query_text)

9597 self.assertEqual(query.timeout_limit, None)

9698 self.assertFalse(query.specific)