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

Merge branch 'dev'

Browse source
This commit is contained in:
JonnyWong16 2016-02-21 23:07:33 -08:00
commit 6542997520
6 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -1,5 +1,11 @@
# Changelog # Changelog
## v1.3.9 (2016-02-21)
* Fix: Recently added notification not sent to all notification agents.
* Add: Pushover HTML support. (Thanks @elseym)
## v1.3.8 (2016-02-21) ## v1.3.8 (2016-02-21)
* Fix: Regression unable to clear HTTP password. * Fix: Regression unable to clear HTTP password.
@ -31,7 +37,7 @@
* Add: Schedule background task to backup the PlexPy database. * Add: Schedule background task to backup the PlexPy database.
* Add: URL anonymizer for external links. * Add: URL anonymizer for external links.
* Add: Plex Media Scanner log file to Log viewer. * Add: Plex Media Scanner log file to Log viewer.
* Add: API v2 (sill very experimental) (Thanks @Hellowlol) * Add: API v2 (sill very experimental). (Thanks @Hellowlol)
* Change: Allow secure websocket connections. * Change: Allow secure websocket connections.
* Change: History grouping now accounts for the view offset. * Change: History grouping now accounts for the view offset.
* Change: Subject line can be toggled off for Facebook, Slack, Telegram, and Twitter. * Change: Subject line can be toggled off for Facebook, Slack, Telegram, and Twitter.

2
data/interfaces/default/settings.html
View file

@ -717,7 +717,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<label> <label>
<input type="checkbox" name="notify_upload_posters" id="notify_upload_posters" value="1" ${config['notify_upload_posters']}> Enable Posters in Notifications <input type="checkbox" name="notify_upload_posters" id="notify_upload_posters" value="1" ${config['notify_upload_posters']}> Enable Posters in Notifications
</label> </label>
<p class="help-block">Allow PlexPy to upload Plex poster to Imgur for notifications.</p> <p class="help-block">Enable to upload Plex posters to Imgur for notifications. Disable if posters are not being used to save bandwidth.</p>
</div> </div>
<div class="padded-header"> <div class="padded-header">

1
plexpy/config.py
View file

@ -291,6 +291,7 @@ _CONFIG_DEFINITIONS = {
'PUSHBULLET_ON_INTUP': (int, 'PushBullet', 0), 'PUSHBULLET_ON_INTUP': (int, 'PushBullet', 0),
'PUSHOVER_APITOKEN': (str, 'Pushover', ''), 'PUSHOVER_APITOKEN': (str, 'Pushover', ''),
'PUSHOVER_ENABLED': (int, 'Pushover', 0), 'PUSHOVER_ENABLED': (int, 'Pushover', 0),
'PUSHOVER_HTML_SUPPORT': (int, 'Pushover', 1),
'PUSHOVER_KEYS': (str, 'Pushover', ''), 'PUSHOVER_KEYS': (str, 'Pushover', ''),
'PUSHOVER_PRIORITY': (int, 'Pushover', 0), 'PUSHOVER_PRIORITY': (int, 'Pushover', 0),
'PUSHOVER_SOUND': (str, 'Pushover', ''), 'PUSHOVER_SOUND': (str, 'Pushover', ''),

2
plexpy/notification_handler.py
View file

@ -269,7 +269,7 @@ def notify_timeline(timeline_data=None, notify_action=None):
metadata=metadata) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, set_notify_state(session=timeline_data,
notify_action=notify_action, notify_action=notify_action,
agent_info=agent, agent_info=agent,
notify_strings=notify_strings, notify_strings=notify_strings,

11
plexpy/notifiers.py
View file

@ -1054,6 +1054,7 @@ class PUSHOVER(object):
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.sound = plexpy.CONFIG.PUSHOVER_SOUND
self.html_support = plexpy.CONFIG.PUSHOVER_HTML_SUPPORT
def conf(self, options): def conf(self, options):
return cherrypy.config['config'].get('Pushover', options) return cherrypy.config['config'].get('Pushover', options)
@ -1069,6 +1070,7 @@ class PUSHOVER(object):
'title': event.encode("utf-8"), 'title': event.encode("utf-8"),
'message': message.encode("utf-8"), 'message': message.encode("utf-8"),
'sound': plexpy.CONFIG.PUSHOVER_SOUND, 'sound': plexpy.CONFIG.PUSHOVER_SOUND,
'html': plexpy.CONFIG.PUSHOVER_HTML_SUPPORT,
'priority': plexpy.CONFIG.PUSHOVER_PRIORITY} 'priority': plexpy.CONFIG.PUSHOVER_PRIORITY}
http_handler.request("POST", http_handler.request("POST",
@ -1095,11 +1097,12 @@ class PUSHOVER(object):
# For uniformity reasons not removed # For uniformity reasons not removed
return return
def test(self, keys, priority, sound): def test(self, keys, priority, sound, html_support):
self.enabled = True self.enabled = True
self.keys = keys self.keys = keys
self.priority = priority self.priority = priority
self.sound = sound self.sound = sound
self.html_support = html_support
self.notify('Main Screen Activate', 'Test Message') self.notify('Main Screen Activate', 'Test Message')
@ -1151,6 +1154,12 @@ class PUSHOVER(object):
'description': 'Set the notification sound. Leave blank for the default sound.', 'description': 'Set the notification sound. Leave blank for the default sound.',
'input_type': 'select', 'input_type': 'select',
'select_options': self.get_sounds() 'select_options': self.get_sounds()
},
{'label': 'Enable HTML Support',
'value': self.html_support,
'name': 'pushover_html_support',
'description': 'Style your messages using these HTML Tags: b, i, u, a[href], font[color]',
'input_type': 'checkbox'
} }
] ]

2
plexpy/version.py
View file

@ -1,2 +1,2 @@
PLEXPY_VERSION = "master" PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.3.8" PLEXPY_RELEASE_VERSION = "1.3.9"