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

Fix terminate stream when both session_key and session_id are provided

Browse source
This commit is contained in:
JonnyWong16 2019-03-20 08:49:15 -07:00
parent 76b9b3e474
commit a9169d2b53
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plexpy/pmsconnect.py
View file

@ -2025,20 +2025,19 @@ class PmsConnect(object):
return msg return msg
message = message.encode('utf-8') or 'The server owner has ended the stream.' message = message.encode('utf-8') or 'The server owner has ended the stream.'
session = None
if not session_key and not session_id: ap = activity_processor.ActivityProcessor()
session_key = session_id = None
elif session_key and not session_id: if session_key:
ap = activity_processor.ActivityProcessor()
session = ap.get_session_by_key(session_key=session_key) session = ap.get_session_by_key(session_key=session_key)
session_id = session['session_id'] if session else None session_id = session['session_id'] if session and not session_id else None
elif session_id and not session_key: elif session_id:
ap = activity_processor.ActivityProcessor()
session = ap.get_session_by_id(session_id=session_id) session = ap.get_session_by_id(session_id=session_id)
session_key = session['session_key'] if session else None session_key = session['session_key'] if session and not session_key else None
else:
session = session_key = session_id = None
if not session: if not session:
msg = 'Invalid session_key (%s) or session_id (%s)' % (session_key, session_id) msg = 'Invalid session_key (%s) or session_id (%s)' % (session_key, session_id)