From 754ff97a59963ddbbda5af4361e19aeda1a4dcec Mon Sep 17 00:00:00 2001 From: Nicolas Gelot Date: Mon, 1 Apr 2019 23:53:35 +0200 Subject: [PATCH] Create a dedicated handler about plugins hooks in Search class --- searx/search.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/searx/search.py b/searx/search.py index 49cb9116..814776e6 100644 --- a/searx/search.py +++ b/searx/search.py @@ -200,14 +200,9 @@ def search(request, host): name='save_search_' + str(searchData) ).start() - ordered_plugin = request.user_plugins - plugins.call(ordered_plugin, 'post_search', request, searchData) - - for result in searchData.results: - plugins.call(ordered_plugin, 'on_result', request, searchData, result) + search.search_with_plugins(request, searchData) return searchData - class Search(object): """Search information container""" @@ -292,6 +287,13 @@ class Search(object): # return results, suggestions, answers and infoboxes return result_container + def search_with_plugins(self, request, searchData): + ordered_plugin = request.user_plugins + plugins.call(ordered_plugin, 'post_search', request, searchData) + + for result in searchData.results: + plugins.call(ordered_plugin, 'on_result', request, searchData, result) + def get_search_query_from_webapp(self, preferences, form): # no text for the query ? if not form.get('q'): -- 2.26.2