Merge pull request #2189 from dalf/architecture-clean-up

Architecture clean up
This commit is contained in:
Adam Tauber
2020-09-28 14:56:23 +02:00
committed by GitHub
7 changed files with 384 additions and 300 deletions

View File

@@ -30,7 +30,9 @@ import codecs
import searx.query
import searx.search
import searx.engines
import searx.webapdater
import searx.preferences
import searx.webadapter
import argparse
searx.engines.initialize_engines(settings['engines'])
@@ -64,7 +66,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()