From 2dbc0de0cd000459ebfdb3d015be8684e737e95c Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Tue, 22 Sep 2020 13:59:27 +0200 Subject: [mod] add searx/webadapter.py * move searx.search.get_search_query_from_webapp to searx.webadapter * move searx.query.SearchQuery to searx.search --- searx/webapp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index bba37cce1..ad9372915 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -67,10 +67,11 @@ from searx.webutils import ( get_static_files, get_result_templates, get_themes, prettify_url, new_hmac ) +from searx.webadapter import get_search_query_from_webapp from searx.utils import html_to_text, gen_useragent, dict_subset, match_language from searx.version import VERSION_STRING from searx.languages import language_codes as languages -from searx.search import SearchWithPlugins, get_search_query_from_webapp +from searx.search import SearchWithPlugins from searx.query import RawTextQuery from searx.autocomplete import searx_bang, backends as autocomplete_backends from searx.plugins import plugins -- cgit v1.2.3 From 691d12726be1411d8c80895e927293bdcc3e9572 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Tue, 22 Sep 2020 16:55:59 +0200 Subject: [mod] check the engine tokens in searx/webadapter.py instead of searx/search.py --- searx/webapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index ad9372915..2a763292d 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -562,7 +562,7 @@ def index(): raw_text_query = None result_container = None try: - search_query, raw_text_query = get_search_query_from_webapp(request.preferences, request.form) + 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) -- cgit v1.2.3 From 678699beaf97184a9059b0c6514b1a51c7e6dfd0 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Tue, 22 Sep 2020 18:03:42 +0200 Subject: [mod] searx/webadapter.py: add get_selected_categories share common code with get_search_query_from_webapp Update searx/webapp.py to use get_selected_categories Close #2142 --- searx/webapp.py | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 2a763292d..119f9f3b7 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -67,7 +67,7 @@ from searx.webutils import ( get_static_files, get_result_templates, get_themes, prettify_url, new_hmac ) -from searx.webadapter import get_search_query_from_webapp +from searx.webadapter import get_search_query_from_webapp, get_selected_categories from searx.utils import html_to_text, gen_useragent, dict_subset, match_language from searx.version import VERSION_STRING from searx.languages import language_codes as languages @@ -355,25 +355,6 @@ def render(template_name, override_theme=None, **kwargs): _get_ordered_categories() if x in enabled_categories] - if 'all_categories' not in kwargs: - kwargs['all_categories'] = _get_ordered_categories() - - if 'selected_categories' not in kwargs: - kwargs['selected_categories'] = [] - for arg in request.args: - if arg.startswith('category_'): - c = arg.split('_', 1)[1] - if c in categories: - kwargs['selected_categories'].append(c) - - if not kwargs['selected_categories']: - cookie_categories = request.preferences.get_value('categories') - for ccateg in cookie_categories: - kwargs['selected_categories'].append(ccateg) - - if not kwargs['selected_categories']: - kwargs['selected_categories'] = ['general'] - if 'autocomplete' not in kwargs: kwargs['autocomplete'] = request.preferences.get_value('autocomplete') @@ -532,6 +513,7 @@ def index_error(output_format, error_message): request.errors.append(gettext('search error')) return render( 'index.html', + selected_categories=get_selected_categories(request.form, request.preferences), ) @@ -553,6 +535,7 @@ def index(): if output_format == 'html': return render( 'index.html', + selected_categories=get_selected_categories(request.form, request.preferences), ) else: return index_error(output_format, 'No query'), 400 @@ -833,6 +816,8 @@ def preferences(): # end of stats return render('preferences.html', + selected_categories=get_selected_categories(request.form, request.preferences), + all_categories=_get_ordered_categories(), locales=settings['locales'], current_locale=request.preferences.get_value("locale"), image_proxy=image_proxy, -- cgit v1.2.3 From f2f3300bde0cc304f80809ff766fc557b5486098 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Thu, 24 Sep 2020 16:26:00 +0200 Subject: [mod] more typing --- searx/webapp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 119f9f3b7..f3bbbc2b8 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -513,7 +513,7 @@ def index_error(output_format, error_message): request.errors.append(gettext('search error')) return render( 'index.html', - selected_categories=get_selected_categories(request.form, request.preferences), + selected_categories=get_selected_categories(request.preferences, request.form), ) @@ -535,7 +535,7 @@ def index(): if output_format == 'html': return render( 'index.html', - selected_categories=get_selected_categories(request.form, request.preferences), + selected_categories=get_selected_categories(request.preferences, request.form), ) else: return index_error(output_format, 'No query'), 400 @@ -816,7 +816,7 @@ def preferences(): # end of stats return render('preferences.html', - selected_categories=get_selected_categories(request.form, request.preferences), + selected_categories=get_selected_categories(request.preferences, request.form), all_categories=_get_ordered_categories(), locales=settings['locales'], current_locale=request.preferences.get_value("locale"), -- cgit v1.2.3