Better/own PlayerProcessInfo implementation

lib/_included_packages/plexnet/exceptions.py

@@ -16,3 +16,7 @@ class Unsupported(Exception):
 
 class Unauthorized(Exception):
     pass
+
+
+class ServerNotOwned(Exception):
+    pass

lib/_included_packages/plexnet/media.py

@@ -226,3 +226,7 @@ class Similar(MediaTag):
 class Writer(MediaTag):
     TYPE = 'Writer'
     FILTER = 'writer'
+
+
+class Bandwidth(plexobjects.PlexObject):
+    TYPE = 'Bandwidth'

lib/_included_packages/plexnet/myplex.py

@@ -10,6 +10,7 @@
 import video
 import audio
 import photo
+import plexobjects
 
 video, audio, photo  # Hides warning message
 

lib/_included_packages/plexnet/nowplayingmanager.py

@@ -108,7 +108,6 @@ def toXmlAttributes(self, elem):
 
 class NowPlayingManager(object):
     def __init__(self):
-
         # Constants
         self.NAVIGATION = "navigation"
         self.FULLSCREEN_VIDEO = "fullScreenVideo"
@@ -206,6 +205,8 @@ def nowPlayingSetControllable(self, timelineType, name, isControllable):
         self.timelines[timelineType].setControllable(name, isControllable)
 
     def onTimelineResponse(self, request, response, context):
+        context.request.server.trigger("np:timelineResponse", response=response)
+
         if not context.playQueue or not context.playQueue.refreshOnTimeline:
             return
         context.playQueue.refreshOnTimeline = False

lib/_included_packages/plexnet/plexobjects.py

@@ -160,6 +160,9 @@ def _setData(self, data):
 
         self.name = data.tag
         for k, v in data.attrib.items():
+            if k in ("container",):
+                k = "attrib_%s" % k
+
             setattr(self, k, PlexValue(v, self))
 
     def __getattr__(self, attr):
@@ -295,22 +298,33 @@ def _findLocation(self, data):
     def _findPlayer(self, data):
         elem = data.find('Player')
         if elem is not None:
-            from plexapi.client import Client
-            return Client(self.server, elem)
+            return PlexObject(elem, server=self.server)
         return None
 
     def _findTranscodeSession(self, data):
         elem = data.find('TranscodeSession')
         if elem is not None:
-            from plexapi import media
-            return media.TranscodeSession(self.server, elem)
+            import media
+            return media.TranscodeSession(elem, server=self.server)
         return None
 
+    def _findBandwidths(self, data):
+        elem = data.find("Bandwidths")
+        if elem is not None:
+            import media
+            return PlexItemList(elem, media.Bandwidth, media.Bandwidth.TYPE, server=self.server)
+        return []
+
     def _findUser(self, data):
         elem = data.find('User')
         if elem is not None:
-            from plexapi.myplex import MyPlexUser
-            return MyPlexUser(elem, self.initpath)
+            return PlexObject(elem, self.initpath)
+        return None
+
+    def _findSession(self, data):
+        elem = data.find('Session')
+        if elem is not None:
+            return PlexObject(elem, self.initpath, server=self.server)
         return None
 
     def getAbsolutePath(self, attr):

lib/_included_packages/plexnet/plexserver.py

@@ -158,6 +158,17 @@ def library(self):
         else:
             return plexlibrary.Library(self.query('/library/'), server=self)
 
+    @property
+    def sessions(self):
+        if self.owned:
+            return plexobjects.listItems(self, '/status/sessions')
+        raise exceptions.ServerNotOwned
+
+    def findVideoSession(self, client_id, rating_key):
+        for item in self.sessions:
+            if item.session and item.session.id == client_id and item.ratingKey == rating_key:
+                return item
+
     def buildUrl(self, path, includeToken=False):
         if self.activeConnection:
             return self.activeConnection.buildUrl(self, path, includeToken)

lib/_included_packages/plexnet/video.py

@@ -234,6 +234,7 @@ def _setData(self, data):
         self.sessionKey = plexobjects.PlexValue(data.attrib.get('sessionKey', ''), self)
         self.user = self._findUser(data)
         self.player = self._findPlayer(data)
+        self.session = self._findSession(data)
         self.transcodeSession = self._findTranscodeSession(data)
 
     @property
@@ -395,6 +396,7 @@ def _setData(self, data):
         self.sessionKey = plexobjects.PlexValue(data.attrib.get('sessionKey', ''), self)
         self.user = self._findUser(data)
         self.player = self._findPlayer(data)
+        self.session = self._findSession(data)
         self.transcodeSession = self._findTranscodeSession(data)
 
     @property
@@ -471,4 +473,4 @@ def isWatched(self):
         return self.get('viewCount').asInt() > 0
 
     def getStreamURL(self, **params):
-        return self._getStreamURL(**params)
+        return self._getStreamURL(**params)