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

Fixed error for missing photo path, #547

Browse Source
This commit is contained in:
Rhet Turnbull
2021-12-10 19:36:25 -08:00
parent 0629b3f6d6
commit 0906dbe637
2 changed files with 12 additions and 20 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.43.5" __version__ = "0.43.6"

30
osxphotos/photoinfo/photoinfo.py
View File

@@ -856,7 +856,7 @@ class PhotoInfo:
if self._db._db_version <= _PHOTOS_4_VERSION: if self._db._db_version <= _PHOTOS_4_VERSION:
if self.live_photo and not self.ismissing: if self.live_photo and not self.ismissing:
live_model_id = self._info["live_model_id"] live_model_id = self._info["live_model_id"]
if live_model_id == None: if live_model_id is None:
logging.debug(f"missing live_model_id: {self._uuid}") logging.debug(f"missing live_model_id: {self._uuid}")
photopath = None photopath = None
else: else:
@@ -877,28 +877,20 @@ class PhotoInfo:
# photos 4 has "isOnDisk" column we could check # photos 4 has "isOnDisk" column we could check
# or could do the actual check with "isfile" # or could do the actual check with "isfile"
# TODO: should this be a warning or debug? # TODO: should this be a warning or debug?
logging.debug(
f"MISSING PATH: live photo path for UUID {self._uuid} should be at {photopath} but does not appear to exist"
)
photopath = None photopath = None
else: else:
photopath = None photopath = None
else: elif self.live_photo and self.path and not self.ismissing:
# Photos 5 filename = pathlib.Path(self.path)
if self.live_photo and not self.ismissing: photopath = filename.parent.joinpath(f"{filename.stem}_3.mov")
filename = pathlib.Path(self.path) photopath = str(photopath)
photopath = filename.parent.joinpath(f"{filename.stem}_3.mov") if not os.path.isfile(photopath):
photopath = str(photopath) # In testing, I've seen occasional missing movie for live photo
if not os.path.isfile(photopath): # these appear to be valid -- e.g. video component not yet downloaded from iCloud
# In testing, I've seen occasional missing movie for live photo # TODO: should this be a warning or debug?
# these appear to be valid -- e.g. video component not yet downloaded from iCloud
# TODO: should this be a warning or debug?
logging.debug(
f"MISSING PATH: live photo path for UUID {self._uuid} should be at {photopath} but does not appear to exist"
)
photopath = None
else:
photopath = None photopath = None
else:
photopath = None
return photopath return photopath