From 4ec9f6d3e606f72962e351432a64a24ff9153d87 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Tue, 17 May 2022 20:52:59 -0700 Subject: [PATCH] Implemented #689 --- API_README.md | 2 +- README.md | 6 +- docs/.buildinfo | 2 +- docs/_modules/index.html | 6 +- docs/_modules/osxphotos/export_db.html | 6 +- docs/_sources/template_help.rst.txt | 2 +- docs/_sources/tutorial.rst.txt | 4 +- docs/_static/documentation_options.js | 2 +- docs/cli.html | 96 ++++++++++++++++++- docs/genindex.html | 128 ++++++++++++++++++++++++- docs/index.html | 7 +- docs/objects.inv | Bin 6253 -> 6424 bytes docs/overview.html | 6 +- docs/package_overview.html | 6 +- docs/py-modindex.html | 6 +- docs/reference.html | 6 +- docs/search.html | 6 +- docs/searchindex.js | 2 +- docs/template_help.html | 8 +- docs/tutorial.html | 10 +- docsrc/source/template_help.rst | 2 +- osxphotos/_version.py | 2 +- osxphotos/cli/about.py | 20 ++++ osxphotos/cli/common.py | 11 ++- osxphotos/cli/docs.py | 18 +++- osxphotos/docs/docs.zip | Bin 1178850 -> 1180442 bytes requirements.txt | 3 +- setup.py | 1 + 28 files changed, 308 insertions(+), 60 deletions(-) diff --git a/API_README.md b/API_README.md index 839b4180..3842ecaa 100644 --- a/API_README.md +++ b/API_README.md @@ -1943,7 +1943,7 @@ cog.out(get_template_field_table()) |{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.49.0'| +|{osxphotos_version}|The osxphotos version, e.g. '0.49.1'| |{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 bd49e402..37a583ff 100644 --- a/README.md +++ b/README.md @@ -378,7 +378,7 @@ Photos tracks a tremendous amount of metadata associated with photos in the libr `osxphotos export /path/to/export --exiftool` -This will write basic metadata such as keywords, persons, and GPS location to the exported files. osxphotos includes several additional options that can be used in conjunction with `--exiftool` to modify the metadata that is written by `exiftool`. For example, you can use the `--keyword-template` option to specify custom keywords (again, via the osxphotos template system). For example, to use the folder and album a photo is in to create hierarchical keywords in the format used by Lightroom Classic: +This will write basic metadata such as keywords, persons, and GPS location to the exported files. osxphotos includes several additional options that can be used in conjunction with `--exiftool` to modify the metadata that is written by `exiftool`. For example, you can use the `--keyword-template` option to specify custom keywords (again, via the osxphotos template system). For example, to use the folder and album a photo is in to create hierarchical keywords in the format used by Lightroom Classic: osxphotos export /path/to/export --exiftool --keyword-template "{folder_album(>)}" │ │ @@ -1846,7 +1846,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.49.0' +{osxphotos_version} The osxphotos version, e.g. '0.49.1' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -4012,7 +4012,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.49.0'| +|{osxphotos_version}|The osxphotos version, e.g. '0.49.1'| |{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 9771f636..ac59aef4 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: f76f49020ab20df8f91fe1d6222f85aa +config: a77e6404d00931c687c8320621f91963 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index 41d53b8b..663a07a7 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.49.0 documentation + Overview: module code - osxphotos 0.49.1 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.49.0 documentation
+
osxphotos 0.49.1 documentation
@@ -146,7 +146,7 @@
@@ -146,7 +146,7 @@
@@ -147,7 +147,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 @@