Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NarrativeWebReport: media_ref handles need not be binary

Browse Source
This commit is contained in:
Doug Blank 2016-05-25 11:08:32 -04:00
parent 7851d3bdfb
commit 5e89b0a417
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps/plugins/webreport/narrativeweb.py
View File

@ -5108,7 +5108,10 @@ class MediaPages(BasePage):
# add unused media # add unused media
media_list = self.dbase_.get_media_handles() media_list = self.dbase_.get_media_handles()
for media_ref in media_list: for media_ref in media_list:
media_handle = media_ref.decode("utf-8") if isinstance(media_ref, bytes):
media_handle = media_ref.decode("utf-8")
else:
media_handle = media_ref
if media_handle not in self.report.obj_dict[Media]: if media_handle not in self.report.obj_dict[Media]:
unused_media_handles.append(media_handle) unused_media_handles.append(media_handle)
unused_media_handles = sorted(unused_media_handles, unused_media_handles = sorted(unused_media_handles,
@ -5542,7 +5545,10 @@ class ThumbnailPreviewPage(BasePage):
media_list = self.dbase_.get_media_handles() media_list = self.dbase_.get_media_handles()
unused_media_handles = [] unused_media_handles = []
for media_ref in media_list: for media_ref in media_list:
media_handle = media_ref.decode("utf-8") if isinstance(media_ref, bytes):
media_handle = media_ref.decode("utf-8")
else:
media_handle = media_ref
if media_handle not in self.report.obj_dict[Media]: if media_handle not in self.report.obj_dict[Media]:
self.photo_keys.append(media_handle) self.photo_keys.append(media_handle)