summaryrefslogtreecommitdiff
path: root/searx/engines
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2019-10-14 13:52:15 +0200
committerAdam Tauber <asciimoo@gmail.com>2019-10-14 13:52:15 +0200
commit94ea9d6622cf7784ca45a84ff804cd697b765e39 (patch)
treefd0c19fb7c01d6c0cb6a4b66cf4b2b7b9ad5856b /searx/engines
parent8e62f7600f4582b913c92d56ffbafc22e37abe3b (diff)
downloadsearxng-94ea9d6622cf7784ca45a84ff804cd697b765e39.tar.gz
searxng-94ea9d6622cf7784ca45a84ff804cd697b765e39.zip
[fix] duckduckgo paging - closes #1677
Diffstat (limited to 'searx/engines')
-rw-r--r--searx/engines/duckduckgo.py35
1 files changed, 26 insertions, 9 deletions
diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py
index fb8f523ac..4c93380f6 100644
--- a/searx/engines/duckduckgo.py
+++ b/searx/engines/duckduckgo.py
@@ -65,21 +65,36 @@ def get_region_code(lang, lang_list=[]):
def request(query, params):
- if params['time_range'] and params['time_range'] not in time_range_dict:
+ if params['time_range'] not in (None, 'None', '') and params['time_range'] not in time_range_dict:
return params
offset = (params['pageno'] - 1) * 30
region_code = get_region_code(params['language'], supported_languages)
- if region_code:
- params['url'] = url.format(
- query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)
+ params['url'] = 'https://duckduckgo.com/html/'
+ if params['pageno'] > 1:
+ params['method'] = 'POST'
+ params['data']['q'] = query
+ params['data']['s'] = offset
+ params['data']['dc'] = 30
+ params['data']['nextParams'] = ''
+ params['data']['v'] = 'l'
+ params['data']['o'] = 'json'
+ params['data']['api'] = '/d.js'
+ if params['time_range'] in time_range_dict:
+ params['data']['df'] = time_range_dict[params['time_range']]
+ if region_code:
+ params['data']['kl'] = region_code
else:
- params['url'] = url.format(
- query=urlencode({'q': query}), offset=offset, dc_param=offset)
+ if region_code:
+ params['url'] = url.format(
+ query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)
+ else:
+ params['url'] = url.format(
+ query=urlencode({'q': query}), offset=offset, dc_param=offset)
- if params['time_range'] in time_range_dict:
- params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
+ if params['time_range'] in time_range_dict:
+ params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
return params
@@ -91,7 +106,9 @@ def response(resp):
doc = fromstring(resp.text)
# parse results
- for r in doc.xpath(result_xpath):
+ for i,r in enumerate(doc.xpath(result_xpath)):
+ if i >= 30:
+ break
try:
res_url = r.xpath(url_xpath)[-1]
except: