git.iko.soy/searx
on master help sign in
[fix] duckduckgo paging - closes #1677
94ea9d6Adam Tauber
searx/engines/duckduckgo.py+26−9
compare with master
unifiedsplit
@@ -65,21 +65,36 @@ def get_region_code(lang, lang_list=[]):
65
65
66
66
67def request(query, params):
67def request(query, params):
68− if params['time_range'] and params['time_range'] not in time_range_dict:
68+ if params['time_range'] not in (None, 'None', '') and params['time_range'] not in time_range_dict:
69 return params
69 return params
70
70
71 offset = (params['pageno'] - 1) * 30
71 offset = (params['pageno'] - 1) * 30
72
72
73 region_code = get_region_code(params['language'], supported_languages)
73 region_code = get_region_code(params['language'], supported_languages)
74− if region_code:
74+ params['url'] = 'https://duckduckgo.com/html/'
75− params['url'] = url.format(
75+ if params['pageno'] > 1:
76− query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)
76+ params['method'] = 'POST'
77+ params['data']['q'] = query
78+ params['data']['s'] = offset
79+ params['data']['dc'] = 30
80+ params['data']['nextParams'] = ''
81+ params['data']['v'] = 'l'
82+ params['data']['o'] = 'json'
83+ params['data']['api'] = '/d.js'
84+ if params['time_range'] in time_range_dict:
85+ params['data']['df'] = time_range_dict[params['time_range']]
86+ if region_code:
87+ params['data']['kl'] = region_code
77 else:
88 else:
89+ if region_code:
78− params['url'] = url.format(
90+ params['url'] = url.format(
91+ query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)
92+ else:
93+ params['url'] = url.format(
79− query=urlencode({'q': query}), offset=offset, dc_param=offset)
94+ query=urlencode({'q': query}), offset=offset, dc_param=offset)
80
95
81− if params['time_range'] in time_range_dict:
96+ if params['time_range'] in time_range_dict:
82− params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
97+ params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
83
98
84 return params
99 return params
85
100
@@ -91,7 +106,9 @@ def response(resp):
91 doc = fromstring(resp.text)
106 doc = fromstring(resp.text)
92
107
93 # parse results
108 # parse results
94− for r in doc.xpath(result_xpath):
109+ for i,r in enumerate(doc.xpath(result_xpath)):
110+ if i >= 30:
111+ break
95 try:
112 try:
96 res_url = r.xpath(url_xpath)[-1]
113 res_url = r.xpath(url_xpath)[-1]
97 except:
114 except: