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

Fix for issue #238

Browse Source
This commit is contained in:
Rhet Turnbull
2020-10-24 13:45:10 -07:00
parent 7f2701f6ee
commit 48f29e138e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osxphotos/__main__.py
View File

@@ -2230,7 +2230,7 @@ def export_photo(
f"skipping {photo.original_filename}" f"skipping {photo.original_filename}"
) )
return ExportResults([], [], [], [], [], []) return ExportResults([], [], [], [], [], [])
elif photo.ismissing and not photo.iscloudasset or not photo.incloud: elif photo.ismissing and not photo.iscloudasset and not photo.incloud:
verbose( verbose(
f"Skipping missing {photo.original_filename}: not iCloud asset or missing from cloud" f"Skipping missing {photo.original_filename}: not iCloud asset or missing from cloud"
) )

2
osxphotos/_version.py
View File

@@ -1,4 +1,4 @@
""" version info """ """ version info """
__version__ = "0.35.6" __version__ = "0.35.7"

6
osxphotos/photoinfo/_photoinfo_export.py
View File

@@ -636,8 +636,11 @@ def export2(
exported = [] exported = []
# export live_photo .mov file? # export live_photo .mov file?
live_photo = True if live_photo and self.live_photo else False live_photo = True if live_photo and self.live_photo else False
if edited: if edited or self.shared:
# exported edited version and not original # exported edited version and not original
# shared photos (in shared albums) show up as not having adjustments (not edited)
# but Photos is unable to export the "original" as only a jpeg copy is shared in iCloud
# so tell Photos to export the current version in this case
if filename: if filename:
# use filename stem provided # use filename stem provided
filestem = dest.stem filestem = dest.stem
@@ -671,7 +674,6 @@ def export2(
burst=self.burst, burst=self.burst,
dry_run=dry_run, dry_run=dry_run,
) )
if exported: if exported:
if touch_file: if touch_file:
for exported_file in exported: for exported_file in exported: