[fix] resolve query_parts regression

quicysver · Oct 26, 2020 · 2aef38c · 2aef38c
1 parent 0a44fa8
commit 2aef38c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/searx/query.py b/searx/query.py
@@ -59,8 +59,6 @@ def _parse_query(self):
             # part does only contain spaces, skip
             if query_part.isspace()\
                or query_part == '':
-                searx_query_part = True
-                self.query_parts.append(query_part)
                 continue
 
             # this force the timeout
@@ -147,8 +145,9 @@ def _parse_query(self):
                 self.specific = True
 
             # append query part to query_part list
-            self.query_parts.append(query_part)
-            if not searx_query_part:
+            if searx_query_part:
+                self.query_parts.append(query_part)
+            else:
                 self.user_query_parts.append(query_part)
 
     def changeQuery(self, query):
@@ -160,4 +159,4 @@ def getQuery(self):
 
     def getFullQuery(self):
         # get full querry including whitespaces
-        return ''.join(self.query_parts)
+        return '{0} {1}'.format(''.join(self.query_parts), self.getQuery()).strip()
diff --git a/tests/unit/test_query.py b/tests/unit/test_query.py
@@ -9,7 +9,8 @@ def test_simple_query(self):
         query = RawTextQuery(query_text, [])
 
         self.assertEqual(query.getFullQuery(), query_text)
-        self.assertEqual(len(query.query_parts), 3)
+        self.assertEqual(len(query.query_parts), 0)
+        self.assertEqual(len(query.user_query_parts), 2)
         self.assertEqual(len(query.languages), 0)
         self.assertFalse(query.specific)
 
@@ -20,7 +21,7 @@ def test_language_code(self):
         query = RawTextQuery(full_query, [])
 
         self.assertEqual(query.getFullQuery(), full_query)
-        self.assertEqual(len(query.query_parts), 5)
+        self.assertEqual(len(query.query_parts), 1)
         self.assertEqual(len(query.languages), 1)
         self.assertIn(language, query.languages)
         self.assertFalse(query.specific)
@@ -32,7 +33,7 @@ def test_language_name(self):
         query = RawTextQuery(full_query, [])
 
         self.assertEqual(query.getFullQuery(), full_query)
-        self.assertEqual(len(query.query_parts), 5)
+        self.assertEqual(len(query.query_parts), 1)
         self.assertIn('en', query.languages)
         self.assertFalse(query.specific)
 
@@ -43,7 +44,7 @@ def test_unlisted_language_code(self):
         query = RawTextQuery(full_query, [])
 
         self.assertEqual(query.getFullQuery(), full_query)
-        self.assertEqual(len(query.query_parts), 5)
+        self.assertEqual(len(query.query_parts), 1)
         self.assertIn('all', query.languages)
         self.assertFalse(query.specific)
 
@@ -54,7 +55,7 @@ def test_invalid_language_code(self):
         query = RawTextQuery(full_query, [])
 
         self.assertEqual(query.getFullQuery(), full_query)
-        self.assertEqual(len(query.query_parts), 5)
+        self.assertEqual(len(query.query_parts), 0)
         self.assertEqual(len(query.languages), 0)
         self.assertFalse(query.specific)
 
@@ -63,7 +64,7 @@ def test_timeout_below100(self):
         query = RawTextQuery(query_text, [])
 
         self.assertEqual(query.getFullQuery(), query_text)
-        self.assertEqual(len(query.query_parts), 5)
+        self.assertEqual(len(query.query_parts), 1)
         self.assertEqual(query.timeout_limit, 3)
         self.assertFalse(query.specific)
 
@@ -72,7 +73,7 @@ def test_timeout_above100(self):
         query = RawTextQuery(query_text, [])
 
         self.assertEqual(query.getFullQuery(), query_text)
-        self.assertEqual(len(query.query_parts), 5)
+        self.assertEqual(len(query.query_parts), 1)
         self.assertEqual(query.timeout_limit, 0.35)
         self.assertFalse(query.specific)
 
@@ -81,7 +82,7 @@ def test_timeout_above1000(self):
         query = RawTextQuery(query_text, [])
 
         self.assertEqual(query.getFullQuery(), query_text)
-        self.assertEqual(len(query.query_parts), 5)
+        self.assertEqual(len(query.query_parts), 1)
         self.assertEqual(query.timeout_limit, 3.5)
         self.assertFalse(query.specific)
 
@@ -91,6 +92,7 @@ def test_timeout_invalid(self):
         query = RawTextQuery(query_text, [])
 
         self.assertEqual(query.getFullQuery(), query_text)
-        self.assertEqual(len(query.query_parts), 5)
+        self.assertEqual(len(query.query_parts), 0)
+        self.assertEqual(query.getQuery(), query_text)
         self.assertEqual(query.timeout_limit, None)
         self.assertFalse(query.specific)