summaryrefslogtreecommitdiff
path: root/searx/webapp.py
diff options
context:
space:
mode:
authorLukas van den Berk <38686669+lukasvdberk@users.noreply.github.com>2020-07-03 15:25:04 +0200
committerGitHub <noreply@github.com>2020-07-03 13:25:04 +0000
commit4829a76aae8fa6af8d3f814ff780dc6e792b84e5 (patch)
tree8d6f26653c52a3b3a5a187fea6d9ef5f02133ec1 /searx/webapp.py
parentc21220c6714475cdbf247eba4046ba735d9d402a (diff)
downloadsearxng-4829a76aae8fa6af8d3f814ff780dc6e792b84e5.tar.gz
searxng-4829a76aae8fa6af8d3f814ff780dc6e792b84e5.zip
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
Diffstat (limited to 'searx/webapp.py')
-rwxr-xr-xsearx/webapp.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index e1b6bea1c..5d9614789 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -575,7 +575,9 @@ def index():
search_query, raw_text_query = get_search_query_from_webapp(request.preferences, request.form)
# search = Search(search_query) # without plugins
search = SearchWithPlugins(search_query, request.user_plugins, request)
+
result_container = search.search()
+
except Exception as e:
# log exception
logger.exception('search error')
@@ -592,6 +594,10 @@ def index():
if number_of_results < result_container.results_length():
number_of_results = 0
+ # checkin for a external bang
+ if result_container.redirect_url:
+ return redirect(result_container.redirect_url)
+
# UI
advanced_search = request.form.get('advanced_search', None)
@@ -665,6 +671,7 @@ def index():
cont_disp = 'attachment;Filename=searx_-_{0}.csv'.format(search_query.query.decode('utf-8'))
response.headers.add('Content-Disposition', cont_disp)
return response
+
elif output_format == 'rss':
response_rss = render(
'opensearch_response_rss.xml',