diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2ad75819..22875365 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.58.1 +current_version = 0.58.2 parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} diff --git a/API_README.md b/API_README.md index 69b6e346..9112f454 100644 --- a/API_README.md +++ b/API_README.md @@ -2373,7 +2373,7 @@ cog.out(get_template_field_table()) |{cr}|A carriage return: '\r'| |{crlf}|A carriage return + line feed: '\r\n'| |{tab}|:A tab: '\t'| -|{osxphotos_version}|The osxphotos version, e.g. '0.58.1'| +|{osxphotos_version}|The osxphotos version, e.g. '0.58.2'| |{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/README.md b/README.md index b6ab1bd3..54ce78e3 100644 --- a/README.md +++ b/README.md @@ -2094,7 +2094,7 @@ Substitution Description {cr} A carriage return: '\r' {crlf} A carriage return + line feed: '\r\n' {tab} :A tab: '\t' -{osxphotos_version} The osxphotos version, e.g. '0.58.1' +{osxphotos_version} The osxphotos version, e.g. '0.58.2' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -2581,7 +2581,7 @@ The following template field substitutions are availabe for use the templating s |{cr}|A carriage return: '\r'| |{crlf}|A carriage return + line feed: '\r\n'| |{tab}|:A tab: '\t'| -|{osxphotos_version}|The osxphotos version, e.g. '0.58.1'| +|{osxphotos_version}|The osxphotos version, e.g. '0.58.2'| |{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/docs/.buildinfo b/docs/.buildinfo index 13a44eec..b73d9c39 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 3cf8b8bacaa10787e65619ef2597d518 +config: dd34c3ea1cc9003033a129207a3fd912 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index 10e575bb..8d86ddf1 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.58.1 documentation + Overview: module code - osxphotos 0.58.2 documentation @@ -123,7 +123,7 @@
@@ -146,7 +146,7 @@
@@ -147,7 +147,7 @@

This will set the title to “California vacation 2023 2023-02-20 001”, and so on, the description to the reverse geolocation place name, -and the keywords to “Family”, “Travel”, and any existing keywords of the photo.

+and add the keywords to “Family”, “Travel”.

–title, –description, and –keyword may be any valid template string. See https://rhettbull.github.io/osxphotos/template_help.html or osxphotos docs for more information on the osxphotos template system.

@@ -835,7 +835,13 @@ or osxphotos docs for more information on the osxphotos template sy
--keyword <KEYWORD_TEMPLATE>#
-

Set keywords of photo. May be specified multiple times.

+

Add keywords to photo. May be specified multiple times.

+
+ +
+
+--replace-keywords#
+

When specified with –keyword, replace existing keywords. Default is to add to existing keywords.

diff --git a/docs/genindex.html b/docs/genindex.html index 26be27d7..729a77f7 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -4,7 +4,7 @@ - Index - osxphotos 0.58.1 documentation + Index - osxphotos 0.58.2 documentation @@ -122,7 +122,7 @@
@@ -145,7 +145,7 @@
@@ -147,7 +147,7 @@
@@ -147,7 +147,7 @@
@@ -147,7 +147,7 @@
@@ -145,7 +145,7 @@
@@ -147,7 +147,7 @@
@@ -144,7 +144,7 @@
@@ -147,7 +147,7 @@
@@ -147,7 +147,7 @@