From b04ed83963356776c2093f4ee3c088818bbb577b Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 16 Mar 2016 19:13:29 -0700 Subject: [PATCH] Make sure build_notify_text returns two values --- plexpy/notification_handler.py | 39 ++++++++++++++-------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index a855f305..18828e68 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -325,11 +325,9 @@ def notify_timeline(timeline_data=None, notify_action=None): notify_action=notify_action) # Set the notification state in the db - set_notify_state(session={}, - notify_action=notify_action, + set_notify_state(notify_action=notify_action, agent_info=agent, - notify_strings=notify_strings, - metadata={}) + notify_strings=notify_strings) if agent['on_intdown'] and notify_action == 'intdown': # Build and send notification @@ -343,11 +341,9 @@ def notify_timeline(timeline_data=None, notify_action=None): notify_action=notify_action) # Set the notification state in the db - set_notify_state(session={}, - notify_action=notify_action, + set_notify_state(notify_action=notify_action, agent_info=agent, - notify_strings=notify_strings, - metadata={}) + notify_strings=notify_strings) if agent['on_extup'] and notify_action == 'extup': # Build and send notification @@ -361,11 +357,9 @@ def notify_timeline(timeline_data=None, notify_action=None): notify_action=notify_action) # Set the notification state in the db - set_notify_state(session={}, - notify_action=notify_action, + set_notify_state(notify_action=notify_action, agent_info=agent, - notify_strings=notify_strings, - metadata={}) + notify_strings=notify_strings) if agent['on_intup'] and notify_action == 'intup': # Build and send notification @@ -379,11 +373,9 @@ def notify_timeline(timeline_data=None, notify_action=None): notify_action=notify_action) # Set the notification state in the db - set_notify_state(session={}, - notify_action=notify_action, + set_notify_state(notify_action=notify_action, agent_info=agent, - notify_strings=notify_strings, - metadata={}) + notify_strings=notify_strings) if agent['on_pmsupdate'] and notify_action == 'pmsupdate': # Build and send notification @@ -397,11 +389,9 @@ def notify_timeline(timeline_data=None, notify_action=None): notify_action=notify_action) # Set the notification state in the db - set_notify_state(session={}, - notify_action=notify_action, + set_notify_state(notify_action=notify_action, agent_info=agent, - notify_strings=notify_strings, - metadata={}) + notify_strings=notify_strings) else: logger.debug(u"PlexPy NotificationHandler :: Notify timeline called but incomplete data received.") @@ -426,11 +416,14 @@ def get_notify_state(session): return notify_states -def set_notify_state(session, notify_action, agent_info, notify_strings, metadata): +def set_notify_state(notify_action, agent_info, notify_strings, session=None, metadata=None): if notify_action and agent_info: monitor_db = database.MonitorDatabase() + session = session or {} + metadata = metadata or {} + if notify_strings[2]: script_args = '[' + ', '.join(notify_strings[2]) + ']' else: @@ -496,7 +489,7 @@ def build_notify_text(session=None, timeline=None, notify_action=None, agent_id= metadata = metadata_list['metadata'] else: logger.error(u"PlexPy NotificationHandler :: Unable to retrieve metadata for rating_key %s" % str(rating_key)) - return [] + return [None, None, None], None # Check for exclusion tags if metadata['media_type'] == 'movie': @@ -918,7 +911,7 @@ def build_notify_text(session=None, timeline=None, notify_action=None, agent_id= else: return [subject_text, body_text, script_args], metadata else: - return None + return [None, None, None], None def build_server_notify_text(notify_action=None, agent_id=None):