[enh] engine params to response callbacks

Browse Source
This commit is contained in:
asciimoo 2013-10-25 22:00:56 +02:00
parent 03fdfb9871
commit 5dcddbc0ab
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
searx/engines/__init__.py
View File

@ -66,9 +66,10 @@ for section in engines_config.sections():
def default_request_params(): def default_request_params():
return {'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}} return {'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}}
def make_callback(engine_name, results, callback): def make_callback(engine_name, results, callback, params):
def process_callback(response, **kwargs): def process_callback(response, **kwargs):
cb_res = [] cb_res = []
response.request_params = params
for result in callback(response): for result in callback(response):
result['engine'] = engine_name result['engine'] = engine_name
cb_res.append(result) cb_res.append(result)
@ -93,7 +94,7 @@ def search(query, request, selected_categories):
request_params['headers']['User-Agent'] = user_agent request_params['headers']['User-Agent'] = user_agent
request_params['category'] = selected_engine['category'] request_params['category'] = selected_engine['category']
request_params = engine.request(query, request_params) request_params = engine.request(query, request_params)
callback = make_callback(selected_engine['name'], results, engine.response) callback = make_callback(selected_engine['name'], results, engine.response, request_params)
if request_params['method'] == 'GET': if request_params['method'] == 'GET':
req = grequests.get(request_params['url'] req = grequests.get(request_params['url']
,headers=request_params['headers'] ,headers=request_params['headers']