summaryrefslogtreecommitdiff
path: root/searx
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2019-11-26 13:20:19 +0000
committerGitHub <noreply@github.com>2019-11-26 13:20:19 +0000
commit05033ea8d8d3b3afb92c614a86399a499e7ad07e (patch)
tree7bf7ee50e2b2344a19a3ec1d835fb8713137d658 /searx
parent2a527b818713f643b2a58fec4c61fb490e633980 (diff)
parentbb4d223770bc8cb333dc2c5ca13e8430b18051dd (diff)
downloadsearxng-05033ea8d8d3b3afb92c614a86399a499e7ad07e.tar.gz
searxng-05033ea8d8d3b3afb92c614a86399a499e7ad07e.zip
Merge pull request #1689 from MarcAbonce/images_fixes
[fix] Google Images
Diffstat (limited to 'searx')
-rw-r--r--searx/engines/google_images.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/searx/engines/google_images.py b/searx/engines/google_images.py
index d9a49e9cc..636913114 100644
--- a/searx/engines/google_images.py
+++ b/searx/engines/google_images.py
@@ -70,11 +70,21 @@ def response(resp):
try:
metadata = loads(result)
- img_format = "{0} {1}x{2}".format(metadata['ity'], str(metadata['ow']), str(metadata['oh']))
- source = "{0} ({1})".format(metadata['st'], metadata['isu'])
+
+ img_format = metadata.get('ity', '')
+ img_width = metadata.get('ow', '')
+ img_height = metadata.get('oh', '')
+ if img_width and img_height:
+ img_format += " {0}x{1}".format(img_width, img_height)
+
+ source = metadata.get('st', '')
+ source_url = metadata.get('isu', '')
+ if source_url:
+ source += " ({0})".format(source_url)
+
results.append({'url': metadata['ru'],
'title': metadata['pt'],
- 'content': metadata['s'],
+ 'content': metadata.get('s', ''),
'source': source,
'img_format': img_format,
'thumbnail_src': metadata['tu'],