on master help sign in
Merge pull request #1565 from MarcAbonce/fix_duck_images

[fix] DuckDuckGo Images requests

commit30cdec37aa222e106f7157c693fc8e5eb0251e38 authorAlexandre Flament <alex@al-f.net> dateSun 14 Apr 2019, 11:13 (8 years ago) parent34d85c83e1c215
2 files changed+8−5
searx/engines/duckduckgo_images.py+7−4 tests/unit/engines/test_duckduckgo_images.py+1−1
searx/engines/duckduckgo_images.py+7−4
@@ -35,9 +35,12 @@ site_url = 'https://duckduckgo.com/?{query}&iar=images&iax=1&ia=images'
3535
3636# run query in site to get vqd number needed for requesting images
3737# TODO: find a way to get this number without an extra request (is it a hash of the query?)
38−def get_vqd(query):
39− res = get(site_url.format(query=urlencode({'q': query})))
38+def get_vqd(query, headers):
39+ query_url = site_url.format(query=urlencode({'q': query}))
40+ res = get(query_url, headers=headers)
4041 content = res.text
42+ if content.find('vqd=\'') == -1:
43+ raise Exception('Request failed')
4144 vqd = content[content.find('vqd=\'') + 5:]
4245 vqd = vqd[:vqd.find('\'')]
4346 return vqd
@@ -47,7 +50,7 @@ def get_vqd(query):
4750def request(query, params):
4851 # to avoid running actual external requests when testing
4952 if 'is_test' not in params:
50− vqd = get_vqd(query)
53+ vqd = get_vqd(query, params['headers'])
5154 else:
5255 vqd = '12345'
5356
@@ -74,7 +77,7 @@ def response(resp):
7477 try:
7578 res_json = loads(content)
7679 except:
77− return []
80+ raise Exception('Cannot parse results')
7881
7982 # parse results
8083 for result in res_json['results']:
tests/unit/engines/test_duckduckgo_images.py+1−1
@@ -41,7 +41,7 @@ class TestDuckduckgoImagesEngine(SearxTestCase):
4141 self.assertRaises(AttributeError, duckduckgo_images.response, '[]')
4242
4343 response = mock.Mock(text='If this error persists, please let us know: ops@duckduckgo.com')
44− self.assertEqual(duckduckgo_images.response(response), [])
44+ self.assertRaises(Exception, duckduckgo_images.response, response)
4545
4646 json = u"""
4747 {