anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Manual merge of v1.4.16 into v2

Browse Source
This commit is contained in:
JonnyWong16
2016-11-25 19:16:43 -08:00
parent 03eec610fa 3742f33d08
commit d7cef5add7
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plexpy/web_socket.py
View File

@@ -166,11 +166,12 @@ def process(opcode, data):
try:
info = json.loads(data)
except Exception as ex:
logger.warn(u"PlexPy WebSocket :: Error decoding message from websocket: %s" % ex)
except Exception as e:
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:
@@ -178,13 +179,13 @@ def process(opcode, data):
if type == 'playing':
# logger.debug('%s.playing %s' % (name, info))
try:
children = info.get('_children')
except:
time_line = info.get('PlaySessionStateNotification', info.get('_children'))
if not time_line:
logger.debug(u"PlexPy WebSocket :: Session found but unable to get timeline data.")
return False
activity = activity_handler.ActivityHandler(timeline=children[0])
activity = activity_handler.ActivityHandler(timeline=time_line[0])
activity.process()
if type == 'timeline':