From 4829a76aae8fa6af8d3f814ff780dc6e792b84e5 Mon Sep 17 00:00:00 2001
From: Lukas van den Berk <38686669+lukasvdberk@users.noreply.github.com>
Date: Fri, 3 Jul 2020 15:25:04 +0200
Subject: Created new plugin type custom_results. Added new plugin
 bang_redirect (#2027)

* Made first attempt at the bangs redirects plugin.

* It redirects. But in a messy way via javascript.

* First version with custom plugin

* Added a help page and a operator to see all the bangs available.

* Changed to .format because of support

* Changed to .format because of support

* Removed : in params

* Fixed path to json file and changed bang operator

* Changed bang operator back to &

* Made first attempt at the bangs redirects plugin.

* It redirects. But in a messy way via javascript.

* First version with custom plugin

* Added a help page and a operator to see all the bangs available.

* Changed to .format because of support

* Changed to .format because of support

* Removed : in params

* Fixed path to json file and changed bang operator

* Changed bang operator back to &

* Refactored getting search query. Also changed bang operator to ! and is now working.

* Removed prints

* Removed temporary bangs_redirect.js file. Updated plugin documentation

* Added unit test for the bangs plugin

* Fixed a unit test and added 2 more for bangs plugin

* Changed back to default settings.yml

* Added myself to AUTHORS.rst

* Refacored working of custom plugin.

* Refactored _get_bangs_data from list to dict to improve search speed.

* Decoupled bangs plugin from webserver with redirect_url

* Refactored bangs unit tests

* Fixed unit test bangs. Removed dubbel parsing in bangs.py

* Removed a dumb print statement

* Refactored bangs plugin to core engine.

* Removed bangs plugin.

* Refactored external bangs unit tests from plugin to core.

* Removed custom_results/bangs documentation from plugins.rst

* Added newline in settings.yml so the PR stays clean.

* Changed searx/plugins/__init__.py back to the old file

* Removed newline search.py

* Refactored get_external_bang_operator from utils to external_bang.py

* Removed unnecessary import form test_plugins.py

* Removed _parseExternalBang and _isExternalBang from query.py

* Removed get_external_bang_operator since it was not necessary

* Simplified external_bang.py

* Simplified external_bang.py

* Moved external_bangs unit tests to test_webapp.py. Fixed return in search with external_bang

* Refactored query parsing to unicode to support python2

* Refactored query parsing to unicode to support python2

* Refactored bangs plugin to core engine.

* Refactored search parameter to search_query in external_bang.py
---
 tests/unit/test_search.py | 21 +++++++++++++++++++++
 tests/unit/test_webapp.py |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'tests/unit')

diff --git a/tests/unit/test_search.py b/tests/unit/test_search.py
index 18c221954..ca9fe862a 100644
--- a/tests/unit/test_search.py
+++ b/tests/unit/test_search.py
@@ -110,3 +110,24 @@ class SearchTestCase(SearxTestCase):
         search = searx.search.Search(search_query)
         results = search.search()
         self.assertEquals(results.results_length(), 1)
+
+    def test_external_bang(self):
+        search_query = searx.query.SearchQuery('yes yes',
+                                               [{'category': 'general', 'name': PUBLIC_ENGINE_NAME}],
+                                               ['general'], 'en-US', SAFESEARCH, PAGENO, None, None,
+                                               preferences=Preferences(['oscar'], ['general'], engines, [],),
+                                               external_bang="yt")
+        search = searx.search.Search(search_query)
+        results = search.search()
+        # For checking if the user redirected with the youtube external bang
+        self.assertTrue(results.redirect_url is not None)
+
+        search_query = searx.query.SearchQuery('youtube never gonna give you up',
+                                               [{'category': 'general', 'name': PUBLIC_ENGINE_NAME}],
+                                               ['general'], 'en-US', SAFESEARCH, PAGENO, None, None,
+                                               preferences=Preferences(['oscar'], ['general'], engines, []),)
+
+        search = searx.search.Search(search_query)
+        results = search.search()
+        # This should not redirect
+        self.assertTrue(results.redirect_url is None)
diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py
index f15e3c92c..8eed607e3 100644
--- a/tests/unit/test_webapp.py
+++ b/tests/unit/test_webapp.py
@@ -56,7 +56,8 @@ class ViewsTestCase(SearxTestCase):
                                                 results=test_results,
                                                 results_number=lambda: 3,
                                                 results_length=lambda: len(test_results),
-                                                get_timings=lambda: timings)
+                                                get_timings=lambda: timings,
+                                                redirect_url=None)
 
         self.setattr4test(Search, 'search', search_mock)
 
-- 
cgit v1.2.3