forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added try/except for bad datettime values

Browse Source
This commit is contained in:
Rhet Turnbull
2020-05-23 17:40:57 -07:00
parent f67f239278
commit 1d095d7284
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osxphotos/_version.py
View File

@@ -1,3 +1,3 @@
""" version info """ """ version info """
__version__ = "0.29.0" __version__ = "0.29.2"

18
osxphotos/photosdb/photosdb.py
View File

@@ -798,17 +798,19 @@ class PhotosDB:
# There are sometimes negative values for lastmodifieddate in the database # There are sometimes negative values for lastmodifieddate in the database
# I don't know what these mean but they will raise exception in datetime if # I don't know what these mean but they will raise exception in datetime if
# not accounted for # not accounted for
if row[4] is not None and row[4] >= 0: try:
self._dbphotos[uuid]["lastmodifieddate"] = datetime.fromtimestamp( self._dbphotos[uuid]["lastmodifieddate"] = datetime.fromtimestamp(
row[4] + td row[4] + td
) )
else: except ValueError:
self._dbphotos[uuid]["lastmodifieddate"] = None
except TypeError:
self._dbphotos[uuid]["lastmodifieddate"] = None self._dbphotos[uuid]["lastmodifieddate"] = None
try: try:
self._dbphotos[uuid]["imageDate"] = datetime.fromtimestamp(row[5] + td) self._dbphotos[uuid]["imageDate"] = datetime.fromtimestamp(row[5] + td)
except ValueError: except ValueError:
self._dbphotos[uuid]["imageDate"] = datetime.date(1970,1,1) self._dbphotos[uuid]["imageDate"] = datetime.date(1970, 1, 1)
self._dbphotos[uuid]["mainRating"] = row[6] self._dbphotos[uuid]["mainRating"] = row[6]
self._dbphotos[uuid]["hasAdjustments"] = row[7] self._dbphotos[uuid]["hasAdjustments"] = row[7]
@@ -1516,12 +1518,18 @@ class PhotosDB:
# There are sometimes negative values for lastmodifieddate in the database # There are sometimes negative values for lastmodifieddate in the database
# I don't know what these mean but they will raise exception in datetime if # I don't know what these mean but they will raise exception in datetime if
# not accounted for # not accounted for
if row[4] is not None and row[4] >= 0: try:
info["lastmodifieddate"] = datetime.fromtimestamp(row[4] + td) info["lastmodifieddate"] = datetime.fromtimestamp(row[4] + td)
else: except ValueError:
info["lastmodifieddate"] = None
except TypeError:
info["lastmodifieddate"] = None info["lastmodifieddate"] = None
try:
info["imageDate"] = datetime.fromtimestamp(row[5] + td) info["imageDate"] = datetime.fromtimestamp(row[5] + td)
except ValueError:
info["imageDate"] = datetime.date(1970, 1, 1)
info["imageTimeZoneOffsetSeconds"] = row[6] info["imageTimeZoneOffsetSeconds"] = row[6]
info["hidden"] = row[9] info["hidden"] = row[9]
info["favorite"] = row[10] info["favorite"] = row[10]