Refactor

Use only one engine for the four search from Qwant

4 files changed, 176 insertions, 422 deletions

diff --git a/searx/tests/engines/test_qwant.py b/searx/tests/engines/test_qwant.py
index 9aa1c7c56..6da4745b1 100644
--- a/searx/tests/engines/test_qwant.py
+++ b/searx/tests/engines/test_qwant.py
@@ -68,6 +68,7 @@ class TestQwantEngine(SearxTestCase):
         }
         """
         response = mock.Mock(text=json)
+        qwant.search_url_keyword = 'web'
         results = qwant.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
@@ -85,6 +86,181 @@ class TestQwantEngine(SearxTestCase):
               "offset": 10
             },
             "result": {
+              "items": [
+                {
+                  "title": "Title",
+                  "score": 9999,
+                  "url": "http://www.url.xyz",
+                  "source": "...",
+                  "media": "http://image.jpg",
+                  "desc": "",
+                  "thumbnail": "http://thumbnail.jpg",
+                  "date": "",
+                  "_id": "db0aadd62c2a8565567ffc382f5c61fa",
+                  "favicon": "https://s.qwant.com/fav.ico"
+                }
+              ],
+              "filters": []
+            },
+            "cache": {
+              "key": "e66aa864c00147a0e3a16ff7a5efafde",
+              "created": 1433092754,
+              "expiration": 259200,
+              "status": "miss",
+              "age": 0
+            }
+          }
+        }
+        """
+        response = mock.Mock(text=json)
+        qwant.search_url_keyword = 'images'
+        results = qwant.response(response)
+        self.assertEqual(type(results), list)
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0]['title'], 'Title')
+        self.assertEqual(results[0]['url'], 'http://www.url.xyz')
+        self.assertEqual(results[0]['content'], '')
+        self.assertEqual(results[0]['thumbnail_src'], 'http://thumbnail.jpg')
+        self.assertEqual(results[0]['img_src'], 'http://image.jpg')
+
+        json = """
+        {
+          "status": "success",
+          "data": {
+            "query": {
+              "locale": "en_us",
+              "query": "Test",
+              "offset": 10
+            },
+            "result": {
+              "items": [
+                {
+                  "title": "Title",
+                  "score": 9999,
+                  "url": "http://www.url.xyz",
+                  "source": "...",
+                  "desc": "Description",
+                  "date": 1433260920,
+                  "_id": "db0aadd62c2a8565567ffc382f5c61fa",
+                  "favicon": "https://s.qwant.com/fav.ico"
+                }
+              ],
+              "filters": []
+            },
+            "cache": {
+              "key": "e66aa864c00147a0e3a16ff7a5efafde",
+              "created": 1433092754,
+              "expiration": 259200,
+              "status": "miss",
+              "age": 0
+            }
+          }
+        }
+        """
+        response = mock.Mock(text=json)
+        qwant.search_url_keyword = 'news'
+        results = qwant.response(response)
+        self.assertEqual(type(results), list)
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0]['title'], 'Title')
+        self.assertEqual(results[0]['url'], 'http://www.url.xyz')
+        self.assertEqual(results[0]['content'], 'Description')
+        self.assertIn('publishedDate', results[0])
+
+        json = """
+        {
+          "status": "success",
+          "data": {
+            "query": {
+              "locale": "en_us",
+              "query": "Test",
+              "offset": 10
+            },
+            "result": {
+              "items": [
+                {
+                  "title": "Title",
+                  "score": 9999,
+                  "url": "http://www.url.xyz",
+                  "source": "...",
+                  "desc": "Description",
+                  "date": 1433260920,
+                  "_id": "db0aadd62c2a8565567ffc382f5c61fa",
+                  "favicon": "https://s.qwant.com/fav.ico"
+                }
+              ],
+              "filters": []
+            },
+            "cache": {
+              "key": "e66aa864c00147a0e3a16ff7a5efafde",
+              "created": 1433092754,
+              "expiration": 259200,
+              "status": "miss",
+              "age": 0
+            }
+          }
+        }
+        """
+        response = mock.Mock(text=json)
+        qwant.search_url_keyword = 'social'
+        results = qwant.response(response)
+        self.assertEqual(type(results), list)
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0]['title'], 'Title')
+        self.assertEqual(results[0]['url'], 'http://www.url.xyz')
+        self.assertEqual(results[0]['content'], 'Description')
+        self.assertIn('publishedDate', results[0])
+
+        json = """
+        {
+          "status": "success",
+          "data": {
+            "query": {
+              "locale": "en_us",
+              "query": "Test",
+              "offset": 10
+            },
+            "result": {
+              "items": [
+                {
+                  "title": "Title",
+                  "score": 9999,
+                  "url": "http://www.url.xyz",
+                  "source": "...",
+                  "desc": "Description",
+                  "date": 1433260920,
+                  "_id": "db0aadd62c2a8565567ffc382f5c61fa",
+                  "favicon": "https://s.qwant.com/fav.ico"
+                }
+              ],
+              "filters": []
+            },
+            "cache": {
+              "key": "e66aa864c00147a0e3a16ff7a5efafde",
+              "created": 1433092754,
+              "expiration": 259200,
+              "status": "miss",
+              "age": 0
+            }
+          }
+        }
+        """
+        response = mock.Mock(text=json)
+        qwant.search_url_keyword = ''
+        results = qwant.response(response)
+        self.assertEqual(type(results), list)
+        self.assertEqual(len(results), 0)
+
+        json = """
+        {
+          "status": "success",
+          "data": {
+            "query": {
+              "locale": "en_us",
+              "query": "Test",
+              "offset": 10
+            },
+            "result": {
               "filters": []
             },
             "cache": {
diff --git a/searx/tests/engines/test_qwant_images.py b/searx/tests/engines/test_qwant_images.py
deleted file mode 100644
index bf89f1b01..000000000
--- a/searx/tests/engines/test_qwant_images.py
+++ /dev/null
@@ -1,145 +0,0 @@
-from collections import defaultdict
-import mock
-from searx.engines import qwant_images
-from searx.testing import SearxTestCase
-
-
-class TestQwantImagesEngine(SearxTestCase):
-
-    def test_request(self):
-        query = 'test_query'
-        dicto = defaultdict(dict)
-        dicto['pageno'] = 0
-        dicto['language'] = 'fr_FR'
-        params = qwant_images.request(query, dicto)
-        self.assertIn('url', params)
-        self.assertIn(query, params['url'])
-        self.assertIn('qwant.com', params['url'])
-        self.assertIn('fr_fr', params['url'])
-
-        dicto['language'] = 'all'
-        params = qwant_images.request(query, dicto)
-        self.assertFalse('fr' in params['url'])
-
-    def test_response(self):
-        self.assertRaises(AttributeError, qwant_images.response, None)
-        self.assertRaises(AttributeError, qwant_images.response, [])
-        self.assertRaises(AttributeError, qwant_images.response, '')
-        self.assertRaises(AttributeError, qwant_images.response, '[]')
-
-        response = mock.Mock(text='{}')
-        self.assertEqual(qwant_images.response(response), [])
-
-        response = mock.Mock(text='{"data": {}}')
-        self.assertEqual(qwant_images.response(response), [])
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "result": {
-              "items": [
-                {
-                  "title": "Title",
-                  "type": "image",
-                  "media": "http://www.url.xyz/fullimage.jpg",
-                  "desc": "",
-                  "thumbnail": "http://www.url.xyz/thumbnail.jpg",
-                  "thumb_width": 365,
-                  "thumb_height": 230,
-                  "width": "365",
-                  "height": "230",
-                  "size": "187.7KB",
-                  "url": "http://www.url.xyz",
-                  "_id": "0ffd93fb26f3e192a6020af8fc16fbb1",
-                  "media_fullsize": "http://www.proxy/fullimage.jpg",
-                  "count": 0
-                }
-              ],
-              "filters": []
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_images.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 1)
-        self.assertEqual(results[0]['title'], 'Title')
-        self.assertEqual(results[0]['url'], 'http://www.url.xyz')
-        self.assertEqual(results[0]['content'], '')
-        self.assertEqual(results[0]['thumbnail_src'], 'http://www.url.xyz/thumbnail.jpg')
-        self.assertEqual(results[0]['img_src'], 'http://www.url.xyz/fullimage.jpg')
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "result": {
-              "filters": []
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_images.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_images.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)
-
-        json = """
-        {
-          "status": "success"
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_images.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)
diff --git a/searx/tests/engines/test_qwant_news.py b/searx/tests/engines/test_qwant_news.py
deleted file mode 100644
index 17cdd3cc1..000000000
--- a/searx/tests/engines/test_qwant_news.py
+++ /dev/null
@@ -1,137 +0,0 @@
-from collections import defaultdict
-import mock
-from searx.engines import qwant_news
-from searx.testing import SearxTestCase
-
-
-class TestQwantNewsEngine(SearxTestCase):
-
-    def test_request(self):
-        query = 'test_query'
-        dicto = defaultdict(dict)
-        dicto['pageno'] = 0
-        dicto['language'] = 'fr_FR'
-        params = qwant_news.request(query, dicto)
-        self.assertIn('url', params)
-        self.assertIn(query, params['url'])
-        self.assertIn('qwant.com', params['url'])
-        self.assertIn('fr_fr', params['url'])
-
-        dicto['language'] = 'all'
-        params = qwant_news.request(query, dicto)
-        self.assertFalse('fr' in params['url'])
-
-    def test_response(self):
-        self.assertRaises(AttributeError, qwant_news.response, None)
-        self.assertRaises(AttributeError, qwant_news.response, [])
-        self.assertRaises(AttributeError, qwant_news.response, '')
-        self.assertRaises(AttributeError, qwant_news.response, '[]')
-
-        response = mock.Mock(text='{}')
-        self.assertEqual(qwant_news.response(response), [])
-
-        response = mock.Mock(text='{"data": {}}')
-        self.assertEqual(qwant_news.response(response), [])
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "result": {
-              "items": [
-                {
-                  "title": "Title",
-                  "score": 9999,
-                  "url": "http://www.url.xyz",
-                  "source": "...",
-                  "desc": "Description",
-                  "date": 1433065411,
-                  "_id": "db0aadd62c2a8565567ffc382f5c61fa",
-                  "favicon": "https://s.qwant.com/fav.ico"
-                }
-              ],
-              "filters": []
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_news.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 1)
-        self.assertEqual(results[0]['title'], 'Title')
-        self.assertEqual(results[0]['url'], 'http://www.url.xyz')
-        self.assertEqual(results[0]['content'], 'Description')
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "result": {
-              "filters": []
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_news.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_news.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)
-
-        json = """
-        {
-          "status": "success"
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_news.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)
diff --git a/searx/tests/engines/test_qwant_social.py b/searx/tests/engines/test_qwant_social.py
deleted file mode 100644
index 6e87e9898..000000000
--- a/searx/tests/engines/test_qwant_social.py
+++ /dev/null
@@ -1,140 +0,0 @@
-from collections import defaultdict
-import mock
-from searx.engines import qwant_social
-from searx.testing import SearxTestCase
-
-
-class TestQwantSocialEngine(SearxTestCase):
-
-    def test_request(self):
-        query = 'test_query'
-        dicto = defaultdict(dict)
-        dicto['pageno'] = 0
-        dicto['language'] = 'fr_FR'
-        params = qwant_social.request(query, dicto)
-        self.assertIn('url', params)
-        self.assertIn(query, params['url'])
-        self.assertIn('qwant.com', params['url'])
-        self.assertIn('fr_fr', params['url'])
-
-        dicto['language'] = 'all'
-        params = qwant_social.request(query, dicto)
-        self.assertFalse('fr' in params['url'])
-
-    def test_response(self):
-        self.assertRaises(AttributeError, qwant_social.response, None)
-        self.assertRaises(AttributeError, qwant_social.response, [])
-        self.assertRaises(AttributeError, qwant_social.response, '')
-        self.assertRaises(AttributeError, qwant_social.response, '[]')
-
-        response = mock.Mock(text='{}')
-        self.assertEqual(qwant_social.response(response), [])
-
-        response = mock.Mock(text='{"data": {}}')
-        self.assertEqual(qwant_social.response(response), [])
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "result": {
-              "items": [
-                {
-                  "_id": "dc0b3f24c93684c7d7f1b0a4c2d9f1b0",
-                  "__index": 32,
-                  "title": "Title",
-                  "img": "img",
-                  "desc": "Description",
-                  "date": 1432643480,
-                  "type": "twitter",
-                  "card": "XXX",
-                  "post": "603176590856556545",
-                  "url": "http://www.url.xyz",
-                  "userUrl": "https://twitter.com/XXX"
-                }
-              ],
-              "filters": []
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_social.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 1)
-        self.assertEqual(results[0]['title'], 'Title')
-        self.assertEqual(results[0]['url'], 'http://www.url.xyz')
-        self.assertEqual(results[0]['content'], 'Description')
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "result": {
-              "filters": []
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_social.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)
-
-        json = """
-        {
-          "status": "success",
-          "data": {
-            "query": {
-              "locale": "en_us",
-              "query": "Test",
-              "offset": 10
-            },
-            "cache": {
-              "key": "e66aa864c00147a0e3a16ff7a5efafde",
-              "created": 1433092754,
-              "expiration": 259200,
-              "status": "miss",
-              "age": 0
-            }
-          }
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_social.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)
-
-        json = """
-        {
-          "status": "success"
-        }
-        """
-        response = mock.Mock(text=json)
-        results = qwant_social.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 0)