@@ -17,37 +17,51 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
1717'''
1818
1919from os.path import realpath, dirname, splitext, join
20−from os import listdir
2120from imp import load_source
2221import grequests
2322from itertools import izip_longest, chain
2423from operator import itemgetter
2524from urlparse import urlparse
2625from searx import settings
26+import ConfigParser
27+import sys
2728
2829engine_dir = dirname(realpath(__file__))
30+searx_dir = join(engine_dir, '../../')
31+
32+engines_config = ConfigParser.SafeConfigParser()
33+engines_config.read(join(searx_dir, 'engines.cfg'))
2934
3035engines = {}
3136
3237categories = {'general': []}
3338
34−for filename in listdir(engine_dir):
35− if filename.startswith('_') or not filename.endswith('.py'):
36− continue
39+def load_module(filename):
3740 modname = splitext(filename)[0]
38− if modname in settings.blacklist:
39− continue
41+ if modname in sys.modules:
42+ del sys.modules[modname]
4043 filepath = join(engine_dir, filename)
41− engine = load_source(modname, filepath)
42− engine.name = modname
43− if not hasattr(engine, 'request') or not hasattr(engine, 'response'):
44− continue
45− engines[modname] = engine
46− if not hasattr(engine, 'categories'):
47− categories['general'].append(engine)
48− else:
44+ module = load_source(modname, filepath)
45+ module.name = modname
46+ return module
47+
48+for section in engines_config.sections():
49+ engine_data = engines_config.options(section)
50+ engine = load_module(engines_config.get(section, 'engine')+'.py')
51+ engine.name = section
52+ for param_name in engine_data:
53+ if param_name == 'engine':
54+ continue
55+ if param_name == 'categories':
56+ engine.categories = map(str.strip, engines_config.get(section, param_name).split(','))
57+ continue
58+ setattr(engine, param_name, engines_config.get(section, param_name))
59+ engines[engine.name] = engine
60+ if hasattr(engine, 'categories'):
4961 for category_name in engine.categories:
5062 categories.setdefault(category_name, []).append(engine)
63+ else:
64+ categories['general'].append(engine)
5165
5266def default_request_params():
5367 return {'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}}