OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

Merge pull request #2559 from dalf/upd-duckduckgo

Browse source 
[fix] duckduckgo engine: "!ddg !g" do not redirect to google
This commit is contained in:
Alexandre Flament 2021-02-12 11:14:09 +01:00 committed by GitHub
commit ddab00abf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/dev/engine_overview.rst
View file

@ -169,6 +169,7 @@ headers set HTTP header information
data set HTTP data information data set HTTP data information
cookies set HTTP cookies cookies set HTTP cookies
verify bool Performing SSL-Validity check verify bool Performing SSL-Validity check
allow_redirects bool Follow redirects
max_redirects int maximum redirects, hard limit max_redirects int maximum redirects, hard limit
soft_max_redirects int maximum redirects, soft limit. Record an error but don't stop the engine soft_max_redirects int maximum redirects, soft limit. Record an error but don't stop the engine
raise_for_httperror bool True by default: raise an exception if the HTTP code of response is >= 300 raise_for_httperror bool True by default: raise an exception if the HTTP code of response is >= 300

8
searx/engines/duckduckgo.py
View file

@ -75,12 +75,18 @@ def request(query, params):
params['data']['kl'] = region_code params['data']['kl'] = region_code
params['cookies']['kl'] = region_code params['cookies']['kl'] = region_code
params['data']['df'] = time_range_dict.get(params['time_range'], '') if params['time_range'] in time_range_dict:
params['data']['df'] = time_range_dict[params['time_range']]
params['allow_redirects'] = False
return params return params
# get response from search-request # get response from search-request
def response(resp): def response(resp):
if resp.status_code == 303:
return []
# ping # ping
headers_ping = dict_subset(resp.request.headers, ['User-Agent', 'Accept-Encoding', 'Accept', 'Cookie']) headers_ping = dict_subset(resp.request.headers, ['User-Agent', 'Accept-Encoding', 'Accept', 'Cookie'])
get(url_ping, headers=headers_ping) get(url_ping, headers=headers_ping)

4
searx/search/processors/online.py
View file

@ -73,6 +73,10 @@ class OnlineProcessor(EngineProcessor):
if max_redirects: if max_redirects:
request_args['max_redirects'] = max_redirects request_args['max_redirects'] = max_redirects
# allow_redirects
if 'allow_redirects' in params:
request_args['allow_redirects'] = params['allow_redirects']
# soft_max_redirects # soft_max_redirects
soft_max_redirects = params.get('soft_max_redirects', max_redirects or 0) soft_max_redirects = params.get('soft_max_redirects', max_redirects or 0)