v1.4.16

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.4.16 (2016-11-25)
+
+* Fix: Websocket for new json response on PMS 1.3.0.
+* Fix: Update stream and transcoder tooltip percent.
+* Fix: Typo in the edit user modal.
+
+
 ## v1.4.15 (2016-11-11)
 
 * New: Add stream and transcoder progress percent to the current activity tooltip.

data/interfaces/default/edit_user.html

@@ -45,7 +45,7 @@ DOCUMENTATION :: END
                             <input type="text" class="form-control" id="friendly_name" name="friendly_name" value="${data['friendly_name']}" size="30">
                         </div>
                     </div>
-                    <p class="help-block">Replace all occurances of the username with this name.</p>
+                    <p class="help-block">Replace all occurrences of the username with this name.</p>
                 </div>
                 <div class="form-group">
                     <label for="profile_url">Profile Picture URL</label>

data/interfaces/default/index.html

@@ -204,8 +204,11 @@
 
                         // update the progress bars
                         // percent - 3 because of 3px padding-right
-                        $('#bufferbar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%');
+                        $('#bufferbar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%')
-                        $('#bar-' + key).width(parseInt(s.progress_percent) - 3 + '%').html(s.progress_percent + '%');
+                            .attr('data-original-title', 'Transcoder Progress ' + s.transcode_progress + '%');
+                        $('#bar-' + key).width(parseInt(s.progress_percent) - 3 + '%').html(s.progress_percent + '%')
+                            .attr('data-original-title', 'Stream Progress ' + s.progress_percent + '%');
+
 
                         // add temporary class so we know which instances are still active
                         instance.addClass('updated-temp');

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.4.15"
+PLEXPY_RELEASE_VERSION = "1.4.16"

plexpy/web_socket.py

@@ -142,11 +142,12 @@ def process(opcode, data):
 
     try:
         info = json.loads(data)
-    except Exception as ex:
+    except Exception as e:
-        logger.warn(u"PlexPy WebSocket :: Error decoding message from websocket: %s" % ex)
+        logger.warn(u"PlexPy WebSocket :: Error decoding message from websocket: %s" % e)
         logger.debug(data)
         return False
 
+    info = info.get('NotificationContainer', info)
     type = info.get('type')
 
     if not type:
@@ -154,9 +155,9 @@ def process(opcode, data):
 
     if type == 'playing':
         # logger.debug('%s.playing %s' % (name, info))
-        try:
+        time_line = info.get('PlaySessionStateNotification', info.get('_children'))
-            time_line = info.get('_children')
+
-        except:
+        if not time_line:
             logger.debug(u"PlexPy WebSocket :: Session found but unable to get timeline data.")
             return False