diff --git a/README.md b/README.md index 838db64a..4bb0a58f 100644 --- a/README.md +++ b/README.md @@ -1236,7 +1236,11 @@ Substitution Description {keyword} Keyword(s) assigned to photo {person} Person(s) / face(s) in a photo {label} Image categorization label associated with a photo - (Photos 5+ only) + (Photos 5+ only). Labels are added automatically by + Photos using machine learning algorithms to + categorize images. These are not the same as + {keyword} which refers to the user-defined + keywords/tags applied in Photos. {label_normalized} All lower case version of 'label' (Photos 5+ only) {comment} Comment(s) on shared Photos; format is 'Person name: @@ -2893,7 +2897,7 @@ The following template field substitutions are availabe for use with `PhotoInfo. |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| |{keyword}|Keyword(s) assigned to photo| |{person}|Person(s) / face(s) in a photo| -|{label}|Image categorization label associated with a photo (Photos 5+ only)| +|{label}|Image categorization label associated with a photo (Photos 5+ only). Labels are added automatically by Photos using machine learning algorithms to categorize images. These are not the same as {keyword} which refers to the user-defined keywords/tags applied in Photos.| |{label_normalized}|All lower case version of 'label' (Photos 5+ only)| |{comment}|Comment(s) on shared Photos; format is 'Person name: comment text' (Photos 5+ only)| |{exiftool}|Format: '{exiftool:GROUP:TAGNAME}'; use exiftool (https://exiftool.org) to extract metadata, in form GROUP:TAGNAME, from image. E.g. '{exiftool:EXIF:Make}' to get camera make, or {exiftool:IPTC:Keywords} to extract keywords. See https://exiftool.org/TagNames/ for list of valid tag names. You must specify group (e.g. EXIF, IPTC, etc) as used in `exiftool -G`. exiftool must be installed in the path to use this template.| diff --git a/docs/.buildinfo b/docs/.buildinfo index 19d3c773..880dba84 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: 456ab9bf5a36a59a5d7b68a97d5f6583 +config: d8381561e4b55688141d3bad9c7d6dc7 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index e2152d19..54a3eee3 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code — osxphotos 0.42.1 documentation + Overview: module code — osxphotos 0.42.2 documentation diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 85f44be7..f855fdaf 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '0.42.1', + VERSION: '0.42.2', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index ec43fc44..e0bb5f10 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -5,7 +5,7 @@ - osxphotos command line interface (CLI) — osxphotos 0.42.1 documentation + osxphotos command line interface (CLI) — osxphotos 0.42.2 documentation diff --git a/docs/genindex.html b/docs/genindex.html index 07c40ae6..00b41c4d 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,7 +5,7 @@ - Index — osxphotos 0.42.1 documentation + Index — osxphotos 0.42.2 documentation diff --git a/docs/index.html b/docs/index.html index 4b574147..224545ac 100644 --- a/docs/index.html +++ b/docs/index.html @@ -5,7 +5,7 @@ - Welcome to osxphotos’s documentation! — osxphotos 0.42.1 documentation + Welcome to osxphotos’s documentation! — osxphotos 0.42.2 documentation diff --git a/docs/modules.html b/docs/modules.html index 47afa296..4480a154 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -5,7 +5,7 @@ - osxphotos — osxphotos 0.42.1 documentation + osxphotos — osxphotos 0.42.2 documentation diff --git a/docs/osxphotos.pdf b/docs/osxphotos.pdf index 05825203..08c79f13 100644 Binary files a/docs/osxphotos.pdf and b/docs/osxphotos.pdf differ diff --git a/docs/reference.html b/docs/reference.html index e4f58366..7c41d46f 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -5,7 +5,7 @@ - osxphotos package — osxphotos 0.42.1 documentation + osxphotos package — osxphotos 0.42.2 documentation diff --git a/docs/search.html b/docs/search.html index 071e2ac6..6b76dc58 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — osxphotos 0.42.1 documentation + Search — osxphotos 0.42.2 documentation diff --git a/osxphotos/phototemplate.py b/osxphotos/phototemplate.py index b4792c4c..6bed3f07 100644 --- a/osxphotos/phototemplate.py +++ b/osxphotos/phototemplate.py @@ -137,7 +137,9 @@ TEMPLATE_SUBSTITUTIONS_MULTI_VALUED = { "{folder_album}": "Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder", "{keyword}": "Keyword(s) assigned to photo", "{person}": "Person(s) / face(s) in a photo", - "{label}": "Image categorization label associated with a photo (Photos 5+ only)", + "{label}": "Image categorization label associated with a photo (Photos 5+ only). " + "Labels are added automatically by Photos using machine learning algorithms to categorize images. " + "These are not the same as {keyword} which refers to the user-defined keywords/tags applied in Photos.", "{label_normalized}": "All lower case version of 'label' (Photos 5+ only)", "{comment}": "Comment(s) on shared Photos; format is 'Person name: comment text' (Photos 5+ only)", "{exiftool}": "Format: '{exiftool:GROUP:TAGNAME}'; use exiftool (https://exiftool.org) to extract metadata, in form GROUP:TAGNAME, from image. "