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

Return error result for terminate_session

Browse source
This commit is contained in:
JonnyWong16 2021-02-27 13:21:12 -08:00
parent 0868fa749d
commit af8a5342fb
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plexpy/pmsconnect.py
View file

@ -113,7 +113,7 @@ class PmsConnect(object):
return request return request
def get_sessions_terminate(self, session_id='', reason='', output_format=''): def get_sessions_terminate(self, session_id='', reason=''):
""" """
Return current sessions. Return current sessions.
@ -124,7 +124,7 @@ class PmsConnect(object):
uri = '/status/sessions/terminate?sessionId=%s&reason=%s' % (session_id, quote_plus(reason)) uri = '/status/sessions/terminate?sessionId=%s&reason=%s' % (session_id, quote_plus(reason))
request = self.request_handler.make_request(uri=uri, request = self.request_handler.make_request(uri=uri,
request_type='GET', request_type='GET',
output_format=output_format) return_response=True)
return request return request
@ -2247,8 +2247,6 @@ class PmsConnect(object):
def terminate_session(self, session_key='', session_id='', message=''): def terminate_session(self, session_key='', session_id='', message=''):
""" """
Terminates a streaming session. Terminates a streaming session.
Output: bool
""" """
plex_tv = plextv.PlexTV() plex_tv = plextv.PlexTV()
if not plex_tv.get_plexpass_status(): if not plex_tv.get_plexpass_status():
@ -2280,8 +2278,8 @@ class PmsConnect(object):
if session_id: if session_id:
logger.info("Tautulli Pmsconnect :: Terminating session %s (session_id %s)." % (session_key, session_id)) logger.info("Tautulli Pmsconnect :: Terminating session %s (session_id %s)." % (session_key, session_id))
result = self.get_sessions_terminate(session_id=session_id, reason=message) response = self.get_sessions_terminate(session_id=session_id, reason=message)
return True return response.ok
else: else:
msg = 'Missing session_id' msg = 'Missing session_id'
logger.warn("Tautulli Pmsconnect :: Failed to terminate session: %s." % msg) logger.warn("Tautulli Pmsconnect :: Failed to terminate session: %s." % msg)

6
plexpy/webserve.py
View file

@ -364,10 +364,10 @@ class WebInterface(object):
pms_connect = pmsconnect.PmsConnect() pms_connect = pmsconnect.PmsConnect()
result = pms_connect.terminate_session(session_key=session_key, session_id=session_id, message=message) result = pms_connect.terminate_session(session_key=session_key, session_id=session_id, message=message)
if result is True: if isinstance(result, str):
return {'result': 'success', 'message': 'Session terminated.'}
elif result:
return {'result': 'error', 'message': 'Failed to terminate session: {}.'.format(result)} return {'result': 'error', 'message': 'Failed to terminate session: {}.'.format(result)}
elif result is True:
return {'result': 'success', 'message': 'Session terminated.'}
else: else:
return {'result': 'error', 'message': 'Failed to terminate session.'} return {'result': 'error', 'message': 'Failed to terminate session.'}