github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 12:59:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix soft crash when viewing photos not in an album

Browse source
This commit is contained in:
JonnyWong16 2018-06-16 16:38:06 -07:00
commit 4f4a99d695
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plexpy/pmsconnect.py
View file

@ -590,6 +590,8 @@ class PmsConnect(object):
metadata_xml = self.get_metadata(str(rating_key), output_format='xml') metadata_xml = self.get_metadata(str(rating_key), output_format='xml')
elif sync_id: elif sync_id:
metadata_xml = self.get_sync_item(str(sync_id), output_format='xml') metadata_xml = self.get_sync_item(str(sync_id), output_format='xml')
else:
return metadata
try: try:
xml_head = metadata_xml.getElementsByTagName('MediaContainer') xml_head = metadata_xml.getElementsByTagName('MediaContainer')
@ -1051,7 +1053,7 @@ class PmsConnect(object):
'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'), 'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'), 'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
'art': helpers.get_xml_attr(metadata_main, 'art'), 'art': helpers.get_xml_attr(metadata_main, 'art'),
'banner': photo_album_details['banner'], 'banner': photo_album_details.get('banner', ''),
'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'), 'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'), 'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'), 'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
@ -1060,10 +1062,10 @@ class PmsConnect(object):
'directors': directors, 'directors': directors,
'writers': writers, 'writers': writers,
'actors': actors, 'actors': actors,
'genres': photo_album_details['genres'], 'genres': photo_album_details.get('genres', ''),
'labels': photo_album_details['labels'], 'labels': photo_album_details.get('labels', ''),
'collections': photo_album_details['collections'], 'collections': photo_album_details.get('collections', ''),
'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'), 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle') or library_name,
helpers.get_xml_attr(metadata_main, 'title')), helpers.get_xml_attr(metadata_main, 'title')),
'children_count': helpers.get_xml_attr(metadata_main, 'leafCount') 'children_count': helpers.get_xml_attr(metadata_main, 'leafCount')
} }
@ -1160,7 +1162,7 @@ class PmsConnect(object):
} }
else: else:
return {} return metadata
if metadata and media_info: if metadata and media_info:
medias = [] medias = []
@ -1264,7 +1266,7 @@ class PmsConnect(object):
return metadata return metadata
else: else:
return {} return metadata
def get_metadata_children_details(self, rating_key='', get_children=False): def get_metadata_children_details(self, rating_key='', get_children=False):
""" """