From 473808d720d992533b43fbe45766057c57f79024 Mon Sep 17 00:00:00 2001 From: Blacktwin Date: Fri, 7 Dec 2018 09:42:23 -0500 Subject: [PATCH] #125 fix plex and tautulli url/token calls from CONFIG --- utility/remove_inactive_users.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/utility/remove_inactive_users.py b/utility/remove_inactive_users.py index 2b7404d..ca58d60 100644 --- a/utility/remove_inactive_users.py +++ b/utility/remove_inactive_users.py @@ -14,15 +14,10 @@ from plexapi.server import PlexServer, CONFIG ## EDIT THESE SETTINGS ## -TAUTULLI_URL = '' -TAUTULLI_APIKEY = '' -TAUTULLI_URL = CONFIG.data['auth'].get('tautulli_baseurl', TAUTULLI_URL) -TAUTULLI_APIKEY = CONFIG.data['auth'].get('tautulli_apikey', TAUTULLI_APIKEY) - PLEX_URL = '' PLEX_TOKEN = '' -PLEX_URL = CONFIG.data['auth'].get('server_baseurl', PLEX_URL) -PLEX_TOKEN = CONFIG.data['auth'].get('server_token', PLEX_TOKEN) +TAUTULLI_URL = '' +TAUTULLI_APIKEY = '' REMOVE_LIMIT = 30 # days UNSHARE_LIMIT = 15 # days @@ -30,6 +25,17 @@ UNSHARE_LIMIT = 15 # days USER_IGNORE = ('user1') ##/EDIT THESE SETTINGS ## +## CODE BELOW ## + +if not PLEX_URL: + PLEX_URL = CONFIG.data['auth'].get('server_baseurl') +if not PLEX_TOKEN: + PLEX_TOKEN = CONFIG.data['auth'].get('server_token') +if not TAUTULLI_URL: + TAUTULLI_URL = CONFIG.data['auth'].get('tautulli_baseurl') +if not TAUTULLI_APIKEY: + TAUTULLI_APIKEY = CONFIG.data['auth'].get('tautulli_apikey') + sess = requests.Session() # Ignore verifying the SSL certificate sess.verify = False # '/path/to/certfile'