diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index f58f822f..5980c81d 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -358,16 +358,6 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, * poster_info = get_poster_info(metadata=metadata) metadata.update(poster_info) - # Create a title - if metadata['media_type'] in ('episode', 'track'): - full_title = '%s - %s' % (metadata['grandparent_title'], - metadata['title']) - elif metadata['media_type'] in ('season', 'album'): - full_title = '%s - %s' % (metadata['parent_title'], - metadata['title']) - else: - full_title = metadata['title'] - if plexpy.CONFIG.NOTIFY_GROUP_RECENTLY_ADDED_GRANDPARENT and metadata['media_type'] in ('show', 'artist'): show_name = metadata['title'] episode_name = '' @@ -490,7 +480,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, * 'video_height': session.get('height', media_info.get('height','')), 'audio_codec': session.get('audio_codec', media_info.get('audio_codec','')), 'audio_channels': session.get('audio_channels', media_info.get('audio_channels','')), - 'title': full_title, + 'title': metadata['full_title'], 'library_name': metadata['library_name'], 'show_name': show_name, 'episode_name': episode_name, diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index ef892a09..5b6911c8 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -738,8 +738,8 @@ class PmsConnect(object): 'actors': show_details['actors'], 'genres': show_details['genres'], 'labels': show_details['labels'], - 'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'), - helpers.get_xml_attr(metadata_main, 'title')) + 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'), + helpers.get_xml_attr(metadata_main, 'title')) } metadata_list.append(metadata) @@ -778,8 +778,8 @@ class PmsConnect(object): 'actors': show_details['actors'], 'genres': show_details['genres'], 'labels': show_details['labels'], - 'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - helpers.get_xml_attr(metadata_main, 'title')) + 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + helpers.get_xml_attr(metadata_main, 'title')) } metadata_list.append(metadata) @@ -855,8 +855,8 @@ class PmsConnect(object): 'actors': actors, 'genres': genres, 'labels': labels, - 'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'), - helpers.get_xml_attr(metadata_main, 'title')) + 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'), + helpers.get_xml_attr(metadata_main, 'title')) } metadata_list.append(metadata) @@ -895,8 +895,8 @@ class PmsConnect(object): 'actors': actors, 'genres': album_details['genres'], 'labels': album_details['labels'], - 'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - helpers.get_xml_attr(metadata_main, 'title')) + 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + helpers.get_xml_attr(metadata_main, 'title')) } metadata_list.append(metadata) @@ -972,8 +972,8 @@ class PmsConnect(object): 'actors': actors, 'genres': photo_album_details['genres'], 'labels': photo_album_details['labels'], - 'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'), - helpers.get_xml_attr(metadata_main, 'title')) + 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'), + helpers.get_xml_attr(metadata_main, 'title')) } metadata_list.append(metadata)