From 453a3e736c0c0fce849b432f33e99b091fa4c602 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Wed, 14 Dec 2022 03:06:38 -0500 Subject: [PATCH] Remove `failed` parameter from `process` --- core/auto_process/tv.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py index 8e1cd500..fd52eb81 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -38,7 +38,6 @@ def process( dir_name: str, input_name: str = '', status: int = 0, - failed: bool = False, client_agent: str = 'manual', download_id: str = '', input_category: str = '', @@ -79,7 +78,6 @@ def process( force = int(cfg.get('force', 0)) delete_on = int(cfg.get('delete_on', 0)) ignore_subs = int(cfg.get('ignore_subs', 0)) - status = int(failed) # Begin processing @@ -185,11 +183,9 @@ def process( if valid_files == num_files and not status == 0: logger.info('Found Valid Videos. Setting status Success') status = 0 - failed = 0 if valid_files < num_files and status == 0: logger.info('Found corrupt videos. Setting status Failed') status = 1 - failed = 1 if ( 'NZBOP_VERSION' in os.environ and os.environ['NZBOP_VERSION'][0:5] >= '14.0' @@ -220,23 +216,19 @@ def process( logger.info( 'Check for media files ignored because nzbExtractionBy is set to Destination.', ) - if int(failed) == 0: + if status == 0: logger.info('Setting Status Success.') - status = 0 - failed = 0 else: logger.info( 'Downloader reported an error during download or verification. Processing this as a failed download.', ) status = 1 - failed = 1 else: logger.warning( f'No media files found in directory {dir_name}. Processing this as a failed download', section, ) status = 1 - failed = 1 if ( 'NZBOP_VERSION' in os.environ and os.environ['NZBOP_VERSION'][0:5] >= '14.0' @@ -275,7 +267,7 @@ def process( # Part of the refactor if init_sickbeard.fork_obj: init_sickbeard.fork_obj.initialize( - dir_name, input_name, failed, client_agent='manual', + dir_name, input_name, status, client_agent='manual', ) # configure SB params to pass @@ -289,9 +281,9 @@ def process( for param in copy.copy(fork_params): if param == 'failed': - if failed > 1: - failed = 1 - fork_params[param] = failed + if status > 1: + status = 1 + fork_params[param] = status if 'proc_type' in fork_params: del fork_params['proc_type'] if 'type' in fork_params: