git.iko.soy/searx
on master help sign in
[enh] explicit engine init
commita605377c40e5f9d5ce80a222df65b605dfcd3907 authorAdam Tauber <asciimoo@gmail.com> dateTue 27 Dec 2016, 17:25 (10 years ago) parent14f58bd
2 files changed+8−9
compare with master
unifiedsplit
searx/engines/__init__.py+6−8 searx/webapp.py+2−1
searx/engines/__init__.py+6−8
@@ -32,7 +32,6 @@ engine_dir = dirname(realpath(__file__))
3232engines = {}
3333
3434categories = {'general': []}
35−_initialized = False
3635
3736engine_shortcuts = {}
3837engine_default_args = {'paging': False,
@@ -202,11 +201,10 @@ def get_engines_stats():
202201 ]
203202
204203
205−if 'engines' not in settings or not settings['engines']:
206− logger.error('No engines found. Edit your settings.yml')
207− exit(2)
208−
209−for engine_data in settings['engines']:
210− engine = load_engine(engine_data)
211− if engine is not None:
204+def initialize_engines(engine_list):
205+ global categories, engines
206+ engines = {}
207+ categories = {'general': []}
208+ for engine_data in engine_list:
209+ engine = load_engine(engine_data)
212210 engines[engine.name] = engine
searx/webapp.py+2−1
@@ -53,7 +53,7 @@ from flask_babel import Babel, gettext, format_date, format_decimal
5353from flask.json import jsonify
5454from searx import settings, searx_dir, searx_debug
5555from searx.engines import (
56− categories, engines, get_engines_stats, engine_shortcuts
56+ categories, engines, engine_shortcuts, get_engines_stats, initialize_engines
5757)
5858from searx.utils import (
5959 UnicodeWriter, highlight_content, html_to_text, get_themes,
@@ -765,6 +765,7 @@ def page_not_found(e):
765765
766766
767767def run():
768+ initialize_engines(settings['engines'])
768769 app.run(
769770 debug=searx_debug,
770771 use_debugger=searx_debug,