[mod] add searx/webadapter.py

* move searx.search.get_search_query_from_webapp to searx.webadapter
* move searx.query.SearchQuery to searx.search
This commit is contained in:
Alexandre Flament 2020-09-22 13:59:27 +02:00
parent 21dbc7e852
commit 2dbc0de0cd
6 changed files with 221 additions and 220 deletions

View file

@ -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()