diff --git a/README.md b/README.md index 06fd4a99..ce91e7b2 100644 --- a/README.md +++ b/README.md @@ -1269,6 +1269,9 @@ Returns True if photo is a panorama, otherwise False. **Note**: The result of `PhotoInfo.panorama` will differ from the "Panoramas" Media Types smart album in that it will also identify panorama photos from older phones that Photos does not recognize as panoramas. +#### `slow_mo` +Returns True if photo is a slow motion video, otherwise False + #### `labels` Returns image categorization labels associated with the photo as list of str. diff --git a/osxphotos/__main__.py b/osxphotos/__main__.py index e0081581..bc324fca 100644 --- a/osxphotos/__main__.py +++ b/osxphotos/__main__.py @@ -2277,6 +2277,8 @@ def export_photo( global VERBOSE VERBOSE = bool(verbose_) + # TODO: if --skip-original-if-edited, it's possible edited version is on disk but + # original is missing, in which case we should download the edited version if not download_missing: if photo.ismissing: space = " " if not verbose_ else "" @@ -2303,6 +2305,16 @@ def export_photo( results_touched = [] export_original = not (skip_original_if_edited and photo.hasadjustments) + # slow_mo photos will always have hasadjustments=True even if not edited + if photo.path_edited is None: + if photo.slow_mo: + export_original = True + export_edited = False + elif not download_missing: + # requested edited version but it's missing, download original + export_original = True + export_edited = False + verbose(f"Edited file for {photo.original_filename} is missing, downloading original") filenames = get_filenames_from_template(photo, filename_template, original_name) for filename in filenames: diff --git a/osxphotos/_version.py b/osxphotos/_version.py index cd54e994..f0caced8 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,4 +1,4 @@ """ version info """ -__version__ = "0.36.8" +__version__ = "0.36.9"