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

Fix merge issues

Browse source
This commit is contained in:
rossdargan 2015-10-12 11:53:41 +01:00
commit d6602578e5
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plexpy/config.py
View file

@ -194,6 +194,7 @@ _CONFIG_DEFINITIONS = {
'PUSHOVER_ENABLED': (int, 'Pushover', 0), 'PUSHOVER_ENABLED': (int, 'Pushover', 0),
'PUSHOVER_KEYS': (str, 'Pushover', ''), 'PUSHOVER_KEYS': (str, 'Pushover', ''),
'PUSHOVER_PRIORITY': (int, 'Pushover', 0), 'PUSHOVER_PRIORITY': (int, 'Pushover', 0),
'PUSHOVER_SOUND': (str, 'Pushover', ''),
'PUSHOVER_ON_PLAY': (int, 'Pushover', 0), 'PUSHOVER_ON_PLAY': (int, 'Pushover', 0),
'PUSHOVER_ON_STOP': (int, 'Pushover', 0), 'PUSHOVER_ON_STOP': (int, 'Pushover', 0),
'PUSHOVER_ON_PAUSE': (int, 'Pushover', 0), 'PUSHOVER_ON_PAUSE': (int, 'Pushover', 0),

15
plexpy/notifiers.py
View file

@ -865,6 +865,7 @@ class PUSHOVER(object):
self.enabled = plexpy.CONFIG.PUSHOVER_ENABLED self.enabled = plexpy.CONFIG.PUSHOVER_ENABLED
self.keys = plexpy.CONFIG.PUSHOVER_KEYS self.keys = plexpy.CONFIG.PUSHOVER_KEYS
self.priority = plexpy.CONFIG.PUSHOVER_PRIORITY self.priority = plexpy.CONFIG.PUSHOVER_PRIORITY
self.sound = plexpy.CONFIG.PUSHOVER_SOUND
self.on_play = plexpy.CONFIG.PUSHOVER_ON_PLAY self.on_play = plexpy.CONFIG.PUSHOVER_ON_PLAY
self.on_stop = plexpy.CONFIG.PUSHOVER_ON_STOP self.on_stop = plexpy.CONFIG.PUSHOVER_ON_STOP
self.on_watched = plexpy.CONFIG.PUSHOVER_ON_WATCHED self.on_watched = plexpy.CONFIG.PUSHOVER_ON_WATCHED
@ -887,6 +888,7 @@ class PUSHOVER(object):
'user': plexpy.CONFIG.PUSHOVER_KEYS, 'user': plexpy.CONFIG.PUSHOVER_KEYS,
'title': event, 'title': event,
'message': message.encode("utf-8"), 'message': message.encode("utf-8"),
'sound': plexpy.CONFIG.PUSHOVER_SOUND,
'priority': plexpy.CONFIG.PUSHOVER_PRIORITY} 'priority': plexpy.CONFIG.PUSHOVER_PRIORITY}
http_handler.request("POST", http_handler.request("POST",
@ -913,11 +915,12 @@ class PUSHOVER(object):
#For uniformity reasons not removed #For uniformity reasons not removed
return return
def test(self, keys, priority): def test(self, keys, priority, sound):
self.enabled = True self.enabled = True
self.keys = keys self.keys = keys
self.priority = priority self.priority = priority
self.sound = sound
self.notify('Main Screen Activate', 'Test Message') self.notify('Main Screen Activate', 'Test Message')
def return_config_options(self): def return_config_options(self):
@ -933,6 +936,12 @@ class PUSHOVER(object):
'description': 'Set the priority (-2,-1,0,1 or 2).', 'description': 'Set the priority (-2,-1,0,1 or 2).',
'input_type': 'number' 'input_type': 'number'
}, },
{'label': 'Sound',
'value': self.sound,
'name': 'pushover_sound',
'description': 'Set the notification sound (choose from <a href="https://pushover.net/api#sounds" target="_blank">this list</a> or leave blank for default)',
'input_type': 'text'
},
{'label': 'Pushover API Token', {'label': 'Pushover API Token',
'value': plexpy.CONFIG.PUSHOVER_APITOKEN, 'value': plexpy.CONFIG.PUSHOVER_APITOKEN,
'name': 'pushover_apitoken', 'name': 'pushover_apitoken',
@ -1329,7 +1338,7 @@ class IFTTT(object):
config_option = [{'label': 'Ifttt Maker Channel Key', config_option = [{'label': 'Ifttt Maker Channel Key',
'value': self.apikey, 'value': self.apikey,
'name': 'ifttt_key', 'name': 'ifttt_key',
'description': 'Your Ifttt key. You can get a key from here https://ifttt.com/maker', 'description': 'Your Ifttt key. You can get a key from <a href="https://ifttt.com/maker" target="_blank">here</a>',
'input_type': 'text' 'input_type': 'text'
}, },
{'label': 'Ifttt event', {'label': 'Ifttt event',