From 5a8105f5a02080368ad22717c064afcb0748f646 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sun, 9 Jan 2022 07:44:38 -0800 Subject: [PATCH] Fix for #575, database version 5001 --- README.md | 4 ++-- docs/.buildinfo | 2 +- docs/_static/documentation_options.js | 2 +- docs/cli.html | 2 +- docs/genindex.html | 2 +- docs/index.html | 2 +- docs/modules.html | 2 +- docs/reference.html | 2 +- docs/search.html | 2 +- osxphotos/_constants.py | 6 +++--- osxphotos/_version.py | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index fd6777b2..98cbd0f4 100644 --- a/README.md +++ b/README.md @@ -1720,7 +1720,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.44.7' +{osxphotos_version} The osxphotos version, e.g. '0.44.8' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified for @@ -3622,7 +3622,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.44.7'| +|{osxphotos_version}|The osxphotos version, e.g. '0.44.8'| |{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 64d70377..a605847a 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: 8d015accf4fee49b2508e0ec7f49d6f7 +config: fff79f4920939baa44eddc90423972ec tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 42600272..38d01eca 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.44.7', + VERSION: '0.44.8', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index 26fc3261..1601eb3a 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -6,7 +6,7 @@ - osxphotos command line interface (CLI) — osxphotos 0.44.7 documentation + osxphotos command line interface (CLI) — osxphotos 0.44.8 documentation diff --git a/docs/genindex.html b/docs/genindex.html index 1049d4c6..88561a8b 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,7 +5,7 @@ - Index — osxphotos 0.44.7 documentation + Index — osxphotos 0.44.8 documentation diff --git a/docs/index.html b/docs/index.html index 5f95c967..758a3132 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - Welcome to osxphotos’s documentation! — osxphotos 0.44.7 documentation + Welcome to osxphotos’s documentation! — osxphotos 0.44.8 documentation diff --git a/docs/modules.html b/docs/modules.html index 43255f05..071b0774 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -6,7 +6,7 @@ - osxphotos — osxphotos 0.44.7 documentation + osxphotos — osxphotos 0.44.8 documentation diff --git a/docs/reference.html b/docs/reference.html index 60a026e3..54ebff24 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -6,7 +6,7 @@ - osxphotos package — osxphotos 0.44.7 documentation + osxphotos package — osxphotos 0.44.8 documentation diff --git a/docs/search.html b/docs/search.html index dbfbb4b9..ed7702ad 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — osxphotos 0.44.7 documentation + Search — osxphotos 0.44.8 documentation diff --git a/osxphotos/_constants.py b/osxphotos/_constants.py index 5fe56a61..bbecfac3 100644 --- a/osxphotos/_constants.py +++ b/osxphotos/_constants.py @@ -20,8 +20,8 @@ UNICODE_FORMAT = "NFC" # Photos 3.0 (10.13.6) == 3301 # Photos 4.0 (10.14.5) == 4016 # Photos 4.0 (10.14.6) == 4025 -# Photos 5.0 (10.15.0) == 6000 -_TESTED_DB_VERSIONS = ["6000", "4025", "4016", "3301", "2622"] +# Photos 5.0 (10.15.0) == 6000 or 5001 +_TESTED_DB_VERSIONS = ["6000", "5001", "4025", "4016", "3301", "2622"] # database model versions (applies to Photos 5, Photos 6) # these come from PLModelVersion key in binary plist in Z_METADATA.Z_PLIST @@ -37,7 +37,7 @@ _PHOTOS_3_VERSION = "3301" # versions 5.0 and later have a different database structure _PHOTOS_4_VERSION = "4025" # latest Mojove version on 10.14.6 -_PHOTOS_5_VERSION = "5000" # seems to be current on 10.15.1 through 10.15.7 (also Big Sur and Monterey which switch to model version) +_PHOTOS_5_VERSION = "5000" # I've seen both 5001 and 6000. 6000 is most common on Catalina and up but there are some version 5001 database in the wild # Ranges for model version by Photos version _PHOTOS_5_MODEL_VERSION = [13000, 13999] diff --git a/osxphotos/_version.py b/osxphotos/_version.py index 035231f4..bc5c810c 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.44.7" +__version__ = "0.44.8"