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

Fixed albums for burst images, closes #401, #403, #404

Browse Source
This commit is contained in:
Rhet Turnbull
2021-03-27 08:11:33 -07:00
parent d77eba12b2
commit a941f66d62
8 changed files with 169 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osxphotos/phototemplate.py
View File

@@ -840,7 +840,7 @@ class PhotoTemplate:
""" return list of values for a multi-valued template field """
values = []
if field == "album":
values = self.photo.albums
values = self.photo.burst_albums if self.photo.burst else self.photo.albums
elif field == "keyword":
values = self.photo.keywords
elif field == "person":
@@ -854,7 +854,11 @@ class PhotoTemplate:
elif field == "folder_album":
values = []
# photos must be in an album to be in a folder
for album in self.photo.album_info:
if self.photo.burst:
album_info = self.photo.burst_album_info
else:
album_info = self.photo.album_info
for album in album_info:
if album.folder_names:
# album in folder
if dirname: