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 --- searx/external_bang.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 searx/external_bang.py (limited to 'searx/external_bang.py') diff --git a/searx/external_bang.py b/searx/external_bang.py new file mode 100644 index 000000000..f8b9c44d3 --- /dev/null +++ b/searx/external_bang.py @@ -0,0 +1,43 @@ +import json +from os.path import join + +from searx import searx_dir + +# bangs data coming from the following url convert to json with +# https://raw.githubusercontent.com/jivesearch/jivesearch/master/bangs/bangs.toml +# https://pseitz.github.io/toml-to-json-online-converter/ +# NOTE only use the get_bang_url + +bangs_data = {} +with open(join(searx_dir, 'data/bangs.json')) as json_file: + for bang in json.load(json_file)['bang']: + for trigger in bang["triggers"]: + bangs_data[trigger] = {x: y for x, y in bang.items() if x != "triggers"} + + +def get_bang_url(search_query): + """ + Redirects if the user supplied a correct bang search. + :param search_query: This is a search_query object which contains preferences and the submitted queries. + :return: None if the bang was invalid, else a string of the redirect url. + """ + + if search_query.external_bang: + query = search_query.query.decode('utf-8', 'ignore') + bang = _get_bang(search_query.external_bang) + + if bang and query: + # TODO add region support. + bang_url = bang["regions"]["default"] + + return bang_url.replace("{{{term}}}", query) + return None + + +def _get_bang(user_bang): + """ + Searches if the supplied user bang is available. Returns None if not found. + :param user_bang: The parsed user bang. For example yt + :return: Returns a dict with bangs data (check bangs_data.json for the structure) + """ + return bangs_data.get(user_bang) -- cgit v1.2.3