markus
/
photofloat
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Guard the string lookups better.

master
Jason A. Donenfeld 2011-05-09 18:08:07 -04:00
parent ddba74b57c
commit fb01d666b8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scanner/PhotoAlbum.py
View File

@ -152,7 +152,8 @@ class Photo(object):
self._orientation = exif["Orientation"]; self._orientation = exif["Orientation"];
if self._orientation in range(5, 9): if self._orientation in range(5, 9):
self._attributes["size"] = (self._attributes["size"][1], self._attributes["size"][0]) self._attributes["size"] = (self._attributes["size"][1], self._attributes["size"][0])
self._attributes["orientation"] = self._metadata.orientation_list[self._orientation - 1] if self._orientation - 1 < len(self._metadata.orientation_list):
self._attributes["orientation"] = self._metadata.orientation_list[self._orientation - 1]
if "Make" in exif: if "Make" in exif:
self._attributes["make"] = exif["Make"] self._attributes["make"] = exif["Make"]
if "Model" in exif: if "Model" in exif:
@ -171,22 +172,17 @@ class Photo(object):
self._attributes["iso"] = exif["PhotographicSensitivity"] self._attributes["iso"] = exif["PhotographicSensitivity"]
if "ExposureTime" in exif: if "ExposureTime" in exif:
self._attributes["exposureTime"] = exif["ExposureTime"] self._attributes["exposureTime"] = exif["ExposureTime"]
if "MeteringMode" in exif: if "Flash" in exif and exif["Flash"] in self._metadata.flash_dictionary:
self._attributes["meteringMode"] = exif["MeteringMode"]
if "Flash" in exif:
try: try:
self._attributes["flash"] = self._metadata.flash_dictionary[exif["Flash"]] self._attributes["flash"] = self._metadata.flash_dictionary[exif["Flash"]]
except: except:
pass pass
if "ExposureProgram" in exif: if "ExposureProgram" in exif and exif["ExposureProgram"] < len(self._metadata.exposure_list):
self._attributes["exposureProgram"] = self._metadata.exposure_list[exif["ExposureProgram"]] self._attributes["exposureProgram"] = self._metadata.exposure_list[exif["ExposureProgram"]]
if "SpectralSensitivity" in exif: if "SpectralSensitivity" in exif:
self._attributes["spectralSensitivity"] = exif["SpectralSensitivity"] self._attributes["spectralSensitivity"] = exif["SpectralSensitivity"]
if "MeteringMode" in exif: if "MeteringMode" in exif and exif["MeteringMode"] < len(self._metadata.metering_list):
if exif["MeteringMode"] == 255: self._attributes["meteringMode"] = self._metadata.metering_list[exif["MeteringMode"]]
self._attributes["meteringMode"] = "Other"
else:
self._attributes["meteringMode"] = self._metadata.metering_list[exif["MeteringMode"]]
if "ExposureCompensation" in exif: if "ExposureCompensation" in exif:
self._attributes["exposureCompensation"] = exif["ExposureCompensation"] self._attributes["exposureCompensation"] = exif["ExposureCompensation"]
if "ExposureBiasValue" in exif: if "ExposureBiasValue" in exif: