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 2016-02-19 15:13:01 +01:00
parent db72fc6449
commit 17b0c9f74a
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
searx/engines/__init__.py
View File

@ -34,6 +34,13 @@ engines = {}
categories = {'general': []} categories = {'general': []}
engine_shortcuts = {} engine_shortcuts = {}
engine_default_args = {'paging': False,
'categories': ['general'],
'language_support': True,
'safesearch': False,
'timeout': settings['outgoing']['request_timeout'],
'shortcut': '-',
'disabled': False}
def load_module(filename): def load_module(filename):
@ -62,26 +69,9 @@ def load_engine(engine_data):
continue continue
setattr(engine, param_name, engine_data[param_name]) setattr(engine, param_name, engine_data[param_name])
if not hasattr(engine, 'paging'): for arg_name, arg_value in engine_default_args.iteritems():
engine.paging = False if not hasattr(engine, arg_name):
setattr(engine, arg_name, arg_value)
if not hasattr(engine, 'categories'):
engine.categories = ['general']
if not hasattr(engine, 'language_support'):
engine.language_support = True
if not hasattr(engine, 'safesearch'):
engine.safesearch = False
if not hasattr(engine, 'timeout'):
engine.timeout = settings['outgoing']['request_timeout']
if not hasattr(engine, 'shortcut'):
engine.shortcut = ''
if not hasattr(engine, 'disabled'):
engine.disabled = False
# checking required variables # checking required variables
for engine_attr in dir(engine): for engine_attr in dir(engine):
@ -100,18 +90,15 @@ def load_engine(engine_data):
'errors': 0 'errors': 0
} }
if hasattr(engine, 'categories'):
for category_name in engine.categories: for category_name in engine.categories:
categories.setdefault(category_name, []).append(engine) categories.setdefault(category_name, []).append(engine)
else:
categories['general'].append(engine)
if engine.shortcut:
if engine.shortcut in engine_shortcuts: if engine.shortcut in engine_shortcuts:
logger.error('Engine config error: ambigious shortcut: {0}' logger.error('Engine config error: ambigious shortcut: {0}'.format(engine.shortcut))
.format(engine.shortcut))
sys.exit(1) sys.exit(1)
engine_shortcuts[engine.shortcut] = engine.name engine_shortcuts[engine.shortcut] = engine.name
return engine return engine