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 --- utils/standalone_searx.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/standalone_searx.py b/utils/standalone_searx.py index d43b474d7..2ca3fea56 100755 --- a/utils/standalone_searx.py +++ b/utils/standalone_searx.py @@ -31,6 +31,7 @@ import searx.query import searx.search import searx.engines import searx.preferences +import searx.webadapter import argparse searx.engines.initialize_engines(settings['engines']) @@ -64,7 +65,7 @@ form = { preferences = searx.preferences.Preferences(['oscar'], searx.engines.categories.keys(), searx.engines.engines, []) preferences.key_value_settings['safesearch'].parse(args.safesearch) -search_query, raw_text_query = searx.search.get_search_query_from_webapp(preferences, form) +search_query, raw_text_query = searx.webadapter.get_search_query_from_webapp(preferences, form) search = searx.search.Search(search_query) result_container = search.search() -- 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 --- utils/standalone_searx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/standalone_searx.py b/utils/standalone_searx.py index 2ca3fea56..d969c398d 100755 --- a/utils/standalone_searx.py +++ b/utils/standalone_searx.py @@ -65,7 +65,7 @@ form = { preferences = searx.preferences.Preferences(['oscar'], searx.engines.categories.keys(), searx.engines.engines, []) preferences.key_value_settings['safesearch'].parse(args.safesearch) -search_query, raw_text_query = searx.webadapter.get_search_query_from_webapp(preferences, form) +search_query, raw_text_query, _, _ = searx.webadapter.get_search_query_from_webapp(preferences, form) search = searx.search.Search(search_query) result_container = search.search() -- cgit v1.2.3 From 485a502b886bc7fb8a806ffc576b0eec99990a5c Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Thu, 10 Sep 2020 18:08:14 +0200 Subject: [mod] add typing and __slots__ --- utils/standalone_searx.py | 1 + 1 file changed, 1 insertion(+) (limited to 'utils') diff --git a/utils/standalone_searx.py b/utils/standalone_searx.py index d969c398d..3aab7a6cc 100755 --- a/utils/standalone_searx.py +++ b/utils/standalone_searx.py @@ -30,6 +30,7 @@ import codecs import searx.query import searx.search import searx.engines +import searx.webapdater import searx.preferences import searx.webadapter import argparse -- cgit v1.2.3