diff --git a/README.md b/README.md index c3ff8b55..a5fcd59a 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.4' +{osxphotos_version} The osxphotos version, e.g. '0.44.6' {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.4'| +|{osxphotos_version}|The osxphotos version, e.g. '0.44.6'| |{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 806a6bbf..d5094f1c 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: abcd83bede460ffb3604a85d16e98db7 +config: 12e2b2711a035185a2f8b8e500263a8d tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 5b1c1155..2c25f333 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.4', + VERSION: '0.44.6', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index 6332fb3e..6c3f3231 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -6,7 +6,7 @@ - osxphotos command line interface (CLI) — osxphotos 0.44.4 documentation + osxphotos command line interface (CLI) — osxphotos 0.44.6 documentation diff --git a/docs/genindex.html b/docs/genindex.html index be175daf..48e02cd5 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,7 +5,7 @@ - Index — osxphotos 0.44.4 documentation + Index — osxphotos 0.44.6 documentation diff --git a/docs/index.html b/docs/index.html index d8415bb8..674ee26d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - Welcome to osxphotos’s documentation! — osxphotos 0.44.4 documentation + Welcome to osxphotos’s documentation! — osxphotos 0.44.6 documentation diff --git a/docs/modules.html b/docs/modules.html index d7532a9e..260c110a 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -6,7 +6,7 @@ - osxphotos — osxphotos 0.44.4 documentation + osxphotos — osxphotos 0.44.6 documentation diff --git a/docs/reference.html b/docs/reference.html index c95c2715..946df47d 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -6,7 +6,7 @@ - osxphotos package — osxphotos 0.44.4 documentation + osxphotos package — osxphotos 0.44.6 documentation diff --git a/docs/search.html b/docs/search.html index 6f733658..b301ff58 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — osxphotos 0.44.4 documentation + Search — osxphotos 0.44.6 documentation diff --git a/osxphotos/_constants.py b/osxphotos/_constants.py index 5b17bca6..13e79900 100644 --- a/osxphotos/_constants.py +++ b/osxphotos/_constants.py @@ -258,6 +258,7 @@ EXTENDED_ATTRIBUTE_NAMES_QUOTED = [f"'{x}'" for x in EXTENDED_ATTRIBUTE_NAMES] OSXPHOTOS_EXPORT_DB = ".osxphotos_export.db" # bit flags for burst images ("burstPickType") +BURST_PICK_TYPE_NONE = 0b0 # 0: sometimes used for single images with a burst UUID BURST_NOT_SELECTED = 0b10 # 2: burst image is not selected BURST_DEFAULT_PICK = 0b100 # 4: burst image is the one Photos picked to be key image before any selections made BURST_SELECTED = 0b1000 # 8: burst image is selected diff --git a/osxphotos/_version.py b/osxphotos/_version.py index f953a16b..83550690 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.44.5" +__version__ = "0.44.6" diff --git a/osxphotos/photosdb/photosdb.py b/osxphotos/photosdb/photosdb.py index a6eec9ed..96640b5d 100644 --- a/osxphotos/photosdb/photosdb.py +++ b/osxphotos/photosdb/photosdb.py @@ -27,11 +27,11 @@ from .._constants import ( _PHOTO_TYPE, _PHOTOS_3_VERSION, _PHOTOS_4_ALBUM_KIND, - _PHOTOS_4_ROOT_FOLDER, - _PHOTOS_4_TOP_LEVEL_ALBUMS, _PHOTOS_4_ALBUM_TYPE_ALBUM, _PHOTOS_4_ALBUM_TYPE_PROJECT, _PHOTOS_4_ALBUM_TYPE_SLIDESHOW, + _PHOTOS_4_ROOT_FOLDER, + _PHOTOS_4_TOP_LEVEL_ALBUMS, _PHOTOS_4_VERSION, _PHOTOS_5_ALBUM_KIND, _PHOTOS_5_FOLDER_KIND, @@ -42,6 +42,7 @@ from .._constants import ( _TESTED_OS_VERSIONS, _UNKNOWN_PERSON, BURST_KEY, + BURST_PICK_TYPE_NONE, BURST_SELECTED, TIME_DELTA, ) @@ -3062,6 +3063,7 @@ class PhotosDB: if self._dbphotos[p]["burst"] and not ( self._dbphotos[p]["burstPickType"] & BURST_SELECTED or self._dbphotos[p]["burstPickType"] & BURST_KEY + or self._dbphotos[p]["burstPickType"] == BURST_PICK_TYPE_NONE ): # not a key/selected burst photo, don't include in returned results continue