Commit Graph

1007 Commits

Author SHA1 Message Date
5cf5c7d1ba list connected server obj.
continue when connections fail when comparing multiple servers.
search main server once.
2018-07-25 07:22:19 -04:00
c0b4cebd4a adding count and list keys 2018-07-25 07:01:51 -04:00
5340729046 fetchItem for more info for future metadata filtering (title, guid, etc.).
pop main dict.keys as they are not relevant and objects now.
2018-07-24 09:00:18 -04:00
bca69ba688 create server_compare.py 2018-07-23 10:51:24 -04:00
803743ae8d CONFIG addition. functioned marked_watch() 2018-07-11 06:49:57 -04:00
40ac277101 remove unixtime and datestamp args. Use unixtime and datestamp from script 2018-07-10 11:15:44 -04:00
f71e864a75 remove unixtime arg. Use unixtime from script 2018-07-10 11:14:12 -04:00
caa41f3119 remove datestamp arg. Use datestamp from script 2018-07-10 11:08:20 -04:00
42d381f9e2 encoding for killmessage, enviro instead of config, import os missing. 2018-07-10 10:55:58 -04:00
03b36c1035 obsolete, use limiterr 2018-07-10 08:22:31 -04:00
8cd280ea8a limiterr and readme with examples. 2018-07-10 08:17:54 -04:00
20f79eafa8 doc fix 2018-07-10 08:17:29 -04:00
3cccf3028d Plex message link corrected. 2018-07-09 09:21:34 -04:00
e961eec342 formatting correction 2018-07-09 08:35:17 -04:00
8f92570a16 Merge remote-tracking branch 'origin/master' 2018-07-09 08:30:38 -04:00
c6ed7286dc #83 2018-07-09 08:30:11 -04:00
2dacb93d0f Merge pull request #82 from JonnyWong16/master
Decode script arguments
2018-07-02 15:12:20 -04:00
c413526ec3 Return empty list if get_activity fails 2018-06-29 23:58:24 -07:00
2bd92acca7 Encode back to UTF-8 2018-06-29 23:50:42 -07:00
1e8e96398b Decode script arguments 2018-06-29 13:14:13 -07:00
ce66d95580 Merge pull request #81 from Arcanemagus/patch-1
Wrap message in quotes
2018-06-28 15:56:23 -04:00
473a073dd6 Wrap message in quotes
Now that Tautulli is sending the arguments correctly as of v2.1.14, wrap the kill messages in quotes so it's obvious where they start and stop.
2018-06-27 14:41:43 -07:00
593b405e85 Merge pull request #79 from Arcanemagus/no-empty-sessionID
Exit if a sessionID wasn't provided
2018-06-21 06:33:45 -04:00
bef7be7627 Exit if a sessionID wasn't provided
If the user mistakenly calls the script without a `sessionID`, exit 
early with a warning message and the likely reason.
2018-06-20 10:45:00 -07:00
89c43d1718 Merge pull request #77 from Arcanemagus/newlines
Ensure newlines in output
2018-06-19 06:17:59 -04:00
98186dec8b Ensure newlines in output
Although there will only be a single line of output in most cases, 
ensure that newlines are printed in case there are multiple lines, or 
the script is running in a full shell.
2018-06-18 20:49:16 -07:00
203a3b0bb9 Merge pull request #76 from Arcanemagus/kill_stream-paused
Incorporate waiting to kill paused streams into kill_stream.py
2018-06-18 21:19:30 -04:00
75b4fa3229 Add examples for paused streams
Add a few examples for usage of the new paused stream functionality.
2018-06-18 13:30:41 -07:00
c976a3dfb1 Cleanup format of examples
Cleans up the examples to all have a standard format that covers all
required settings and gives example messages where appropriate.
2018-06-18 13:22:40 -07:00
7b07bb314f Update authors 2018-06-18 12:39:21 -07:00
0e5c374449 Return instead of forcibly exiting
This makes no difference currently as the script doesn't do anything
after this function finishes, but it allows any cleanup work to happen
at the end.
2018-06-18 12:38:10 -07:00
ad682f3d1b Fix time limit on paused stream monitoring
The only way that this could ever be hit is if the stream is still
active on the server, but the state is NOT one of paused, playing, or
buffering. In case Plex decides to change the states in the future
having this working properly is a good idea ;)
2018-06-18 12:37:12 -07:00
4f3e35ef97 Remove an incorrect condition
The stream location can be `CELL` for example, which would count as
"local" for the first method of checking.
2018-06-18 12:09:54 -07:00
1fdae8a105 Minor style cleanup and typos 2018-06-18 12:09:05 -07:00
99b36aab88 camelCase -> snake_case 2018-06-18 11:54:17 -07:00
31ddd97a34 Actually use BODY_TEXT_USER 2018-06-18 11:50:41 -07:00
98b72f0a62 Cleanup documentation and add examples
Cleanup the documentation on how to set it up to match the current 
Tautulli state. Add a few examples to give people ideas for how to use 
this script.
2018-06-17 00:27:13 -07:00
c03860ec70 Incorporate waiting to kill paused streams into kill_stream.py
Incorporate the functionality of `wait_kill_paused_notify.py` into 
`kill_stream.py`. A new selector is added of `paused` enabling this 
mode, and adds two additional arguments to control how long to wait for 
paused streams, and how often to check a stream's status. The default 
values are to kill a stream after 20 minutes, checking every 30 seconds.

The Tautulli API is used for all functionality, meaning the `plexapi` 
module is no longer required.
2018-06-17 00:01:00 -07:00
0ba8e2bda0 Add a docstring for terminate_session 2018-06-16 23:53:17 -07:00
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
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
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
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
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
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
f7c555caa7 Add docbloc for send_notification 2018-06-16 23:51:43 -07:00
36c2ddaaf6 Fix PEP8 issues
Some minor refactoring to follow PEP8 guidlines.
2018-06-16 23:51:32 -07:00
578784a6f4 create config.ini 2018-06-16 11:26:24 -04:00
302820a075 headers for arg and cond examples. 2018-06-15 08:40:02 -04:00
e70787827d updated arguments comments.
moved examples.txt to readme.md
removed examples.txt
2018-06-15 08:32:28 -04:00