From 64bb07a0267f2fdd024a7150fe1788b07218ac2f Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Fri, 18 Jun 2021 14:03:59 -0700 Subject: [PATCH] Added additional info to error message for --add-to-album --- README.md | 4 ++-- osxphotos/_version.py | 2 +- osxphotos/cli.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 23801f26..acb0fc9d 100644 --- a/README.md +++ b/README.md @@ -1559,7 +1559,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.36' +{osxphotos_version} The osxphotos version, e.g. '0.42.37' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified for @@ -3347,7 +3347,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.36'| +|{osxphotos_version}|The osxphotos version, e.g. '0.42.37'| |{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 ba5ac208..dad0608b 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.42.36" +__version__ = "0.42.37" diff --git a/osxphotos/cli.py b/osxphotos/cli.py index 1c3626cd..9193d930 100644 --- a/osxphotos/cli.py +++ b/osxphotos/cli.py @@ -2124,7 +2124,7 @@ def query( album_query.add_list(photos) except Exception as e: click.secho( - f"Error adding photos to album {add_to_album}", + f"Error adding photos to album {add_to_album}: {e}", fg=CLI_COLOR_ERROR, err=True, )