diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2019-12-24 17:45:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-24 17:45:13 +0100 |
| commit | ecb054a7a058a1f62a536e5cac88eed8926b107d (patch) | |
| tree | 925594876f18580732d2c8a438ff8f3bea8d9092 /searx/engines/google_images.py | |
| parent | cc8d4b958e274eb9e154db5c319d2e50da561d61 (diff) | |
| parent | 5a0a66e9bc34af2b6404231efc7cf02f389bdfcb (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'searx/engines/google_images.py')
| -rw-r--r-- | searx/engines/google_images.py | 16 |
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'], |