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

Remove 'on_' prefix from notifier actions

Browse source
This commit is contained in:
JonnyWong16 2016-10-19 20:02:11 -07:00 • committed by JonnyWong16
parent 7da1edfcc5
commit 08a9b59ca4
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/notification_handler.py
View file

@ -179,7 +179,7 @@ def notify(notifier_id=None, notify_action=None, stream_data=None, timeline_data
notifiers.send_notification(notifier_id=notifier_config['id'], notifiers.send_notification(notifier_id=notifier_config['id'],
subject=subject, subject=subject,
body=body, body=body,
notify_action=notify_action, action=notify_action.split('on_')[-1],
parameters=parameters) parameters=parameters)
# Set the notification state in the db # Set the notification state in the db

8
plexpy/notifiers.py
View file

@ -490,14 +490,14 @@ def set_notifier_config(notifier_id=None, agent_id=None, **kwargs):
return False return False
def send_notification(notifier_id=None, subject='', body='', notify_action='', **kwargs): def send_notification(notifier_id=None, subject='', body='', action='', **kwargs):
notifier_config = get_notifier_config(notifier_id=notifier_id) notifier_config = get_notifier_config(notifier_id=notifier_id)
if notifier_config: if notifier_config:
agent = get_agent_class(agent_id=notifier_config['agent_id'], agent = get_agent_class(agent_id=notifier_config['agent_id'],
config=notifier_config['config']) config=notifier_config['config'])
return agent.notify(subject=subject, return agent.notify(subject=subject,
body=body, body=body,
action=notify_action, action=action,
**kwargs) **kwargs)
else: else:
logger.debug(u"PlexPy Notifiers :: Notification requested but no notifier_id received.") logger.debug(u"PlexPy Notifiers :: Notification requested but no notifier_id received.")
@ -2214,10 +2214,10 @@ class SCRIPTS(Notifier):
Args: Args:
subject(string, optional): Subject text, subject(string, optional): Subject text,
body(string, optional): Body text, body(string, optional): Body text,
notify_action(string): 'play' action(string): 'play'
""" """
script_args = subject or None script_args = subject or None
action = kwargs.get('action', None) action = kwargs.get('action', '')
logger.debug(u"PlexPy Notifiers :: Trying to run notify script, action: %s, arguments: %s" logger.debug(u"PlexPy Notifiers :: Trying to run notify script, action: %s, arguments: %s"
% (action, script_args)) % (action, script_args))