Commit Graph

149 Commits

Author SHA1 Message Date
Landon Abney
0ba8e2bda0
Add a docstring for terminate_session 2018-06-16 23:53:17 -07:00
Landon Abney
4ebfaf17bd
Always send a notification if an agent is specified
Whenever a stream is killed, send a notification for that stream if a 
notification agent has been specified. If no username is specified, 
simply list the session ID.
2018-06-16 23:53:15 -07:00
Landon Abney
2116082fd7
List --killMessage at the end
Although argparse should be smart enough to handle this in any order, 
it's generally easier for us poor humans to read the arguments if the 
unstructured one is the last argument. Re-order the listing to make this 
clearer.
2018-06-16 23:53:12 -07:00
Landon Abney
342284173b
Use the same session for all requests
Use the Session created at the start of the script for all requests, 
instead of creating a new one for some of them (which doesn't inherit 
the settings set on it at the start).
2018-06-16 23:51:53 -07:00
Landon Abney
7b0cc2d2a9
Disable InsecureRequestWarning if SSL verify is False
If checking of HTTPS validity is disable, turn off the warning that it 
has been disabled since we have done so explicitly.
2018-06-16 23:51:51 -07:00
Landon Abney
00f4bf26a9
Rename get_user_activity
This function was actually getting _just_ the session IDs, not the whole 
session data.
2018-06-16 23:51:48 -07:00
Landon Abney
e56d23b12d
Refactor get_activity into two functions
Create a new function get_user_activity that returns the same data 
get_activity originally did and use that in main. get_activity now 
actually follows the name and gets all activity on the server.
2018-06-16 23:51:46 -07:00
Landon Abney
f7c555caa7
Add docbloc for send_notification 2018-06-16 23:51:43 -07:00
Landon Abney
36c2ddaaf6
Fix PEP8 issues
Some minor refactoring to follow PEP8 guidlines.
2018-06-16 23:51:32 -07:00
Blacktwin
302820a075 headers for arg and cond examples. 2018-06-15 08:40:02 -04:00
Blacktwin
e70787827d updated arguments comments.
moved examples.txt to readme.md
removed examples.txt
2018-06-15 08:32:28 -04:00
Blacktwin
64f008d1eb Corrected killMessage processing.
updated argument instruction.
2018-06-14 08:56:20 -04:00
Blacktwin
776fe7334b show --jbop choices. 2018-06-14 00:47:21 -04:00
Too Much IO
33c29f4bcc
Format syntax error [ instead of { 2018-06-14 09:04:33 +10:00
Blacktwin
c93972f46c overide/fallback clean up. 2018-06-12 15:51:08 -04:00
Blacktwin
58f9011850 adding examples page for kill_streams.py 2018-06-12 10:08:35 -04:00
Blacktwin
e1d904727c delete files, obsolete. 2018-06-12 10:06:45 -04:00
Blacktwin
a8cee9b115 more messaging, moved episode check to conditions, correction for 0 watched history for the day. 2018-06-12 09:55:13 -04:00
Blacktwin
bb9b42cae1 grk to int, stopped_time bracket correction. 2018-06-12 09:55:08 -04:00
Blacktwin
fd3b3675d6 != instead of 'is not' 2018-06-12 09:55:08 -04:00
blacktwin
406161120e clarity 2018-06-12 09:55:07 -04:00
Blacktwin
9f97b5218e Added ablility to kill multiple streams from one user.
Allowing for elimination of other killstream scripts.
Added notification
2018-06-11 15:57:29 -04:00
Blacktwin
e4b49d3297 fix message and ssl 2018-05-09 14:43:02 -04:00
Blacktwin
fb7c16ee80 == not in 2018-05-05 08:20:48 -04:00
Blacktwin
35382673a6 move message to arg. another example 2018-05-05 08:15:35 -04:00
Blacktwin
96594c93d6 cleanup. removing kill scripts that can now be done through conditions 2018-03-29 10:17:04 -04:00
Blacktwin
2950494a89 updated 2018-03-29 10:03:17 -04:00
Blacktwin
98b7965852 Merge remote-tracking branch 'origin/config-update' into config-update 2018-03-29 10:00:45 -04:00
Blacktwin
1000ca1e39 updated 2018-03-29 09:59:31 -04:00
Blacktwin
4f67c4dd55 updated 2018-03-29 09:53:34 -04:00
Blacktwin
5ecd42ef46 stdout instead of print. 2018-03-29 09:49:30 -04:00
Blacktwin
1e44845d9a adding else print out for logs. 2018-03-29 09:49:30 -04:00
Blacktwin
9c461dbe43 updated sessions check. Trailers and pre-rolls not included in plexapi sessions(). 2018-03-29 09:49:29 -04:00
Blacktwin
ae410b8fec fix if, add int 2018-03-29 09:49:29 -04:00
Blacktwin
a9cf95652f updated notifierID and notifierID location for tautulli 2018-03-29 09:49:28 -04:00
Blacktwin
56bf099416 Add wait_kill_pause_notify from samwiseg00 2018-03-29 09:49:28 -04:00
Blacktwin
bdff121f5b PlexPy names to tautulli. Agent_id to notifier_id. 2018-03-29 09:48:21 -04:00
blacktwin
ee73a93fdc If else
Added else
2018-03-29 09:48:20 -04:00
Blacktwin
9b62cf6192 testing 2018-03-14 10:21:25 -04:00
blacktwin
99a86693a3 Update for killing streams. Adding config structure. 2018-03-14 08:49:48 -04:00
blacktwin
81cb09ebf5
Update kill_trans_library.py 2018-02-14 08:34:27 -05:00
blacktwin
10686c6f26
library check
Actually check against the targeted library...
2018-02-14 08:34:10 -05:00
KurtzPT
168ea61824
Update kill_trans_pause.py 2018-02-06 16:58:32 +00:00
blacktwin
5325030cb6
fixed if 2018-02-03 18:04:20 -05:00
blacktwin
ce12c4a1bf
simpler
Add only the devices that you want to kill on playback start.
2018-02-03 17:22:19 -05:00
blacktwin
8ffdbbb939
if session.transcodeSessions:
if stream is not copy or transcode then this entry will be null. If null then it would error out the script. Adding this if will clean up the error.
2018-01-26 10:23:07 -05:00
blacktwin
d69570ad44
Update kill_trans_library.py 2018-01-26 10:18:58 -05:00
blacktwin
a8f6cb31a0
Update kill_more_than.py 2018-01-26 09:18:40 -05:00
blacktwin
5855fb3297
session_key added
session_key from session that caused the concurrent trigger will be collected.
2018-01-26 09:16:03 -05:00
blacktwin
fab88eda03
Update kill_trans_library.py
add session_key arg and separate `if transcodeSessions`
If an active session was not transcoding then the script would error on the session and may not complete loop through all sessions.
2018-01-24 13:45:13 -05:00