diff options
| -rw-r--r-- | AUTHORS.rst | 1 | ||||
| -rw-r--r-- | searx/engines/__init__.py | 16 | ||||
| -rw-r--r-- | searx/engines/piratebay.py | 2 | ||||
| -rw-r--r-- | searx/settings.yml | 6 |
4 files changed, 16 insertions, 9 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index dacb45923..ef1ae7809 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -28,3 +28,4 @@ generally made searx better: - @courgette - @kernc - @Cqoicebordel +- @Reventl0v diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py index 80356a8cd..3c9ce3b57 100644 --- a/searx/engines/__init__.py +++ b/searx/engines/__init__.py @@ -41,11 +41,8 @@ def load_module(filename): module.name = modname 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 = 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 sys.exit(1) - engines[engine.name] = engine engine.stats = { 'result_count': 0, 'search_count': 0, @@ -105,6 +101,7 @@ for engine_data in settings['engines']: if engine.shortcut: # TODO check duplications engine_shortcuts[engine.shortcut] = engine.name + return engine def get_engines_stats(): @@ -194,3 +191,12 @@ def get_engines_stats(): 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 diff --git a/searx/engines/piratebay.py b/searx/engines/piratebay.py index 14905dc83..f6144faa2 100644 --- a/searx/engines/piratebay.py +++ b/searx/engines/piratebay.py @@ -19,7 +19,7 @@ categories = ['videos', 'music', 'files'] paging = True # search-url -url = 'https://thepiratebay.se/' +url = 'https://thepiratebay.cr/' search_url = url + 'search/{search_term}/{pageno}/99/{search_type}' # piratebay specific type-definitions diff --git a/searx/settings.yml b/searx/settings.yml index d64a23bf1..5e9f11202 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -95,9 +95,9 @@ engines: engine : openstreetmap shortcut : osm - - name : piratebay - engine : piratebay - shortcut : tpb +# - name : piratebay +# engine : piratebay +# shortcut : tpb - name : soundcloud engine : soundcloud |