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

Added additional try/except in _photoinfo_export.py

Browse Source
This commit is contained in:
Rhet Turnbull
2021-12-06 06:16:42 -08:00
parent 1bae6d33f1
commit 9de2c17e47
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osxphotos/photoinfo/_photoinfo_export.py
View File

@@ -280,7 +280,7 @@ def _export_photo_uuid_applescript(
if not exported_files or not filename: if not exported_files or not filename:
# nothing got exported # nothing got exported
raise ExportError(f"Could not export photo {uuid}") raise ExportError(f"Could not export photo {uuid} ({lineno(__file__)})")
# need to find actual filename as sometimes Photos renames JPG to jpeg on export # need to find actual filename as sometimes Photos renames JPG to jpeg on export
# may be more than one file exported (e.g. if Live Photo, Photos exports both .jpeg and .mov) # may be more than one file exported (e.g. if Live Photo, Photos exports both .jpeg and .mov)
@@ -1524,16 +1524,31 @@ def _export_photo(
edited_stat = fileutil.file_sig(src) if edited else (None, None, None) edited_stat = fileutil.file_sig(src) if edited else (None, None, None)
if dest_exists and (update or overwrite): if dest_exists and (update or overwrite):
# need to remove the destination first # need to remove the destination first
fileutil.unlink(dest) try:
fileutil.unlink(dest)
except Exception as e:
raise ExportError(
f"Error removing file {dest}: {e} (({lineno(__file__)})"
) from e
if export_as_hardlink: if export_as_hardlink:
fileutil.hardlink(src, dest) try:
fileutil.hardlink(src, dest)
except Exception as e:
raise ExportError(
f"Error hardlinking {src} to {dest}: {e} ({lineno(__file__)})"
) from e
elif convert_to_jpeg: elif convert_to_jpeg:
# use convert_to_jpeg to export the file # use convert_to_jpeg to export the file
fileutil.convert_to_jpeg(src, dest_str, compression_quality=jpeg_quality) fileutil.convert_to_jpeg(src, dest_str, compression_quality=jpeg_quality)
converted_stat = fileutil.file_sig(dest_str) converted_stat = fileutil.file_sig(dest_str)
converted_to_jpeg_files.append(dest_str) converted_to_jpeg_files.append(dest_str)
else: else:
fileutil.copy(src, dest_str) try:
fileutil.copy(src, dest_str)
except Exception as e:
raise ExportError(
f"Error copying file {src} to {dest_str}: {e} ({lineno(__file__)})"
) from e
export_db.set_data( export_db.set_data(
filename=dest_str, filename=dest_str,