Merge branch 'dev'

Pushover HTML Support

CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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)
 
 * Fix: Regression unable to clear HTTP password.
@@ -31,7 +37,7 @@
 * Add: Schedule background task to backup the PlexPy database.
 * Add: URL anonymizer for external links.
 * 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: History grouping now accounts for the view offset.
 * Change: Subject line can be toggled off for Facebook, Slack, Telegram, and Twitter.

data/interfaces/default/settings.html

@@ -717,7 +717,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                             <label>
                                 <input type="checkbox" name="notify_upload_posters" id="notify_upload_posters" value="1" ${config['notify_upload_posters']}> Enable Posters in Notifications
                             </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 class="padded-header">

plexpy/config.py

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

plexpy/notification_handler.py

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

plexpy/notifiers.py

@@ -1054,6 +1054,7 @@ class PUSHOVER(object):
         self.keys = plexpy.CONFIG.PUSHOVER_KEYS
         self.priority = plexpy.CONFIG.PUSHOVER_PRIORITY
         self.sound = plexpy.CONFIG.PUSHOVER_SOUND
+        self.html_support = plexpy.CONFIG.PUSHOVER_HTML_SUPPORT
 
     def conf(self, options):
         return cherrypy.config['config'].get('Pushover', options)
@@ -1069,6 +1070,7 @@ class PUSHOVER(object):
                 'title': event.encode("utf-8"),
                 'message': message.encode("utf-8"),
                 'sound': plexpy.CONFIG.PUSHOVER_SOUND,
+                'html': plexpy.CONFIG.PUSHOVER_HTML_SUPPORT,
                 'priority': plexpy.CONFIG.PUSHOVER_PRIORITY}
 
         http_handler.request("POST",
@@ -1095,11 +1097,12 @@ class PUSHOVER(object):
         # For uniformity reasons not removed
         return
 
-    def test(self, keys, priority, sound):
+    def test(self, keys, priority, sound, html_support):
         self.enabled = True
         self.keys = keys
         self.priority = priority
         self.sound = sound
+        self.html_support = html_support
 
         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.',
                           'input_type': 'select',
                           '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'
                           }
                          ]
 

plexpy/version.py

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