[mod] split searx.search into different processors

see searx.search.processors.abstract.EngineProcessor

First the method searx call the get_params method.

If the return value is not None, then the searx call the method search.
This commit is contained in:
Alexandre Flament 2020-12-16 13:41:32 +01:00
parent c0cc01e936
commit 7ec8bc3ea7
16 changed files with 476 additions and 316 deletions

View file

@ -3,7 +3,6 @@
from searx.testing import SearxTestCase
from searx.search import SearchQuery, EngineRef
import searx.search
import searx.engines
SAFESEARCH = 0
@ -39,7 +38,7 @@ class SearchTestCase(SearxTestCase):
@classmethod
def setUpClass(cls):
searx.engines.initialize_engines(TEST_ENGINES)
searx.search.initialize(TEST_ENGINES)
def test_timeout_simple(self):
searx.search.max_request_timeout = None

View file

@ -8,8 +8,7 @@ import sys
from mock import Mock, patch
from nose2.tools import params
from searx.search import SearchQuery, EngineRef
from searx.engines import initialize_engines
from searx.search import SearchQuery, EngineRef, initialize
from searx.testing import SearxTestCase
@ -30,7 +29,7 @@ class StandaloneSearx(SearxTestCase):
def setUpClass(cls):
engine_list = [{'engine': 'dummy', 'name': 'engine1', 'shortcut': 'e1'}]
initialize_engines(engine_list)
initialize(engine_list)
def test_parse_argument_no_args(self):
"""Test parse argument without args."""

View file

@ -17,7 +17,7 @@ TEST_ENGINES = [
'categories': 'general',
'shortcut': 'do',
'timeout': 3.0,
'offline': True,
'engine_type': 'offline',
'tokens': ['my-token'],
},
]
@ -28,7 +28,7 @@ class ValidateQueryCase(SearxTestCase):
@classmethod
def setUpClass(cls):
searx.engines.initialize_engines(TEST_ENGINES)
searx.search.initialize(TEST_ENGINES)
def test_query_private_engine_without_token(self):
preferences = Preferences(['oscar'], ['general'], engines, [])