@@ -17,37 +17,51 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
19from os.path import realpath, dirname, splitext, join
19from os.path import realpath, dirname, splitext, join
20−from os import listdir
21from imp import load_source
20from imp import load_source
22import grequests
21import grequests
23from itertools import izip_longest, chain
22from itertools import izip_longest, chain
24from operator import itemgetter
23from operator import itemgetter
25from urlparse import urlparse
24from urlparse import urlparse
26from searx import settings
25from searx import settings
28engine_dir = dirname(realpath(__file__))
29engine_dir = dirname(realpath(__file__))
30+searx_dir = join(engine_dir, '../../')
32+engines_config = ConfigParser.SafeConfigParser()
33+engines_config.read(join(searx_dir, 'engines.cfg'))
30engines = {}
35engines = {}
32categories = {'general': []}
37categories = {'general': []}
34−for filename in listdir(engine_dir):
39+def load_module(filename):
35− if filename.startswith('_') or not filename.endswith('.py'):
37 modname = splitext(filename)[0]
40 modname = splitext(filename)[0]
38− if modname in settings.blacklist:
41+ if modname in sys.modules:
39− continue
42+ del sys.modules[modname]
40 filepath = join(engine_dir, filename)
43 filepath = join(engine_dir, filename)
41− engine = load_source(modname, filepath)
44+ module = load_source(modname, filepath)
42− engine.name = modname
45+ module.name = modname
43− if not hasattr(engine, 'request') or not hasattr(engine, 'response'):
46+ return module
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':
55+ if param_name == 'categories':
56+ engine.categories = map(str.strip, engines_config.get(section, param_name).split(','))
58+ setattr(engine, param_name, engines_config.get(section, param_name))
45− engines[modname] = engine
59+ engines[engine.name] = engine
46− if not hasattr(engine, 'categories'):
60+ if hasattr(engine, 'categories'):
47− categories['general'].append(engine)
49 for category_name in engine.categories:
61 for category_name in engine.categories:
50 categories.setdefault(category_name, []).append(engine)
62 categories.setdefault(category_name, []).append(engine)
64+ categories['general'].append(engine)
52def default_request_params():
66def default_request_params():
53 return {'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}}
67 return {'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}}