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

Fix for issue #39

Browse Source
This commit is contained in:
Rhet Turnbull
2020-11-02 05:53:11 -08:00
parent cd710771cd
commit c7c5320587
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osxphotos/__main__.py
View File

@@ -2317,10 +2317,13 @@ def export_photo(
# if download_missing and the photo is missing or path doesn't exist, # if download_missing and the photo is missing or path doesn't exist,
# try to download with Photos # try to download with Photos
use_photos_export = ( use_photos_export = use_photos_export or (
download_missing and (photo.ismissing or not os.path.exists(photo.path)) download_missing
if not use_photos_export and (
else True photo.ismissing
or not os.path.exists(photo.path)
or (export_edited and photo.path_edited is None)
)
) )
# export the photo to each path in dest_paths # export the photo to each path in dest_paths

2
osxphotos/_version.py
View File

@@ -1,4 +1,4 @@
""" version info """ """ version info """
__version__ = "0.36.5" __version__ = "0.36.6"

9
osxphotos/photoinfo/photoinfo.py
View File

@@ -196,18 +196,15 @@ class PhotoInfo:
""" absolute path on disk of the edited picture """ """ absolute path on disk of the edited picture """
""" None if photo has not been edited """ """ None if photo has not been edited """
# TODO: break this code into a _path_edited_4 and _path_edited_5
# version to simplify the big if/then; same for path_live_photo
try: try:
return self._path_edited return self._path_edited
except AttributeError: except AttributeError:
if self._db._db_version <= _PHOTOS_4_VERSION: if self._db._db_version <= _PHOTOS_4_VERSION:
self._path_edited = self._path_edited_4() self._path_edited = self._path_edited_4()
return self._path_edited
else: else:
self._path_edited = self._path_edited_5() self._path_edited = self._path_edited_5()
return self._path_edited
return self._path_edited
def _path_edited_5(self): def _path_edited_5(self):
""" return path_edited for Photos >= 5 """ """ return path_edited for Photos >= 5 """
@@ -265,8 +262,6 @@ class PhotoInfo:
# if self._info["isMissing"] == 1: # if self._info["isMissing"] == 1:
# photopath = None # path would be meaningless until downloaded # photopath = None # path would be meaningless until downloaded
# logging.debug(photopath)
return photopath return photopath
def _path_edited_4(self): def _path_edited_4(self):