From 5352aec3b95bfccbbd93b51740a1ce5d2adeb191 Mon Sep 17 00:00:00 2001 From: Jonathan Strine Date: Wed, 25 Nov 2020 17:00:22 -0500 Subject: [PATCH] Continue even if the original filename is None Some photos seemed to be missing the original_filename (returning None). This fix prevents the traceback. --- osxphotos/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osxphotos/__main__.py b/osxphotos/__main__.py index 9b811040..429110de 100644 --- a/osxphotos/__main__.py +++ b/osxphotos/__main__.py @@ -2579,7 +2579,7 @@ def get_filenames_from_template(photo, filename_template, original_name): ) filenames = [f"{file_}{photo_ext}" for file_ in filenames] else: - filenames = [photo.original_filename] if original_name else [photo.filename] + filenames = [photo.original_filename] if (original_name and (photo.original_filename is not None)) else [photo.filename] filenames = [sanitize_filename(filename) for filename in filenames] return filenames