diff --git a/API_README.md b/API_README.md index 4964afad..202d17e5 100644 --- a/API_README.md +++ b/API_README.md @@ -2005,7 +2005,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.50.6'| +|{osxphotos_version}|The osxphotos version, e.g. '0.50.7'| |{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 c5c1c1f7..c934e79a 100644 --- a/README.md +++ b/README.md @@ -1922,7 +1922,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.50.6' +{osxphotos_version} The osxphotos version, e.g. '0.50.7' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -2399,7 +2399,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.50.6'| +|{osxphotos_version}|The osxphotos version, e.g. '0.50.7'| |{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 8cb57f9e..c909ec49 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: bc2ebdae96f3c2b01aeb225d9e4763f7 +config: f2ae6be4ea2bde3be1f128914369ee19 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index 4e721cf2..a4308452 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.50.6 documentation + Overview: module code - osxphotos 0.50.7 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.50.6 documentation
+
osxphotos 0.50.7 documentation
@@ -146,7 +146,7 @@ + + + + + + + \ No newline at end of file diff --git a/docs/_modules/osxphotos/photosdb/photosdb.html b/docs/_modules/osxphotos/photosdb/photosdb.html index 82a34c15..08e7f533 100644 --- a/docs/_modules/osxphotos/photosdb/photosdb.html +++ b/docs/_modules/osxphotos/photosdb/photosdb.html @@ -5,7 +5,7 @@ - osxphotos.photosdb.photosdb - osxphotos 0.50.4 documentation + osxphotos.photosdb.photosdb - osxphotos 0.50.7 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.50.4 documentation
+
osxphotos 0.50.7 documentation
@@ -146,7 +146,7 @@ + return sqlite_open_ro(self._tmp_db)
def _copy_db_file(self, fname): """copies the sqlite database file to a temp file""" @@ -838,7 +837,7 @@ self._photos_ver = 4 # only used in Photos 5+ - (conn, c) = _open_sql_file(self._tmp_db) + (conn, c) = sqlite_open_ro(self._tmp_db) # get info to associate persons with photos # then get detected faces in each photo and link to persons @@ -1789,7 +1788,7 @@ logging.debug(f"_process_database5") verbose = self._verbose verbose(f"Processing database.") - (conn, c) = _open_sql_file(self._tmp_db) + (conn, c) = sqlite_open_ro(self._tmp_db) # some of the tables/columns have different names in different versions of Photos photos_ver = get_db_model_version(self._tmp_db) diff --git a/docs/_sources/template_help.rst.txt b/docs/_sources/template_help.rst.txt index 36d05e1d..ec5085fc 100644 --- a/docs/_sources/template_help.rst.txt +++ b/docs/_sources/template_help.rst.txt @@ -346,7 +346,7 @@ Template Substitutions * - {crlf} - a carriage return + line feed: '\r\n' * - {osxphotos_version} - - The osxphotos version, e.g. '0.50.6' + - The osxphotos version, e.g. '0.50.7' * - {osxphotos_cmd_line} - The full command line used to run osxphotos * - {album} diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 12049730..06538b28 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.50.6', + VERSION: '0.50.7', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index f951f9e2..e89c0a5b 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -6,7 +6,7 @@ - OSXPhotos Command Line Interface (CLI) - osxphotos 0.50.6 documentation + OSXPhotos Command Line Interface (CLI) - osxphotos 0.50.7 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.50.6 documentation
+
osxphotos 0.50.7 documentation
@@ -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 @@