logo

searx

My custom branche(s) on searx, a meta-search engine
commit: 2e41bfcbdbb762be610ff379380ea2201f544edd
parent: 7eb27848c2beaa4b5737cc1d52480c510548a21e
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Sat, 20 Dec 2014 12:17:03 +0100

[enh] engine shortcut validation

Diffstat:

Msearx/engines/__init__.py7++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py @@ -81,7 +81,8 @@ def load_engine(engine_data): if engine_attr.startswith('_'): continue if getattr(engine, engine_attr) is None: - 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)) sys.exit(1) engine.stats = { @@ -100,6 +101,10 @@ def load_engine(engine_data): if engine.shortcut: # TODO check duplications + if engine.shortcut in engine_shortcuts: + print('[E] Engine config error: ambigious shortcut: {0}'\ + .format(engine.shortcut)) + sys.exit(1) engine_shortcuts[engine.shortcut] = engine.name return engine