From 1173b6c0f294e12269d4015d2823b590df6f9696 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sun, 15 May 2022 09:48:55 -0700 Subject: [PATCH] Added JSON, SQLite report formats, added command --- API_README.md | 2 +- README.md | 19 +- docs/.buildinfo | 2 +- docs/_modules/index.html | 6 +- docs/_modules/osxphotos/exiftool.html | 567 +++++++++++++-------- docs/_modules/osxphotos/export_db.html | 139 ++++- docs/_modules/osxphotos/photoexporter.html | 101 ++-- docs/_modules/osxphotos/phototemplate.html | 146 +++--- docs/_sources/template_help.rst.txt | 2 +- docs/_static/documentation_options.js | 2 +- docs/cli.html | 29 +- docs/genindex.html | 54 +- docs/index.html | 6 +- docs/objects.inv | Bin 6210 -> 6253 bytes docs/overview.html | 6 +- docs/package_overview.html | 6 +- docs/py-modindex.html | 6 +- docs/reference.html | 32 +- docs/search.html | 6 +- docs/searchindex.js | 2 +- docs/template_help.html | 8 +- docs/tutorial.html | 6 +- docsrc/source/template_help.rst | 2 +- osxphotos/_version.py | 2 +- osxphotos/docs/docs.zip | Bin 1175014 -> 1178850 bytes 25 files changed, 754 insertions(+), 397 deletions(-) diff --git a/API_README.md b/API_README.md index 596ca45e..839b4180 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.48.8'| +|{osxphotos_version}|The osxphotos version, e.g. '0.49.0'| |{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 fe0c9bb6..0143b86c 100644 --- a/README.md +++ b/README.md @@ -1167,8 +1167,19 @@ Options: iTerm2 (use with Terminal.app). This is faster and more reliable than the default AppleScript interface. - --report REPORT_FILE Write a CSV formatted report of all files that - were exported. + --report REPORT_FILE Write a report of all files that were + exported. The extension of the report filename + will be used to determine the format. Valid + extensions are: .csv (CSV file), .json (JSON), + .db and .sqlite (SQLite database). REPORT_FILE + may be a template string (see Templating + System), for example, --report + 'export_{today.date}.csv' will write a CSV + report file named with today's date. See also + --append. + --append If used with --report, add data to existing + report file instead of overwriting it. See + also --report. --cleanup Cleanup export directory by deleting any files which were not included in this export set. For example, photos which had previously been @@ -1835,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.48.8' +{osxphotos_version} The osxphotos version, e.g. '0.49.0' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -4001,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.48.8'| +|{osxphotos_version}|The osxphotos version, e.g. '0.49.0'| |{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 89d87827..9771f636 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: 086baaeeada8b0921ec5f22fb7d0bc48 +config: f76f49020ab20df8f91fe1d6222f85aa tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index d7bef045..41d53b8b 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.48.8 documentation + Overview: module code - osxphotos 0.49.0 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.48.8 documentation
 +
osxphotos 0.49.0 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.48.8 documentation + osxphotos 0.49.0 documentation +
+ + + + + + + \ No newline at end of file diff --git a/docs/_modules/osxphotos/export_db.html b/docs/_modules/osxphotos/export_db.html index fa802663..62708b65 100644 --- a/docs/_modules/osxphotos/export_db.html +++ b/docs/_modules/osxphotos/export_db.html @@ -5,7 +5,7 @@ - osxphotos.export_db - osxphotos 0.47.13 documentation + osxphotos.export_db - osxphotos 0.49.0 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.47.13 documentation
 +
osxphotos 0.49.0 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.47.13 documentation + osxphotos 0.49.0 documentation