diff --git a/src/jobs/remove_failed.py b/src/jobs/remove_failed.py index 85b3147..8a53d21 100644 --- a/src/jobs/remove_failed.py +++ b/src/jobs/remove_failed.py @@ -1,4 +1,4 @@ -from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download) +from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download, qBitOffline) import sys, os, traceback import logging, verboselogs logger = verboselogs.VerboseLogger(__name__) @@ -10,6 +10,7 @@ async def remove_failed(settingsDict, BASE_URL, API_KEY, NAME, deleted_downloads queue = await get_queue(BASE_URL, API_KEY) logger.debug('remove_failed/queue IN: %s', formattedQueueInfo(queue)) if not queue: return 0 + if await qBitOffline(settingsDict, failType, NAME): return 0 # Find items affected affectedItems = [] for queueItem in queue['records']: diff --git a/src/jobs/remove_metadata_missing.py b/src/jobs/remove_metadata_missing.py index 93bc82d..4c97b35 100644 --- a/src/jobs/remove_metadata_missing.py +++ b/src/jobs/remove_metadata_missing.py @@ -1,4 +1,4 @@ -from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download) +from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download, qBitOffline) import sys, os, traceback import logging, verboselogs logger = verboselogs.VerboseLogger(__name__) @@ -10,8 +10,9 @@ async def remove_metadata_missing(settingsDict, BASE_URL, API_KEY, NAME, deleted queue = await get_queue(BASE_URL, API_KEY) logger.debug('remove_metadata_missing/queue IN: %s', formattedQueueInfo(queue)) if not queue: return 0 + if await qBitOffline(settingsDict, failType, NAME): return 0 # Find items affected - affectedItems = [] + affectedItems = [] for queueItem in queue['records']: if 'errorMessage' in queueItem and 'status' in queueItem: if queueItem['status'] == 'queued' and queueItem['errorMessage'] == 'qBittorrent is downloading metadata': diff --git a/src/jobs/remove_missing_files.py b/src/jobs/remove_missing_files.py index 68efb11..6f3a368 100644 --- a/src/jobs/remove_missing_files.py +++ b/src/jobs/remove_missing_files.py @@ -1,4 +1,4 @@ -from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download) +from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download, qBitOffline) import sys, os, traceback import logging, verboselogs logger = verboselogs.VerboseLogger(__name__) @@ -10,6 +10,7 @@ async def remove_missing_files(settingsDict, BASE_URL, API_KEY, NAME, deleted_do queue = await get_queue(BASE_URL, API_KEY) logger.debug('remove_missing_files/queue IN: %s', formattedQueueInfo(queue)) if not queue: return 0 + if await qBitOffline(settingsDict, failType, NAME): return 0 # Find items affected affectedItems = [] for queueItem in queue['records']: diff --git a/src/jobs/remove_slow.py b/src/jobs/remove_slow.py index b511f55..ee24947 100644 --- a/src/jobs/remove_slow.py +++ b/src/jobs/remove_slow.py @@ -1,4 +1,4 @@ -from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download) +from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download, qBitOffline) import sys, os, traceback import logging, verboselogs from src.utils.rest import (rest_get) @@ -11,16 +11,10 @@ async def remove_slow(settingsDict, BASE_URL, API_KEY, NAME, deleted_downloads, queue = await get_queue(BASE_URL, API_KEY) logger.debug('remove_slow/queue IN: %s', formattedQueueInfo(queue)) if not queue: return 0 + if await qBitOffline(settingsDict, failType, NAME): return 0 # Find items affected affectedItems = [] alreadyCheckedDownloadIDs = [] - - if settingsDict['QBITTORRENT_URL']: - qBitConnectionStatus = (await rest_get(settingsDict['QBITTORRENT_URL']+'/sync/maindata', cookies=settingsDict['QBIT_COOKIE']))['server_state']['connection_status'] - if qBitConnectionStatus == 'disconnected': - logger.warning('>>> qBittorrent is disconnected. Skipping %s queue cleaning failed on %s.',failType, NAME) - return 0 - for queueItem in queue['records']: if 'downloadId' in queueItem and 'size' in queueItem and 'sizeleft' in queueItem and 'status' in queueItem: if queueItem['downloadId'] not in alreadyCheckedDownloadIDs: diff --git a/src/jobs/remove_stalled.py b/src/jobs/remove_stalled.py index dccc60d..622f96c 100644 --- a/src/jobs/remove_stalled.py +++ b/src/jobs/remove_stalled.py @@ -1,4 +1,4 @@ -from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download) +from src.utils.shared import (errorDetails, formattedQueueInfo, get_queue, privateTrackerCheck, protectedDownloadCheck, execute_checks, permittedAttemptsCheck, remove_download, qBitOffline) import sys, os, traceback import logging, verboselogs logger = verboselogs.VerboseLogger(__name__) @@ -10,6 +10,7 @@ async def remove_stalled(settingsDict, BASE_URL, API_KEY, NAME, deleted_download queue = await get_queue(BASE_URL, API_KEY) logger.debug('remove_stalled/queue IN: %s', formattedQueueInfo(queue)) if not queue: return 0 + if await qBitOffline(settingsDict, failType, NAME): return 0 # Find items affected affectedItems = [] for queueItem in queue['records']: diff --git a/src/utils/loadScripts.py b/src/utils/loadScripts.py index 645ae3e..965274f 100644 --- a/src/utils/loadScripts.py +++ b/src/utils/loadScripts.py @@ -107,7 +107,7 @@ async def instanceChecks(settingsDict): if version.parse(current_version) < version.parse(settingsDict[instance + '_MIN_VERSION']): error_occured = True logger.error('!! %s Error: !!', settingsDict[instance + '_NAME']) - logger.error('Please update %s to at least version %s. Current version: %s', settingsDict[instance + '_MIN_VERSION'],current_version) + logger.error('Please update %s to at least version %s. Current version: %s', settingsDict[instance + '_NAME'], settingsDict[instance + '_MIN_VERSION'], current_version) if not error_occured: logger.info('OK | %s', settingsDict[instance + '_NAME']) logger.debug('Current version of %s: %s', instance, current_version)