@@ -70,11 +70,21 @@ def response(resp):
72 metadata = loads(result)
72 metadata = loads(result)
73− img_format = "{0} {1}x{2}".format(metadata['ity'], str(metadata['ow']), str(metadata['oh']))
73+
74− source = "{0} ({1})".format(metadata['st'], metadata['isu'])
74+ img_format = metadata.get('ity', '')
75+ img_width = metadata.get('ow', '')
76+ img_height = metadata.get('oh', '')
77+ if img_width and img_height:
78+ img_format += " {0}x{1}".format(img_width, img_height)
80+ source = metadata.get('st', '')
81+ source_url = metadata.get('isu', '')
83+ source += " ({0})".format(source_url)
75 results.append({'url': metadata['ru'],
85 results.append({'url': metadata['ru'],
76 'title': metadata['pt'],
86 'title': metadata['pt'],
77− 'content': metadata['s'],
87+ 'content': metadata.get('s', ''),
78 'source': source,
88 'source': source,
79 'img_format': img_format,
89 'img_format': img_format,
80 'thumbnail_src': metadata['tu'],
90 'thumbnail_src': metadata['tu'],