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

Catch errors in export_photo

Browse Source
This commit is contained in:
Rhet Turnbull
2020-11-28 20:00:10 -08:00
parent 4f36c7c948
commit d9dcf0917a
1 changed files with 127 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
osxphotos/__main__.py
View File

@@ -2515,6 +2515,7 @@ def export_photo(
# export the photo to each path in dest_paths # export the photo to each path in dest_paths
for dest_path in dest_paths: for dest_path in dest_paths:
if export_original: if export_original:
try:
export_results = photo.export2( export_results = photo.export2(
dest_path, dest_path,
original_filename, original_filename,
@@ -2550,10 +2551,18 @@ def export_photo(
results_exif_updated.extend(export_results.exif_updated) results_exif_updated.extend(export_results.exif_updated)
results_touched.extend(export_results.touched) results_touched.extend(export_results.touched)
results_converted.extend(export_results.converted_to_jpeg) results_converted.extend(export_results.converted_to_jpeg)
results_sidecar_json_written.extend(export_results.sidecar_json_written) results_sidecar_json_written.extend(
results_sidecar_json_skipped.extend(export_results.sidecar_json_skipped) export_results.sidecar_json_written
results_sidecar_xmp_written.extend(export_results.sidecar_xmp_written) )
results_sidecar_xmp_skipped.extend(export_results.sidecar_xmp_skipped) results_sidecar_json_skipped.extend(
export_results.sidecar_json_skipped
)
results_sidecar_xmp_written.extend(
export_results.sidecar_xmp_written
)
results_sidecar_xmp_skipped.extend(
export_results.sidecar_xmp_skipped
)
if verbose_: if verbose_:
for exported in export_results.exported: for exported in export_results.exported:
@@ -2566,7 +2575,11 @@ def export_photo(
verbose(f"Skipped up to date file {skipped}") verbose(f"Skipped up to date file {skipped}")
for touched in export_results.touched: for touched in export_results.touched:
verbose(f"Touched date on file {touched}") verbose(f"Touched date on file {touched}")
except:
click.echo(
f"Error exporting photo {photo.original_filename} ({photo.filename}) as {original_filename}",
err=True,
)
else: else:
verbose(f"Skipping original version of {photo.original_filename}") verbose(f"Skipping original version of {photo.original_filename}")
@@ -2592,6 +2605,7 @@ def export_photo(
verbose( verbose(
f"Exporting edited version of {filename} as {edited_filename}" f"Exporting edited version of {filename} as {edited_filename}"
) )
try:
export_results_edited = photo.export2( export_results_edited = photo.export2(
dest_path, dest_path,
edited_filename, edited_filename,
@@ -2625,7 +2639,9 @@ def export_photo(
results_skipped.extend(export_results_edited.skipped) results_skipped.extend(export_results_edited.skipped)
results_exif_updated.extend(export_results_edited.exif_updated) results_exif_updated.extend(export_results_edited.exif_updated)
results_touched.extend(export_results_edited.touched) results_touched.extend(export_results_edited.touched)
results_converted.extend(export_results_edited.converted_to_jpeg) results_converted.extend(
export_results_edited.converted_to_jpeg
)
results_sidecar_json_written.extend( results_sidecar_json_written.extend(
export_results_edited.sidecar_json_written export_results_edited.sidecar_json_written
) )
@@ -2650,6 +2666,11 @@ def export_photo(
verbose(f"Skipped up to date file {skipped}") verbose(f"Skipped up to date file {skipped}")
for touched in export_results_edited.touched: for touched in export_results_edited.touched:
verbose(f"Touched date on file {touched}") verbose(f"Touched date on file {touched}")
except:
click.echo(
f"Error exporting photo {filename} as {edited_filename}",
err=True,
)
return ExportResults( return ExportResults(
results_exported, results_exported,