forks/sigal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes sigal aborting if image contains malformed metadata

Browse Source
This commit is contained in:
tudacs
2018-12-17 22:31:58 +01:00
parent 1c0b8d976d
commit d9e88e87f9
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sigal/image.py
View File

@@ -235,18 +235,23 @@ def get_exif_data(filename):
def get_iptc_data(filename):
"""Return a dict with the raw IPTC data."""
img = _read_image(filename)
raw_iptc = IptcImagePlugin.getiptcinfo(img)
# IPTC fields are catalogued in:
# https://www.iptc.org/std/photometadata/specification/IPTC-PhotoMetadata
iptc_data = {}
# 2:05 is the IPTC title property
if raw_iptc and (2, 5) in raw_iptc:
iptc_data["title"] = raw_iptc[(2, 5)].decode('utf-8')
# 2:120 is the IPTC description property
if raw_iptc and (2, 120) in raw_iptc:
iptc_data["description"] = raw_iptc[(2, 120)].decode('utf-8')
try:
img = _read_image(filename)
raw_iptc = IptcImagePlugin.getiptcinfo(img)
# IPTC fields are catalogued in:
# https://www.iptc.org/std/photometadata/specification/IPTC-PhotoMetadata
# 2:05 is the IPTC title property
if raw_iptc and (2, 5) in raw_iptc:
iptc_data["title"] = raw_iptc[(2, 5)].decode('utf-8')
# 2:120 is the IPTC description property
if raw_iptc and (2, 120) in raw_iptc:
iptc_data["description"] = raw_iptc[(2, 120)].decode('utf-8')
except SyntaxError:
print("IPTC Error in %s\n"%filename)
iptc_data = {}
return iptc_data