diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index f5958390..2b1d0ecd 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -1968,6 +1968,13 @@ {rating} The rating (out of 10) for the item. + + {audience_rating} + + The audience rating (%) for the item. +

(Ratings source must be Rotten Tomatoes for the Plex Movie agent)

+ + {duration} The duration (in minutes) for the item. diff --git a/plexpy/helpers.py b/plexpy/helpers.py index ef58e34a..187bd34a 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -440,11 +440,8 @@ def convert_xml_to_dict(xml): def get_percent(value1, value2): - if str(value1).isdigit() and str(value2).isdigit(): - value1 = cast_to_float(value1) - value2 = cast_to_float(value2) - else: - return 0 + value1 = cast_to_float(value1) + value2 = cast_to_float(value2) if value1 != 0 and value2 != 0: percent = (value1 / value2) * 100 diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 418bac65..765ce192 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -330,7 +330,6 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, * view_offset = helpers.convert_milliseconds_to_minutes(session.get('view_offset', 0)) duration = helpers.convert_milliseconds_to_minutes(metadata['duration']) - progress_percent = helpers.get_percent(view_offset, duration) remaining_duration = duration - view_offset # Build Plex URL @@ -439,7 +438,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, * 'remaining_time': arrow.get(remaining_duration * 60).format(duration_format), 'progress_duration': view_offset, 'progress_time': arrow.get(view_offset * 60).format(duration_format), - 'progress_percent': progress_percent, + 'progress_percent': helpers.get_percent(view_offset, duration), 'transcode_decision': transcode_decision, 'video_decision': session.get('video_decision',''), 'audio_decision': session.get('audio_decision',''), @@ -526,6 +525,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, * 'summary': metadata['summary'], 'tagline': metadata['tagline'], 'rating': metadata['rating'], + 'audience_rating': helpers.get_percent(metadata['audience_rating'], 10) or '', 'duration': duration, 'poster_title': metadata.get('poster_title',''), 'poster_url': metadata.get('poster_url',''), diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 0ac7a4ef..2c2973a1 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -646,6 +646,7 @@ class PmsConnect(object): 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), @@ -682,6 +683,7 @@ class PmsConnect(object): 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), @@ -720,6 +722,7 @@ class PmsConnect(object): 'summary': show_details['summary'], 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': show_details['duration'], 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), @@ -759,6 +762,7 @@ class PmsConnect(object): 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), @@ -796,6 +800,7 @@ class PmsConnect(object): 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), @@ -834,6 +839,7 @@ class PmsConnect(object): 'summary': artist_details['summary'], 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), @@ -873,6 +879,7 @@ class PmsConnect(object): 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), 'year': album_details['year'], 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), @@ -910,6 +917,7 @@ class PmsConnect(object): 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), @@ -948,6 +956,7 @@ class PmsConnect(object): 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),