forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix for albums in Photos <= 4 to address issue #116

Browse Source
This commit is contained in:
Rhet Turnbull
2020-04-28 18:20:26 -07:00
parent 3fe03cd127
commit a57da2346b
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osxphotos/_version.py
View File

@@ -1,3 +1,3 @@
""" version info """ """ version info """
__version__ = "0.28.9" __version__ = "0.28.10"

18
osxphotos/photosdb.py
View File

@@ -19,17 +19,17 @@ from ._constants import (
_MOVIE_TYPE, _MOVIE_TYPE,
_PHOTO_TYPE, _PHOTO_TYPE,
_PHOTOS_3_VERSION, _PHOTOS_3_VERSION,
_PHOTOS_4_ALBUM_KIND,
_PHOTOS_4_TOP_LEVEL_ALBUM,
_PHOTOS_4_VERSION, _PHOTOS_4_VERSION,
_PHOTOS_5_ALBUM_KIND,
_PHOTOS_5_FOLDER_KIND,
_PHOTOS_5_ROOT_FOLDER_KIND,
_PHOTOS_5_SHARED_ALBUM_KIND,
_PHOTOS_5_VERSION, _PHOTOS_5_VERSION,
_TESTED_DB_VERSIONS, _TESTED_DB_VERSIONS,
_TESTED_OS_VERSIONS, _TESTED_OS_VERSIONS,
_UNKNOWN_PERSON, _UNKNOWN_PERSON,
_PHOTOS_4_ALBUM_KIND,
_PHOTOS_4_TOP_LEVEL_ALBUM,
_PHOTOS_5_ROOT_FOLDER_KIND,
_PHOTOS_5_FOLDER_KIND,
_PHOTOS_5_ALBUM_KIND,
_PHOTOS_5_SHARED_ALBUM_KIND,
) )
from ._version import __version__ from ._version import __version__
from .albuminfo import AlbumInfo, FolderInfo from .albuminfo import AlbumInfo, FolderInfo
@@ -661,8 +661,10 @@ class PhotosDB:
# build folder hierarchy # build folder hierarchy
for album, details in self._dbalbum_details.items(): for album, details in self._dbalbum_details.items():
parent_folder = details["folderUuid"] parent_folder = details["folderUuid"]
if parent_folder != _PHOTOS_4_TOP_LEVEL_ALBUM: if (
# logging.warning(f"album = {details['title']}, parent = {parent_folder}") details["albumSubclass"] == _PHOTOS_4_ALBUM_KIND
and parent_folder != _PHOTOS_4_TOP_LEVEL_ALBUM
):
folder_hierarchy = self._build_album_folder_hierarchy_4(parent_folder) folder_hierarchy = self._build_album_folder_hierarchy_4(parent_folder)
self._dbalbum_folders[album] = folder_hierarchy self._dbalbum_folders[album] = folder_hierarchy
else: else: