From d497b94ad506bf6cf044bbabe7fcbf4ab9d5b9e7 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sun, 4 Jul 2021 12:09:13 -0700 Subject: [PATCH] Re-enabled try/except in cli export --- README.md | 4 +- osxphotos/_version.py | 2 +- osxphotos/cli.py | 148 +++++++++++++++++++++--------------------- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index a8e664bb..1b48297e 100644 --- a/README.md +++ b/README.md @@ -1776,7 +1776,7 @@ Substitution Description {lf} A line feed: '\n', alias for {newline} {cr} A carriage return: '\r' {crlf} a carriage return + line feed: '\r\n' -{osxphotos_version} The osxphotos version, e.g. '0.42.57' +{osxphotos_version} The osxphotos version, e.g. '0.42.59' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified for @@ -3601,7 +3601,7 @@ The following template field substitutions are availabe for use the templating s |{lf}|A line feed: '\n', alias for {newline}| |{cr}|A carriage return: '\r'| |{crlf}|a carriage return + line feed: '\r\n'| -|{osxphotos_version}|The osxphotos version, e.g. '0.42.57'| +|{osxphotos_version}|The osxphotos version, e.g. '0.42.59'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/osxphotos/_version.py b/osxphotos/_version.py index e7f02011..f9019e95 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.42.58" +__version__ = "0.42.59" diff --git a/osxphotos/cli.py b/osxphotos/cli.py index be5d706f..00de9a88 100644 --- a/osxphotos/cli.py +++ b/osxphotos/cli.py @@ -2836,86 +2836,86 @@ def export_photo_with_template( while tries <= retry: tries += 1 error = 0 - # try: - export_results = photo.export2( - dest_path, - original_filename=filename, - edited=edited, - original=export_original, - edited_filename=filename, - sidecar=sidecar_flags, - sidecar_drop_ext=sidecar_drop_ext, - live_photo=export_live, - raw_photo=export_raw, - export_as_hardlink=export_as_hardlink, - overwrite=overwrite, - use_photos_export=use_photos_export, - exiftool=exiftool, - merge_exif_keywords=exiftool_merge_keywords, - merge_exif_persons=exiftool_merge_persons, - use_albums_as_keywords=album_keyword, - use_persons_as_keywords=person_keyword, - keyword_template=keyword_template, - description_template=description_template, - update=update, - ignore_signature=ignore_signature, - export_db=export_db, - fileutil=fileutil, - dry_run=dry_run, - touch_file=touch_file, - convert_to_jpeg=convert_to_jpeg, - jpeg_quality=jpeg_quality, - ignore_date_modified=ignore_date_modified, - use_photokit=use_photokit, - verbose=verbose_, - exiftool_flags=exiftool_option, - jpeg_ext=jpeg_ext, - replace_keywords=replace_keywords, - render_options=render_options, - preview=export_preview or (missing and preview_if_missing), - preview_suffix=preview_suffix, - ) - for warning_ in export_results.exiftool_warning: - verbose_(f"exiftool warning for file {warning_[0]}: {warning_[1]}") - for error_ in export_results.exiftool_error: + try: + export_results = photo.export2( + dest_path, + original_filename=filename, + edited=edited, + original=export_original, + edited_filename=filename, + sidecar=sidecar_flags, + sidecar_drop_ext=sidecar_drop_ext, + live_photo=export_live, + raw_photo=export_raw, + export_as_hardlink=export_as_hardlink, + overwrite=overwrite, + use_photos_export=use_photos_export, + exiftool=exiftool, + merge_exif_keywords=exiftool_merge_keywords, + merge_exif_persons=exiftool_merge_persons, + use_albums_as_keywords=album_keyword, + use_persons_as_keywords=person_keyword, + keyword_template=keyword_template, + description_template=description_template, + update=update, + ignore_signature=ignore_signature, + export_db=export_db, + fileutil=fileutil, + dry_run=dry_run, + touch_file=touch_file, + convert_to_jpeg=convert_to_jpeg, + jpeg_quality=jpeg_quality, + ignore_date_modified=ignore_date_modified, + use_photokit=use_photokit, + verbose=verbose_, + exiftool_flags=exiftool_option, + jpeg_ext=jpeg_ext, + replace_keywords=replace_keywords, + render_options=render_options, + preview=export_preview or (missing and preview_if_missing), + preview_suffix=preview_suffix, + ) + for warning_ in export_results.exiftool_warning: + verbose_(f"exiftool warning for file {warning_[0]}: {warning_[1]}") + for error_ in export_results.exiftool_error: + click.echo( + click.style( + f"exiftool error for file {error_[0]}: {error_[1]}", + fg=CLI_COLOR_ERROR, + ), + err=True, + ) + for error_ in export_results.error: + click.echo( + click.style( + f"Error exporting photo ({photo.uuid}: {photo.original_filename}) as {error_[0]}: {error_[1]}", + fg=CLI_COLOR_ERROR, + ), + err=True, + ) + error += 1 + if not error or tries > retry: + results += export_results + break + else: + click.echo( + "Retrying export for photo ({photo.uuid}: {photo.original_filename})" + ) + except Exception as e: click.echo( click.style( - f"exiftool error for file {error_[0]}: {error_[1]}", + f"Error exporting photo ({photo.uuid}: {photo.original_filename}) as {filename}: {e}", fg=CLI_COLOR_ERROR, ), err=True, ) - for error_ in export_results.error: - click.echo( - click.style( - f"Error exporting photo ({photo.uuid}: {photo.original_filename}) as {error_[0]}: {error_[1]}", - fg=CLI_COLOR_ERROR, - ), - err=True, - ) - error += 1 - if not error or tries > retry: - results += export_results - break - else: - click.echo( - "Retrying export for photo ({photo.uuid}: {photo.original_filename})" - ) - # except Exception as e: - # click.echo( - # click.style( - # f"Error exporting photo ({photo.uuid}: {photo.original_filename}) as {filename}: {e}", - # fg=CLI_COLOR_ERROR, - # ), - # err=True, - # ) - # if tries > retry: - # results.error.append((str(pathlib.Path(dest) / filename), e)) - # break - # else: - # click.echo( - # f"Retrying export for photo ({photo.uuid}: {photo.original_filename})" - # ) + if tries > retry: + results.error.append((str(pathlib.Path(dest) / filename), e)) + break + else: + click.echo( + f"Retrying export for photo ({photo.uuid}: {photo.original_filename})" + ) if verbose: if update: