jandieman/searxng
2
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2025-12-22 19:50:00 +00:00
Code Issues Projects Releases Wiki Activity

[enh] engine types

Browse Source
This commit is contained in:
asciimoo
2013-10-15 19:11:43 +02:00
parent c3b7ed8687
commit d793c2733c
7 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
searx/engines/__init__.py
View File

@@ -6,7 +6,7 @@ import grequests
engine_dir = dirname(realpath(__file__))
engines = []
engines = {}
for filename in listdir(engine_dir):
modname = splitext(filename)[0]
@@ -16,14 +16,16 @@ for filename in listdir(engine_dir):
engine = load_source(modname, filepath)
if not hasattr(engine, 'request') or not hasattr(engine, 'response'):
continue
engines.append(engine)
engines[modname] = engine
def default_request_params():
return {'method': 'GET', 'headers': {}, 'data': {}, 'url': ''}
def make_callback(results, callback):
def make_callback(engine_name, results, callback):
def process_callback(response, **kwargs):
results.extend(callback(response))
for result in callback(response):
result['engine'] = engine_name
results.append(result)
return process_callback
def search(query, request):
@@ -31,11 +33,11 @@ def search(query, request):
requests = []
results = []
user_agent = request.headers.get('User-Agent', '')
for engine in engines:
for ename, engine in engines.items():
headers = default_request_params()
headers['User-Agent'] = user_agent
request_params = engine.request(query, headers)
callback = make_callback(results, engine.response)
callback = make_callback(ename, results, engine.response)
if request_params['method'] == 'GET':
req = grequests.get(request_params['url']
,headers=headers