on master help sign in
Merge pull request #2254 from dalf/fix-duckduckgo

[fix] fix duckduckgo engine

commitdafae2d79fd3115315b4690cc548b145d8bacb02 authorAdam Tauber <asciimoo@gmail.com> dateFri 9 Oct 2020, 16:34 (6 years ago) parenta05c660cfd21bc
1 file changed+13−30
searx/engines/duckduckgo.py+13−30
searx/engines/duckduckgo.py+13−30
@@ -21,7 +21,7 @@ from searx.utils import extract_text, match_language, eval_xpath
2121
2222# engine dependent config
2323categories = ['general']
24−paging = True
24+paging = False
2525language_support = True
2626supported_languages_url = 'https://duckduckgo.com/util/u172.js'
2727time_range_support = True
@@ -37,9 +37,7 @@ language_aliases = {
3737}
3838
3939# search-url
40−url = 'https://duckduckgo.com/html?{query}&s={offset}&dc={dc_param}'
41−time_range_url = '&df={range}'
42−
40+url = 'https://html.duckduckgo.com/html'
4341time_range_dict = {'day': 'd',
4442 'week': 'w',
4543 'month': 'm'}
@@ -65,36 +63,21 @@ def get_region_code(lang, lang_list=[]):
6563
6664
6765def request(query, params):
68− if params['time_range'] not in (None, 'None', '') and params['time_range'] not in time_range_dict:
66+ if params['time_range'] is not None and params['time_range'] not in time_range_dict:
6967 return params
7068
71− offset = (params['pageno'] - 1) * 30
69+ params['url'] = url
70+ params['method'] = 'POST'
71+ params['data']['b'] = ''
72+ params['data']['q'] = query
73+ params['data']['df'] = ''
7274
7375 region_code = get_region_code(params['language'], supported_languages)
74− params['url'] = 'https://duckduckgo.com/html/'
75− if params['pageno'] > 1:
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
88− else:
89− if region_code:
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(
94− query=urlencode({'q': query}), offset=offset, dc_param=offset)
95−
96− if params['time_range'] in time_range_dict:
97− params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
76+ if region_code:
77+ params['data']['kl'] = region_code
78+ params['cookies']['kl'] = region_code
79+ if params['time_range'] in time_range_dict:
80+ params['data']['df'] = time_range_dict[params['time_range']]
9881
9982 return params
10083