Code Cleanup and Improved Logging

ManiMatter · Aug 1, 2024 · 7c48531 · 7c48531
1 parent 79abc3c
commit 7c48531
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 43 deletions.
diff --git a/config/definitions.py b/config/definitions.py
@@ -62,12 +62,21 @@
     exit()
 
 ########### Enrich setting variables
-if RADARR_URL:      RADARR_URL      += '/api/v3'
-if SONARR_URL:      SONARR_URL      += '/api/v3'
-if LIDARR_URL:      LIDARR_URL      += '/api/v1'
-if READARR_URL:     READARR_URL     += '/api/v1'
-if WHISPARR_URL:    WHISPARR_URL    += '/api/v3'
-if QBITTORRENT_URL: QBITTORRENT_URL += '/api/v2'
+if RADARR_URL:      RADARR_URL =        RADARR_URL.rstrip('/')      + '/api/v3'
+if SONARR_URL:      SONARR_URL =        SONARR_URL.rstrip('/')      + '/api/v3'
+if LIDARR_URL:      LIDARR_URL =        LIDARR_URL.rstrip('/')      + '/api/v1'
+if READARR_URL:     READARR_URL =       READARR_URL.rstrip('/')     + '/api/v1'
+if WHISPARR_URL:    WHISPARR_URL =      WHISPARR_URL.rstrip('/')    + '/api/v3'
+if QBITTORRENT_URL: QBITTORRENT_URL =   QBITTORRENT_URL.rstrip('/') + '/api/v2'
+
+RADARR_MIN_VERSION          = '5.3.6.8608'
+SONARR_MIN_VERSION          = '4.0.1.1131'
+LIDARR_MIN_VERSION          = None
+READARR_MIN_VERSION         = None
+WHISPARR_MIN_VERSION        = '2.0.0.548'
+QBITTORRENT_MIN_VERSION     = '4.3.0'
+
+SUPPORTED_ARR_APPS  = ['RADARR', 'SONARR', 'LIDARR', 'READARR', 'WHISPARR']
 
 ########### Add Variables to Dictionary
 settingsDict = {}

diff --git a/main.py b/main.py
@@ -26,40 +26,12 @@ class Download_Sizes_Tracker:
     # Keeps track of the file sizes of the downloads
     def __init__(self, dict):
         self.dict = dict
-
-#
-
-async def getProtectedAndPrivateFromQbit(settingsDict):
-    # Returns two lists containing the hashes of Qbit that are either protected by tag, or are private trackers (if IGNORE_PRIVATE_TRACKERS is true)
-    protectedDownloadIDs = []
-    privateDowloadIDs = []
-    if settingsDict['QBITTORRENT_URL']:
-        # Fetch all torrents
-        qbitItems = await rest_get(settingsDict['QBITTORRENT_URL']+'/torrents/info',params={}, cookies=settingsDict['QBIT_COOKIE'])
-        # Fetch protected torrents (by tag)
-        for qbitItem in qbitItems:
-            if settingsDict['NO_STALLED_REMOVAL_QBIT_TAG'] in qbitItem.get('tags'):
-                protectedDownloadIDs.append(str.upper(qbitItem['hash']))
-        # Fetch private torrents
-        if settingsDict['IGNORE_PRIVATE_TRACKERS']:
-            for qbitItem in qbitItems:           
-                qbitItemProperties = await rest_get(settingsDict['QBITTORRENT_URL']+'/torrents/properties',params={'hash': qbitItem['hash']}, cookies=settingsDict['QBIT_COOKIE'])
-                qbitItem['is_private'] = qbitItemProperties.get('is_private', None) # Adds the is_private flag to qbitItem info for simplified logging
-                if qbitItemProperties.get('is_private', False):
-                    privateDowloadIDs.append(str.upper(qbitItem['hash']))
-        logger.debug('main/getProtectedAndPrivateFromQbit/qbitItems: %s', str([{"hash": str.upper(item["hash"]), "name": item["name"], "category": item["category"], "tags": item["tags"], "is_private": item.get("is_private", None)} for item in qbitItems]))
 
-    logger.debug('main/getProtectedAndPrivateFromQbit/protectedDownloadIDs: %s', str(protectedDownloadIDs))
-    logger.debug('main/getProtectedAndPrivateFromQbit/privateDowloadIDs: %s', str(privateDowloadIDs))   
-
-    return protectedDownloadIDs, privateDowloadIDs
-
 # Main function
 async def main(settingsDict):
 # Adds to settings Dict the instances that are actually configures
-    arrApplications  = ['RADARR', 'SONARR', 'LIDARR', 'READARR', 'WHISPARR']
     settingsDict['INSTANCES'] = []
-    for arrApplication in arrApplications:
+    for arrApplication in settingsDict['SUPPORTED_ARR_APPS']:
         if settingsDict[arrApplication + '_URL']:
             settingsDict['INSTANCES'].append(arrApplication)
 
@@ -81,12 +53,6 @@ async def main(settingsDict):
     showSettings(settingsDict)
 
     # Check Minimum Version and if instances are reachable and retrieve qbit cookie
-    settingsDict['RADARR_MIN_VERSION']   = '5.3.6.8608'
-    settingsDict['SONARR_MIN_VERSION']   = '4.0.1.1131'
-    settingsDict['LIDARR_MIN_VERSION']   = None
-    settingsDict['READARR_MIN_VERSION']  = None
-    settingsDict['WHISPARR_MIN_VERSION'] = '2.0.0.548'
-    settingsDict['QBITTORRENT_MIN_VERSION']  = '4.3.0'
     settingsDict = await instanceChecks(settingsDict)
 
     # Create qBit protection tag if not existing

diff --git a/src/utils/loadScripts.py b/src/utils/loadScripts.py
@@ -26,7 +26,31 @@ async def getArrInstanceName(settingsDict, arrApp):
             settingsDict[arrApp + '_NAME'] = arrApp.title()
     return settingsDict
 
+async def getProtectedAndPrivateFromQbit(settingsDict):
+    # Returns two lists containing the hashes of Qbit that are either protected by tag, or are private trackers (if IGNORE_PRIVATE_TRACKERS is true)
+    protectedDownloadIDs = []
+    privateDowloadIDs = []
+    if settingsDict['QBITTORRENT_URL']:
+        # Fetch all torrents
+        qbitItems = await rest_get(settingsDict['QBITTORRENT_URL']+'/torrents/info',params={}, cookies=settingsDict['QBIT_COOKIE'])
+        # Fetch protected torrents (by tag)
+        for qbitItem in qbitItems:
+            if settingsDict['NO_STALLED_REMOVAL_QBIT_TAG'] in qbitItem.get('tags'):
+                protectedDownloadIDs.append(str.upper(qbitItem['hash']))
+        # Fetch private torrents
+        if settingsDict['IGNORE_PRIVATE_TRACKERS']:
+            for qbitItem in qbitItems:           
+                qbitItemProperties = await rest_get(settingsDict['QBITTORRENT_URL']+'/torrents/properties',params={'hash': qbitItem['hash']}, cookies=settingsDict['QBIT_COOKIE'])
+                qbitItem['is_private'] = qbitItemProperties.get('is_private', None) # Adds the is_private flag to qbitItem info for simplified logging
+                if qbitItemProperties.get('is_private', False):
+                    privateDowloadIDs.append(str.upper(qbitItem['hash']))
+        logger.debug('main/getProtectedAndPrivateFromQbit/qbitItems: %s', str([{"hash": str.upper(item["hash"]), "name": item["name"], "category": item["category"], "tags": item["tags"], "is_private": item.get("is_private", None)} for item in qbitItems]))
+
+    logger.debug('main/getProtectedAndPrivateFromQbit/protectedDownloadIDs: %s', str(protectedDownloadIDs))
+    logger.debug('main/getProtectedAndPrivateFromQbit/privateDowloadIDs: %s', str(privateDowloadIDs))   
 
+    return protectedDownloadIDs, privateDowloadIDs
+
 
 def showSettings(settingsDict):
     # Prints out the settings
@@ -73,10 +97,14 @@ def showSettings(settingsDict):
                     '%s%s: %s',
                     instance.title(),
                     f" ({settingsDict.get(instance + '_NAME')})" if settingsDict.get(instance + '_NAME') != instance.title() else "",
-                    settingsDict[instance + '_URL']
+                    (settingsDict[instance + '_URL']).split('/api')[0]
                 )
 
-    if settingsDict['QBITTORRENT_URL']: logger.info('qBittorrent: %s', settingsDict['QBITTORRENT_URL'])    
+    if settingsDict['QBITTORRENT_URL']: 
+        logger.info(
+            'qBittorrent: %s', 
+            (settingsDict['QBITTORRENT_URL']).split('/api')[0]
+        )    
 
     logger.info('') 
     return