Commit Graph

578 Commits

Author SHA1 Message Date
Landon Abney
7b07bb314f
Update authors 2018-06-18 12:39:21 -07:00
Landon Abney
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
Landon Abney
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
Landon Abney
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
Landon Abney
1fdae8a105
Minor style cleanup and typos 2018-06-18 12:09:05 -07:00
Landon Abney
99b36aab88
camelCase -> snake_case 2018-06-18 11:54:17 -07:00
Landon Abney
31ddd97a34
Actually use BODY_TEXT_USER 2018-06-18 11:50:41 -07:00
Landon Abney
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
Landon Abney
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
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
578784a6f4 create config.ini 2018-06-16 11:26:24 -04: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
blacktwin
aae31c9718
Merge pull request #74 from toomuchio/patch-1
Format syntax error [ instead of {
2018-06-14 00:02:50 -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
0d40df2755 requirements file. 2018-06-12 14:02:08 -04:00
Blacktwin
58f9011850 adding examples page for kill_streams.py 2018-06-12 10:08:35 -04:00
Blacktwin
1867061a93 Merge remote-tracking branch 'origin/master' 2018-06-12 10:07:01 -04:00
Blacktwin
e1d904727c delete files, obsolete. 2018-06-12 10:06:45 -04:00
Blacktwin
714b87b6b3 Merge remote-tracking branch 'origin/master' 2018-06-12 10:04:01 -04:00
blacktwin
89837c2e0a
Delete vcs.xml 2018-06-12 10:02:27 -04:00
Blacktwin
ed8213774b cleaning special characters from region, city, and friendly names.
removed unused get_platform function
2018-06-12 09:56:13 -04:00
Blacktwin
454aa9e2d0 Fixes for matplotlib==2.2.2:
fillcontinents > drawlsmask
remove Latitude and Longitude grid for World map

Other:
Added choice for including/excluding a legend
Changed arg -l location to -m map
2018-06-12 09:56:12 -04:00
blacktwin
f92f3f08c8 Delete Project_Default.xml 2018-06-12 09:55:19 -04:00
Blacktwin
d88fe8688d push to master 2018-06-12 09:55:19 -04:00
blacktwin
4686e2c712 Delete test.txt 2018-06-12 09:55:19 -04:00
Blacktwin
dd0f99b170 testing pycharm push 2018-06-12 09:55:19 -04:00
Blacktwin
555409d963 removing archive 2018-06-12 09:55:19 -04:00
Nicholas St. Germain
99476b46f0 added backup of db 2018-06-12 09:55:19 -04:00
Blacktwin
c0888d81ba cleaning special characters from region, city, and friendly names.
removed unused get_platform function
2018-06-12 09:55:19 -04:00
blacktwin
0849324df2 added discord button
discord button links to Tautulli's discord server. Buttons calls out Scripts section.
2018-06-12 09:55:18 -04:00
Blacktwin
b6bb0520e7 get_history's grandparent_rating_key to int() 2018-06-12 09:55:18 -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
32e256f111 marking series watched instead of episode. child not item. 2018-06-12 09:55:07 -04:00
Blacktwin
1ed70fb66e shows were being marked as watched if an episode was watched.
check each episode.
2018-06-12 09:55:07 -04:00
blacktwin
e3a70ec010 killstream clarity 2018-06-12 09:55:07 -04:00
blacktwin
406161120e clarity 2018-06-12 09:55:07 -04:00