summaryrefslogtreecommitdiff
path: root/searx/search.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/search.py
parentc21220c6714475cdbf247eba4046ba735d9d402a (diff)
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/search.py')
-rw-r--r--searx/search.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/searx/search.py b/searx/search.py
index 661add7ca..24695083c 100644
--- a/searx/search.py
+++ b/searx/search.py
@@ -20,6 +20,8 @@ import sys
import threading
from time import time
from uuid import uuid4
+
+import six
from flask_babel import gettext
import requests.exceptions
import searx.poolrequests as requests_lib
@@ -27,6 +29,7 @@ from searx.engines import (
categories, engines, settings
)
from searx.answerers import ask
+from searx.external_bang import get_bang_url
from searx.utils import gen_useragent
from searx.query import RawTextQuery, SearchQuery, VALID_LANGUAGE_CODE
from searx.results import ResultContainer
@@ -54,6 +57,7 @@ else:
else:
logger.critical('outgoing.max_request_timeout if defined has to be float')
from sys import exit
+
exit(1)
@@ -397,15 +401,16 @@ def get_search_query_from_webapp(preferences, form):
if (engine.name, categ) not in disabled_engines)
query_engines = deduplicate_query_engines(query_engines)
+ external_bang = raw_text_query.external_bang
return (SearchQuery(query, query_engines, query_categories,
query_lang, query_safesearch, query_pageno,
- query_time_range, query_timeout, preferences),
+ query_time_range, query_timeout, preferences,
+ external_bang=external_bang),
raw_text_query)
class Search(object):
-
"""Search information container"""
def __init__(self, search_query):
@@ -419,6 +424,14 @@ class Search(object):
def search(self):
global number_of_searches
+ # Check if there is a external bang. After that we can stop because the search will terminate.
+ if self.search_query.external_bang:
+ self.result_container.redirect_url = get_bang_url(self.search_query)
+
+ # This means there was a valid bang and the
+ # rest of the search does not need to be continued
+ if isinstance(self.result_container.redirect_url, six.string_types):
+ return self.result_container
# start time
start_time = time()
@@ -521,7 +534,6 @@ class Search(object):
class SearchWithPlugins(Search):
-
"""Similar to the Search class but call the plugins."""
def __init__(self, search_query, ordered_plugin_list, request):