df2b9a7 · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

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

df2b9a7Alexandre Flament8 years ago

searx/engines/duckduckgo_images.py+7−4

compare with master

unifiedsplit

@@ -35,9 +35,12 @@ site_url = 'https://duckduckgo.com/?{query}&iar=images&iax=1&ia=images'

36# run query in site to get vqd number needed for requesting images

37# TODO: find a way to get this number without an extra request (is it a hash of the query?)

38−def get_vqd(query):

38+def get_vqd(query, headers):

39− res = get(site_url.format(query=urlencode({'q': query})))

39+ query_url = site_url.format(query=urlencode({'q': query}))

40+ res = get(query_url, headers=headers)

40 content = res.text

41 content = res.text

42+ if content.find('vqd=\'') == -1:

43+ raise Exception('Request failed')

41 vqd = content[content.find('vqd=\'') + 5:]

44 vqd = content[content.find('vqd=\'') + 5:]

42 vqd = vqd[:vqd.find('\'')]

45 vqd = vqd[:vqd.find('\'')]

43 return vqd

46 return vqd

@@ -47,7 +50,7 @@ def get_vqd(query):

47def request(query, params):

50def request(query, params):

48 # to avoid running actual external requests when testing

51 # to avoid running actual external requests when testing

49 if 'is_test' not in params:

52 if 'is_test' not in params:

50− vqd = get_vqd(query)

53+ vqd = get_vqd(query, params['headers'])

51 else:

54 else:

52 vqd = '12345'

55 vqd = '12345'

@@ -74,7 +77,7 @@ def response(resp):

74 try:

77 try:

75 res_json = loads(content)

78 res_json = loads(content)

76 except:

79 except:

77− return []

80+ raise Exception('Cannot parse results')

79 # parse results

82 # parse results

80 for result in res_json['results']:

83 for result in res_json['results']:

tests/unit/engines/test_duckduckgo_images.py+1−1

@@ -41,7 +41,7 @@ class TestDuckduckgoImagesEngine(SearxTestCase):

41 self.assertRaises(AttributeError, duckduckgo_images.response, '[]')

43 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)

46 json = u"""

47 {