ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[mod] engine load refactor

This commit is contained in:
Adam Tauber 2014-12-13 19:26:40 +01:00
parent f13a6ab795
commit 2cfa760b57
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
searx/engines/__init__.py
View File

@ -41,11 +41,8 @@ def load_module(filename):
module.name = modname module.name = modname
return module return module
if 'engines' not in settings or not settings['engines']:
print '[E] Error no engines found. Edit your settings.yml'
exit(2)
for engine_data in settings['engines']: def load_engine(engine_data):
engine_name = engine_data['engine'] engine_name = engine_data['engine']
engine = load_module(engine_name + '.py') engine = load_module(engine_name + '.py')
@ -87,7 +84,6 @@ for engine_data in settings['engines']:
print '[E] Engine config error: Missing attribute "{0}.{1}"'.format(engine.name, engine_attr) # noqa print '[E] Engine config error: Missing attribute "{0}.{1}"'.format(engine.name, engine_attr) # noqa
sys.exit(1) sys.exit(1)
engines[engine.name] = engine
engine.stats = { engine.stats = {
'result_count': 0, 'result_count': 0,
'search_count': 0, 'search_count': 0,
@ -105,6 +101,7 @@ for engine_data in settings['engines']:
if engine.shortcut: if engine.shortcut:
# TODO check duplications # TODO check duplications
engine_shortcuts[engine.shortcut] = engine.name engine_shortcuts[engine.shortcut] = engine.name
return engine
def get_engines_stats(): def get_engines_stats():
@ -194,3 +191,12 @@ def get_engines_stats():
sorted(errors, key=itemgetter('avg'), reverse=True) sorted(errors, key=itemgetter('avg'), reverse=True)
), ),
] ]
if 'engines' not in settings or not settings['engines']:
print '[E] Error no engines found. Edit your settings.yml'
exit(2)
for engine_data in settings['engines']:
engine = load_engine(engine_data)
engines[engine.name] = engine