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

More PhotoInfo.albums refactoring, closes #169

Browse Source
This commit is contained in:
Rhet Turnbull
2020-06-21 08:18:11 -07:00
parent 32806c8459
commit 538bac7ade
8 changed files with 52 additions and 31 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__ = "0.29.24"
__version__ = "0.29.25"

60
osxphotos/photoinfo/photoinfo.py
View File

@@ -22,6 +22,7 @@ from .._constants import (
_MOVIE_TYPE,
_PHOTO_TYPE,
_PHOTOS_4_ALBUM_KIND,
_PHOTOS_4_ROOT_FOLDER,
_PHOTOS_4_VERSION,
_PHOTOS_5_ALBUM_KIND,
_PHOTOS_5_SHARED_ALBUM_KIND,
@@ -347,17 +348,10 @@ class PhotoInfo:
try:
return self._albums
except AttributeError:
self._albums = []
album_kinds = (
[_PHOTOS_4_ALBUM_KIND]
if self._db._db_version <= _PHOTOS_4_VERSION
else [_PHOTOS_5_ALBUM_KIND, _PHOTOS_5_SHARED_ALBUM_KIND]
album_uuids = self._get_album_uuids()
self._albums = list(
{self._db._dbalbum_details[album]["title"] for album in album_uuids}
)
for album in self._info["albums"]:
detail = self._db._dbalbum_details[album]
if detail["kind"] in album_kinds and not detail["intrash"]:
self._albums.append(detail["title"])
return self._albums
@property
@@ -366,17 +360,10 @@ class PhotoInfo:
try:
return self._album_info
except AttributeError:
self._album_info = []
album_kinds = (
[_PHOTOS_4_ALBUM_KIND]
if self._db._db_version <= _PHOTOS_4_VERSION
else [_PHOTOS_5_ALBUM_KIND, _PHOTOS_5_SHARED_ALBUM_KIND]
)
for album in self._info["albums"]:
detail = self._db._dbalbum_details[album]
if detail["kind"] in album_kinds and not detail["intrash"]:
self._album_info.append(AlbumInfo(db=self._db, uuid=album))
album_uuids = self._get_album_uuids()
self._album_info = [
AlbumInfo(db=self._db, uuid=album) for album in album_uuids
]
return self._album_info
@property
@@ -677,6 +664,37 @@ class PhotoInfo:
""" Returns latitude, in degrees """
return self._info["latitude"]
def _get_album_uuids(self):
""" Return list of album UUIDs this photo is found in
Filters out albums in the trash and any special album types
Returns: list of album UUIDs
"""
if self._db._db_version <= _PHOTOS_4_VERSION:
version4 = True
album_kind = [_PHOTOS_4_ALBUM_KIND]
else:
version4 = False
album_kind = [_PHOTOS_5_SHARED_ALBUM_KIND, _PHOTOS_5_ALBUM_KIND]
album_list = []
for album in self._info["albums"]:
detail = self._db._dbalbum_details[album]
if (
detail["kind"] in album_kind
and not detail["intrash"]
and (
not version4
# in Photos <= 4, special albums like "printAlbum" have kind _PHOTOS_4_ALBUM_KIND
# but should not be listed here; they can be distinguished by looking
# for folderUuid of _PHOTOS_4_ROOT_FOLDER as opposed to _PHOTOS_4_TOP_LEVEL_ALBUM
or (version4 and detail["folderUuid"] != _PHOTOS_4_ROOT_FOLDER)
)
):
album_list.append(album)
return album_list
def __repr__(self):
return f"osxphotos.{self.__class__.__name__}(db={self._db}, uuid='{self._uuid}', info={self._info})"

6
osxphotos/photosdb/photosdb.py
View File

@@ -2084,7 +2084,7 @@ class PhotosDB:
Args:
shared: boolean; if True, returns shared albums, else normal albums
Returns: list of album names
Returns: list of album UUIDs
"""
if self._db_version <= _PHOTOS_4_VERSION:
version4 = True
@@ -2110,11 +2110,11 @@ class PhotosDB:
or (not shared and detail["cloudownerhashedpersonid"] is None)
)
and (
not version4
# in Photos 4, special albums like "printAlbum" have kind _PHOTOS_4_ALBUM_KIND
# but should not be listed here; they can be distinguished by looking
# for folderUuid of _PHOTOS_4_ROOT_FOLDER as opposed to _PHOTOS_4_TOP_LEVEL_ALBUM
(version4 and detail["folderUuid"] != _PHOTOS_4_ROOT_FOLDER)
or not version4
or (version4 and detail["folderUuid"] != _PHOTOS_4_ROOT_FOLDER)
)
):
album_list.append(album)