Merge branch 'master' into ne/fix-google-image-search

Browse Source
This commit is contained in:
Alexandre Flament 2019-04-14 13:55:00 +02:00 committed by GitHub
commit df2b9a76f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
searx/engines/duckduckgo_images.py
View File

@ -35,9 +35,12 @@ site_url = 'https://duckduckgo.com/?{query}&iar=images&iax=1&ia=images'
# run query in site to get vqd number needed for requesting images # run query in site to get vqd number needed for requesting images
# TODO: find a way to get this number without an extra request (is it a hash of the query?) # TODO: find a way to get this number without an extra request (is it a hash of the query?)
def get_vqd(query): def get_vqd(query, headers):
res = get(site_url.format(query=urlencode({'q': query}))) query_url = site_url.format(query=urlencode({'q': query}))
res = get(query_url, headers=headers)
content = res.text content = res.text
if content.find('vqd=\'') == -1:
raise Exception('Request failed')
vqd = content[content.find('vqd=\'') + 5:] vqd = content[content.find('vqd=\'') + 5:]
vqd = vqd[:vqd.find('\'')] vqd = vqd[:vqd.find('\'')]
return vqd return vqd
@ -47,7 +50,7 @@ def get_vqd(query):
def request(query, params): def request(query, params):
# to avoid running actual external requests when testing # to avoid running actual external requests when testing
if 'is_test' not in params: if 'is_test' not in params:
vqd = get_vqd(query) vqd = get_vqd(query, params['headers'])
else: else:
vqd = '12345' vqd = '12345'
@ -74,7 +77,7 @@ def response(resp):
try: try:
res_json = loads(content) res_json = loads(content)
except: except:
return [] raise Exception('Cannot parse results')
# parse results # parse results
for result in res_json['results']: for result in res_json['results']:

2
tests/unit/engines/test_duckduckgo_images.py
View File

@ -41,7 +41,7 @@ class TestDuckduckgoImagesEngine(SearxTestCase):
self.assertRaises(AttributeError, duckduckgo_images.response, '[]') self.assertRaises(AttributeError, duckduckgo_images.response, '[]')
response = mock.Mock(text='If this error persists, please let us know: ops@duckduckgo.com') response = mock.Mock(text='If this error persists, please let us know: ops@duckduckgo.com')
self.assertEqual(duckduckgo_images.response(response), []) self.assertRaises(Exception, duckduckgo_images.response, response)
json = u""" json = u"""
{ {