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

Added retry to use_photos_export, issue #351

Browse Source
This commit is contained in:
Rhet Turnbull 2021-01-15 14:13:00 -08:00
parent f662495c46
commit ddce731a5d
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osxphotos/_version.py
View File

@ -1,3 +1,3 @@
""" version info """
__version__ = "0.39.18"
__version__ = "0.39.19"

18
osxphotos/photoinfo/_photoinfo_export.py
View File

@ -51,6 +51,9 @@ from ..photokit import (
)
from ..utils import dd_to_dms_str, findfiles, noop, get_preferred_uti_extension
# retry if use_photos_export fails the first time (which sometimes it does)
MAX_PHOTOSCRIPT_RETRIES = 3
class ExportError(Exception):
""" error during export """
@ -233,9 +236,16 @@ def _export_photo_uuid_applescript(
exported_files = []
filename = None
try:
photo = photoscript.Photo(uuid)
filename = photo.filename
exported_files = photo.export(tmpdir.name, original=original, timeout=timeout)
# I've seen intermittent failures with the PhotoScript export so retry if
# export doesn't return anything
retries = 0
while not exported_files and retries < MAX_PHOTOSCRIPT_RETRIES:
photo = photoscript.Photo(uuid)
filename = photo.filename
exported_files = photo.export(
tmpdir.name, original=original, timeout=timeout
)
retries += 1
except Exception as e:
raise ExportError(e)
@ -268,7 +278,7 @@ def _export_photo_uuid_applescript(
exported_paths.append(str(dest_new))
return exported_paths
else:
return None
return []
# _check_export_suffix is not a class method, don't import this into PhotoInfo