Mirrored_Repos/JBOPS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82 from JonnyWong16/master

Browse Source 
Decode script arguments
This commit is contained in:
blacktwin 2018-07-02 15:12:20 -04:00 committed by GitHub
commit 2dacb93d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
killstream/kill_stream.py
View File

@ -52,6 +52,7 @@ TAUTULLI_URL = ''
TAUTULLI_APIKEY = '' TAUTULLI_APIKEY = ''
TAUTULLI_URL = os.getenv('TAUTULLI_URL', TAUTULLI_URL) TAUTULLI_URL = os.getenv('TAUTULLI_URL', TAUTULLI_URL)
TAUTULLI_APIKEY = os.getenv('TAUTULLI_APIKEY', TAUTULLI_APIKEY) TAUTULLI_APIKEY = os.getenv('TAUTULLI_APIKEY', TAUTULLI_APIKEY)
TAUTULLI_ENCODING = os.getenv('TAUTULLI_ENCODING', 'UTF-8')
SUBJECT_TEXT = "Tautulli has killed a stream." SUBJECT_TEXT = "Tautulli has killed a stream."
BODY_TEXT = "Killed session ID '{id}'. Reason: {message}" BODY_TEXT = "Killed session ID '{id}'. Reason: {message}"
@ -124,7 +125,7 @@ def get_activity():
except Exception as e: except Exception as e:
sys.stderr.write( sys.stderr.write(
"Tautulli API 'get_activity' request failed: {0}.\n".format(e)) "Tautulli API 'get_activity' request failed: {0}.\n".format(e))
pass return []
def get_user_session_ids(user_id): def get_user_session_ids(user_id):
@ -241,6 +242,10 @@ def terminate_long_pause(session_id, message, limit, interval, notify=None):
return return
def arg_decoding(arg):
return arg.decode(TAUTULLI_ENCODING).encode('UTF-8')
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="Killing Plex streams from Tautulli.") description="Killing Plex streams from Tautulli.")
@ -248,7 +253,7 @@ if __name__ == "__main__":
help='Kill selector.\nChoices: (%(choices)s)') help='Kill selector.\nChoices: (%(choices)s)')
parser.add_argument('--userId', type=int, parser.add_argument('--userId', type=int,
help='The unique identifier for the user.') help='The unique identifier for the user.')
parser.add_argument('--username', parser.add_argument('--username', type=arg_decoding,
help='The username of the person streaming.') help='The username of the person streaming.')
parser.add_argument('--sessionId', required=True, parser.add_argument('--sessionId', required=True,
help='The unique identifier for the stream.') help='The unique identifier for the stream.')
@ -259,7 +264,7 @@ if __name__ == "__main__":
help='The time session is allowed to remain paused.') help='The time session is allowed to remain paused.')
parser.add_argument('--interval', type=int, default=30, parser.add_argument('--interval', type=int, default=30,
help='The seconds between paused session checks.') help='The seconds between paused session checks.')
parser.add_argument('--killMessage', nargs='+', parser.add_argument('--killMessage', nargs='+', type=arg_decoding,
help='Message to send to user whose stream is killed.') help='Message to send to user whose stream is killed.')
opts = parser.parse_args() opts = parser.parse_args()