diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 246c2734..a0029128 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.55.1 +current_version = 0.55.2 parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} diff --git a/API_README.md b/API_README.md index 3c00f879..2982dd93 100644 --- a/API_README.md +++ b/API_README.md @@ -2012,7 +2012,7 @@ cog.out(get_template_field_table()) |{cr}|A carriage return: '\r'| |{crlf}|A carriage return + line feed: '\r\n'| |{tab}|:A tab: '\t'| -|{osxphotos_version}|The osxphotos version, e.g. '0.55.1'| +|{osxphotos_version}|The osxphotos version, e.g. '0.55.2'| |{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 e251ee94..9815ccf8 100644 --- a/README.md +++ b/README.md @@ -2008,7 +2008,7 @@ Substitution Description {cr} A carriage return: '\r' {crlf} A carriage return + line feed: '\r\n' {tab} :A tab: '\t' -{osxphotos_version} The osxphotos version, e.g. '0.55.1' +{osxphotos_version} The osxphotos version, e.g. '0.55.2' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -2492,7 +2492,7 @@ The following template field substitutions are availabe for use the templating s |{cr}|A carriage return: '\r'| |{crlf}|A carriage return + line feed: '\r\n'| |{tab}|:A tab: '\t'| -|{osxphotos_version}|The osxphotos version, e.g. '0.55.1'| +|{osxphotos_version}|The osxphotos version, e.g. '0.55.2'| |{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 3d4b3daa..45bb3548 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: a55d453f788c90d2b8c08230a94b78cb +config: e16dca91a167d1b8d610ea04175e7a9b tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index d1c4d5c1..d5aa6c6f 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.55.1 documentation + Overview: module code - osxphotos 0.55.2 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/_modules/osxphotos/photoinfo.html b/docs/_modules/osxphotos/photoinfo.html index ff1eeee6..89fe4e29 100644 --- a/docs/_modules/osxphotos/photoinfo.html +++ b/docs/_modules/osxphotos/photoinfo.html @@ -5,7 +5,7 @@ - osxphotos.photoinfo - osxphotos 0.55.1 documentation + osxphotos.photoinfo - osxphotos 0.55.2 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation @@ -478,7 +478,7 @@ def _get_predicted_path_edited_4(self) -> str | None: """return predicted path_edited for Photos <= 4""" - edit_id = self._info["edit_resource_id"] + edit_id = self._info["edit_resource_id_photo"] folder_id, file_id, nn_id = _get_resource_loc(edit_id) # figure out what kind it is and build filename library = self._db._library_path @@ -554,21 +554,24 @@ def _get_predicted_path_edited_live_photo_4(self) -> str | None: """return predicted path_edited for Photos <= 4""" - edit_id = self._info["edit_resource_id"] - folder_id, file_id, nn_id = _get_resource_loc(edit_id) - # figure out what kind it is and build filename - library = self._db._library_path - filename = f"videocomplementoutput_{file_id}.mov" - return os.path.join( - library, "resources", "media", "version", folder_id, nn_id, filename - ) + # need the resource id for the video, not the photo (edit_resource_id is for photo) + if edit_id := self._info["edit_resource_id_video"]: + folder_id, file_id, nn_id = _get_resource_loc(edit_id) + # figure out what kind it is and build filename + library = self._db._library_path + filename = f"videocomplementoutput_{file_id}.mov" + return os.path.join( + library, "resources", "media", "version", folder_id, nn_id, filename + ) + else: + return None def _path_edited_4_live_photo(self): """return path_edited_live_photo for Photos <= 4""" if self._db._db_version > _PHOTOS_4_VERSION: raise RuntimeError("Wrong database format!") photopath = self._get_predicted_path_edited_live_photo_4() - if not os.path.isfile(photopath): + if photopath is not None and not os.path.isfile(photopath): # the heuristic failed, so try to find the file rootdir = pathlib.Path(photopath).parent.parent filename = pathlib.Path(photopath).name diff --git a/docs/_modules/osxphotos/photosdb/photosdb.html b/docs/_modules/osxphotos/photosdb/photosdb.html index d72be11d..c92afd7f 100644 --- a/docs/_modules/osxphotos/photosdb/photosdb.html +++ b/docs/_modules/osxphotos/photosdb/photosdb.html @@ -5,7 +5,7 @@ - osxphotos.photosdb.photosdb - osxphotos 0.55.1 documentation + osxphotos.photosdb.photosdb - osxphotos 0.55.2 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation @@ -1519,16 +1519,30 @@ and row[1] != "UNADJUSTED" and row[6] == 2 ): - if "edit_resource_id" in self._dbphotos[uuid]: - if is_debug(): - logging.debug( - f"WARNING: found more than one edit_resource_id for " - f"UUID {row[0]},adjustmentUUID {row[1]}, modelID {row[2]}" - ) - # Sometimes the library has multiple edits for a photo - # Not sure why, but we'll just use the most recent one - self._dbphotos[uuid]["edit_resource_id"] = row[2] - self._dbphotos[uuid]["UTI_edited"] = row[4] + resource_type = row[7] + # UTI_edited will be set to the appropriate UTI for the edited resource below + # a live photo that's edited will have both a photo and video resource but the photo + # UTI will be used for the edited live photo, see #859 + if resource_type == 4: + # photo + if "edit_resource_id_photo" in self._dbphotos[uuid]: + if is_debug(): + logging.debug( + f"WARNING: found more than one edit_resource_id_photo for " + f"UUID {row[0]},adjustmentUUID {row[1]}, modelID {row[2]}" + ) + self._dbphotos[uuid]["edit_resource_id_photo"] = row[2] + self._dbphotos[uuid]["UTI_edited_photo"] = row[4] + elif resource_type == 8: + # video + if "edit_resource_id_video" in self._dbphotos[uuid]: + if is_debug(): + logging.debug( + f"WARNING: found more than one edit_resource_id_video for " + f"UUID {row[0]},adjustmentUUID {row[1]}, modelID {row[2]}" + ) + self._dbphotos[uuid]["edit_resource_id_video"] = row[2] + self._dbphotos[uuid]["UTI_edited_video"] = row[4] # get details on external edits c.execute( @@ -1581,9 +1595,27 @@ ) # init any uuids that had no edits or live photos + # also initialized UTI_edited and edit_resource_id for uuid in self._dbphotos: - if "edit_resource_id" not in self._dbphotos[uuid]: - self._dbphotos[uuid]["edit_resource_id"] = None + if "edit_resource_id_photo" not in self._dbphotos[uuid]: + self._dbphotos[uuid]["edit_resource_id_photo"] = None + if "edit_resource_id_video" not in self._dbphotos[uuid]: + self._dbphotos[uuid]["edit_resource_id_video"] = None + if "UTI_edited_photo" not in self._dbphotos[uuid]: + self._dbphotos[uuid]["UTI_edited_photo"] = None + if "UTI_edited_video" not in self._dbphotos[uuid]: + self._dbphotos[uuid]["UTI_edited_video"] = None + # UTI_edited will be set to the appropriate UTI for the edited resource below + # a live photo that's edited will have both a photo and video resource but the photo + # UTI will be used for the edited live photo + self._dbphotos[uuid]["UTI_edited"] = ( + self._dbphotos[uuid]["UTI_edited_photo"] + or self._dbphotos[uuid]["UTI_edited_video"] + ) + self._dbphotos[uuid]["edit_resource_id"] = ( + self._dbphotos[uuid]["edit_resource_id_photo"] + or self._dbphotos[uuid]["edit_resource_id_video"] + ) if "live_model_id" not in self._dbphotos[uuid]: self._dbphotos[uuid]["live_model_id"] = None self._dbphotos[uuid]["modeResourceIsOnDisk"] = None @@ -2368,7 +2400,10 @@ info["raw_info"] = None # Photos 4 # Photos 4 only - info["edit_resource_id"] = None + info["edit_resource_id_photo"] = None + info["edit_resource_id_video"] = None + info["UTI_edited_photo"] = None + info["UTI_edited_video"] = None self._dbphotos[uuid] = info diff --git a/docs/_sources/template_help.rst.txt b/docs/_sources/template_help.rst.txt index 2657757a..42b4c8d9 100644 --- a/docs/_sources/template_help.rst.txt +++ b/docs/_sources/template_help.rst.txt @@ -357,7 +357,7 @@ Template Substitutions * - {tab} - :A tab: '\t' * - {osxphotos_version} - - The osxphotos version, e.g. '0.55.1' + - The osxphotos version, e.g. '0.55.2' * - {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 e576c4e3..310ead07 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.55.1', + VERSION: '0.55.2', LANGUAGE: 'en', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index 0117300e..f08a269e 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -6,7 +6,7 @@ - OSXPhotos Command Line Interface (CLI) - osxphotos 0.55.1 documentation + OSXPhotos Command Line Interface (CLI) - osxphotos 0.55.2 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/genindex.html b/docs/genindex.html index d68169a0..231ce2ee 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -4,7 +4,7 @@ - Index - osxphotos 0.55.1 documentation + Index - osxphotos 0.55.2 documentation @@ -122,7 +122,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -145,7 +145,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/index.html b/docs/index.html index 9d77ed9f..20f7c90e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/overview.html b/docs/overview.html index ae6d4442..0c8fcf7d 100644 --- a/docs/overview.html +++ b/docs/overview.html @@ -6,7 +6,7 @@ - OSXPhotos - osxphotos 0.55.1 documentation + OSXPhotos - osxphotos 0.55.2 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/package_overview.html b/docs/package_overview.html index c2752e98..82f8ccc6 100644 --- a/docs/package_overview.html +++ b/docs/package_overview.html @@ -6,7 +6,7 @@ - OSXPhotos Python Package Overview - osxphotos 0.55.1 documentation + OSXPhotos Python Package Overview - osxphotos 0.55.2 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/py-modindex.html b/docs/py-modindex.html index c356a9a2..95043852 100644 --- a/docs/py-modindex.html +++ b/docs/py-modindex.html @@ -4,7 +4,7 @@ - Python Module Index - osxphotos 0.55.1 documentation + Python Module Index - osxphotos 0.55.2 documentation @@ -122,7 +122,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -145,7 +145,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/reference.html b/docs/reference.html index bb55f2a0..831e9c9d 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -6,7 +6,7 @@ - OSXPhotos python API - osxphotos 0.55.1 documentation + OSXPhotos python API - osxphotos 0.55.2 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/search.html b/docs/search.html index 5f6a615b..25d7c3bb 100644 --- a/docs/search.html +++ b/docs/search.html @@ -4,7 +4,7 @@ - Search - osxphotos 0.55.1 documentation + Search - osxphotos 0.55.2 documentation @@ -121,7 +121,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -144,7 +144,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docs/template_help.html b/docs/template_help.html index e8a95930..eac13509 100644 --- a/docs/template_help.html +++ b/docs/template_help.html @@ -6,7 +6,7 @@ - OSXPhotos Template System - osxphotos 0.55.1 documentation + OSXPhotos Template System - osxphotos 0.55.2 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation @@ -608,7 +608,7 @@

{osxphotos_version}

-

The osxphotos version, e.g. ‘0.55.1’

+

The osxphotos version, e.g. ‘0.55.2’

{osxphotos_cmd_line}

The full command line used to run osxphotos

diff --git a/docs/tutorial.html b/docs/tutorial.html index 8d82bb2d..e3a7576a 100644 --- a/docs/tutorial.html +++ b/docs/tutorial.html @@ -6,7 +6,7 @@ - OSXPhotos Tutorial - osxphotos 0.55.1 documentation + OSXPhotos Tutorial - osxphotos 0.55.2 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.55.1 documentation
 +
osxphotos 0.55.2 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.55.1 documentation + osxphotos 0.55.2 documentation diff --git a/docsrc/source/template_help.rst b/docsrc/source/template_help.rst index 2657757a..42b4c8d9 100644 --- a/docsrc/source/template_help.rst +++ b/docsrc/source/template_help.rst @@ -357,7 +357,7 @@ Template Substitutions * - {tab} - :A tab: '\t' * - {osxphotos_version} - - The osxphotos version, e.g. '0.55.1' + - The osxphotos version, e.g. '0.55.2' * - {osxphotos_cmd_line} - The full command line used to run osxphotos * - {album} diff --git a/osxphotos/_version.py b/osxphotos/_version.py index 32372a9a..efc3dbd4 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.55.1" +__version__ = "0.55.2" diff --git a/osxphotos/docs/docs.zip b/osxphotos/docs/docs.zip index b09ea9b5..07bd7569 100644 Binary files a/osxphotos/docs/docs.zip and b/osxphotos/docs/docs.zip differ