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

Merge pull request #77 from Arcanemagus/newlines

Browse Source 
Ensure newlines in output
This commit is contained in:
blacktwin 2018-06-19 06:17:59 -04:00 committed by GitHub
commit 89c43d1718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
killstream/kill_stream.py
View File

@ -94,12 +94,12 @@ def send_notification(subject_text, body_text, notifier_id):
response = r.json() response = r.json()
if response['response']['result'] == 'success': if response['response']['result'] == 'success':
sys.stdout.write("Successfully sent Tautulli notification.") sys.stdout.write("Successfully sent Tautulli notification.\n")
else: else:
raise Exception(response['response']['message']) raise Exception(response['response']['message'])
except Exception as e: except Exception as e:
sys.stderr.write( sys.stderr.write(
"Tautulli API 'notify' request failed: {0}.".format(e)) "Tautulli API 'notify' request failed: {0}.\n".format(e))
return None return None
@ -123,7 +123,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}.".format(e)) "Tautulli API 'get_activity' request failed: {0}.\n".format(e))
pass pass
@ -172,7 +172,7 @@ def terminate_session(session_id, message, notifier=None, username=None):
if response['response']['result'] == 'success': if response['response']['result'] == 'success':
sys.stdout.write( sys.stdout.write(
"Successfully killed Plex session: {0}.".format(session_id)) "Successfully killed Plex session: {0}.\n".format(session_id))
if notifier: if notifier:
if username: if username:
body = BODY_TEXT_USER.format(user=username, body = BODY_TEXT_USER.format(user=username,
@ -232,12 +232,12 @@ def terminate_long_pause(session_id, message, limit, interval, notify=None):
elif state == 'playing' or state == 'buffering': elif state == 'playing' or state == 'buffering':
sys.stdout.write( sys.stdout.write(
"Session '{}' has resumed, ".format(session_id) + "Session '{}' has resumed, ".format(session_id) +
"stopping monitoring.") "stopping monitoring.\n")
return return
if not found_session: if not found_session:
sys.stdout.write( sys.stdout.write(
"Session '{}' is no longer active ".format(session_id) + "Session '{}' is no longer active ".format(session_id) +
"on the server, stopping monitoring.") "on the server, stopping monitoring.\n")
return return