diff --git a/osxphotos/__main__.py b/osxphotos/__main__.py index 0dc635ca..050078f5 100644 --- a/osxphotos/__main__.py +++ b/osxphotos/__main__.py @@ -2230,7 +2230,7 @@ def export_photo( f"skipping {photo.original_filename}" ) 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( f"Skipping missing {photo.original_filename}: not iCloud asset or missing from cloud" ) diff --git a/osxphotos/_version.py b/osxphotos/_version.py index b19c4213..505da923 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,4 +1,4 @@ """ version info """ -__version__ = "0.35.6" +__version__ = "0.35.7" diff --git a/osxphotos/photoinfo/_photoinfo_export.py b/osxphotos/photoinfo/_photoinfo_export.py index 8031ef47..92f6b48f 100644 --- a/osxphotos/photoinfo/_photoinfo_export.py +++ b/osxphotos/photoinfo/_photoinfo_export.py @@ -636,8 +636,11 @@ def export2( exported = [] # export live_photo .mov file? 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 + # 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: # use filename stem provided filestem = dest.stem @@ -671,7 +674,6 @@ def export2( burst=self.burst, dry_run=dry_run, ) - if exported: if touch_file: for exported_file in exported: