on master help sign in
[fix] multilingual duckduckgo

only works if both country and language are set

commit8fc4b8156affc9e7f00db0988ccd627b3eaae8a7 authora01200356 <a01200356@itesm.mx> dateFri 3 Jun 2016, 00:14 (10 years ago) parent3fd405d
2 files changed+17−14
searx/engines/duckduckgo.py+15−8 tests/unit/engines/test_duckduckgo.py+2−6
searx/engines/duckduckgo.py+15−8
@@ -11,8 +11,6 @@
1111 @parse url, title, content
1212
1313 @todo rewrite to api
14− @todo language support
15− (the current used site does not support language-change)
1614"""
1715
1816from urllib import urlencode
@@ -39,13 +37,22 @@ def request(query, params):
3937 offset = (params['pageno'] - 1) * 30
4038
4139 if params['language'] == 'all':
42− locale = 'en-us'
40+ locale = None
4341 else:
44− locale = params['language'].replace('_', '-').lower()
45−
46− params['url'] = url.format(
47− query=urlencode({'q': query, 'kl': locale}),
48− offset=offset)
42+ locale = params['language'].split('_')
43+ if len(locale) == 2:
44+ # country code goes first
45+ locale = locale[1].lower() + '-' + locale[0].lower()
46+ else:
47+ # doesn't actually do anything because ddg requires both country and language
48+ locale = locale[0].lower()
49+
50+ if locale:
51+ params['url'] = url.format(
52+ query=urlencode({'q': query, 'kl': locale}), offset=offset)
53+ else:
54+ params['url'] = url.format(
55+ query=urlencode({'q': query}), offset=offset)
4956
5057 return params
5158
tests/unit/engines/test_duckduckgo.py+2−6
@@ -11,16 +11,12 @@ class TestDuckduckgoEngine(SearxTestCase):
1111 query = 'test_query'
1212 dicto = defaultdict(dict)
1313 dicto['pageno'] = 1
14− dicto['language'] = 'fr_FR'
14+ dicto['language'] = 'de_CH'
1515 params = duckduckgo.request(query, dicto)
1616 self.assertIn('url', params)
1717 self.assertIn(query, params['url'])
1818 self.assertIn('duckduckgo.com', params['url'])
19− self.assertIn('fr-fr', params['url'])
20−
21− dicto['language'] = 'all'
22− params = duckduckgo.request(query, dicto)
23− self.assertIn('en-us', params['url'])
19+ self.assertIn('ch-de', params['url'])
2420
2521 def test_response(self):
2622 self.assertRaises(AttributeError, duckduckgo.response, None)