From af8a5342fbbdbe77babb5aeb0079da71f0bf6177 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sat, 27 Feb 2021 13:21:12 -0800 Subject: [PATCH] Return error result for terminate_session --- plexpy/pmsconnect.py | 10 ++++------ plexpy/webserve.py | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 15f5f38c..333fb61d 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -113,7 +113,7 @@ class PmsConnect(object): return request - def get_sessions_terminate(self, session_id='', reason='', output_format=''): + def get_sessions_terminate(self, session_id='', reason=''): """ Return current sessions. @@ -124,7 +124,7 @@ class PmsConnect(object): uri = '/status/sessions/terminate?sessionId=%s&reason=%s' % (session_id, quote_plus(reason)) request = self.request_handler.make_request(uri=uri, request_type='GET', - output_format=output_format) + return_response=True) return request @@ -2247,8 +2247,6 @@ class PmsConnect(object): def terminate_session(self, session_key='', session_id='', message=''): """ Terminates a streaming session. - - Output: bool """ plex_tv = plextv.PlexTV() if not plex_tv.get_plexpass_status(): @@ -2280,8 +2278,8 @@ class PmsConnect(object): if 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) - return True + response = self.get_sessions_terminate(session_id=session_id, reason=message) + return response.ok else: msg = 'Missing session_id' logger.warn("Tautulli Pmsconnect :: Failed to terminate session: %s." % msg) diff --git a/plexpy/webserve.py b/plexpy/webserve.py index fa80bdd8..69a546b6 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -364,10 +364,10 @@ class WebInterface(object): pms_connect = pmsconnect.PmsConnect() result = pms_connect.terminate_session(session_key=session_key, session_id=session_id, message=message) - if result is True: - return {'result': 'success', 'message': 'Session terminated.'} - elif result: + if isinstance(result, str): return {'result': 'error', 'message': 'Failed to terminate session: {}.'.format(result)} + elif result is True: + return {'result': 'success', 'message': 'Session terminated.'} else: return {'result': 'error', 'message': 'Failed to terminate session.'}