From 52b41aa5de6040853df5efffd78b338c059b099e Mon Sep 17 00:00:00 2001 From: echel0n Date: Tue, 22 Apr 2014 02:18:01 -0700 Subject: [PATCH] Fixes typo for delete_failed option --- nzbtomedia/autoProcess/autoProcessComics.py | 3 +-- nzbtomedia/autoProcess/autoProcessMovie.py | 3 +-- nzbtomedia/autoProcess/autoProcessMusic.py | 4 +--- nzbtomedia/autoProcess/autoProcessTV.py | 7 +++---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/nzbtomedia/autoProcess/autoProcessComics.py b/nzbtomedia/autoProcess/autoProcessComics.py index ea479c6b..3631929e 100644 --- a/nzbtomedia/autoProcess/autoProcessComics.py +++ b/nzbtomedia/autoProcess/autoProcessComics.py @@ -39,8 +39,7 @@ class autoProcessComics: params = {} params['nzb_folder'] = dirName if remote_path: - dirName_new = joinPath(remote_path, os.path.basename(dirName)).replace("\\", "/") - params['nzb_folder'] = dirName_new + params['nzb_folder'] = joinPath(remote_path, os.path.basename(dirName)) if nzbName != None: params['nzb_name'] = nzbName diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py index cbd1d485..7294a3ff 100644 --- a/nzbtomedia/autoProcess/autoProcessMovie.py +++ b/nzbtomedia/autoProcess/autoProcessMovie.py @@ -169,8 +169,7 @@ class autoProcessMovie: params['media_folder'] = dirName if remote_path: - dirName_new = joinPath(remote_path, os.path.basename(dirName)).replace("\\", "/") - params['media_folder'] = dirName_new + params['media_folder'] = joinPath(remote_path, os.path.basename(dirName)) url = "%s%s" % (baseURL, command) diff --git a/nzbtomedia/autoProcess/autoProcessMusic.py b/nzbtomedia/autoProcess/autoProcessMusic.py index 59e4e925..495540ca 100644 --- a/nzbtomedia/autoProcess/autoProcessMusic.py +++ b/nzbtomedia/autoProcess/autoProcessMusic.py @@ -76,9 +76,7 @@ class autoProcessMusic: params['dir'] = os.path.dirname(dirName) if remote_path: - dirName_new = joinPath(remote_path, os.path.basename(os.path.dirname(dirName))).replace("\\", "/") - params['dir'] = dirName_new - + params['dir'] = joinPath(remote_path, os.path.basename(os.path.dirname(dirName))) release_status = self.get_status(url, apikey, dirName) diff --git a/nzbtomedia/autoProcess/autoProcessTV.py b/nzbtomedia/autoProcess/autoProcessTV.py index 0edc6eba..d74ae681 100644 --- a/nzbtomedia/autoProcess/autoProcessTV.py +++ b/nzbtomedia/autoProcess/autoProcessTV.py @@ -45,7 +45,7 @@ class autoProcessTV: except: web_root = "" try: - delete_failed = int(nzbtomedia.CFG[section][inputCategory]["rmDir_failed"]) + delete_failed = int(nzbtomedia.CFG[section][inputCategory]["delete_failed"]) except: delete_failed = 0 try: @@ -108,8 +108,7 @@ class autoProcessTV: if param in ["dirName", "dir"]: fork_params[param] = dirName if remote_path: - dirName_new = joinPath(remote_path, os.path.basename(dirName)).replace("\\", "/") - fork_params[param] = dirName_new + fork_params[param] = joinPath(remote_path, os.path.basename(dirName)) if param == "process_method": if process_method: @@ -117,7 +116,7 @@ class autoProcessTV: else: del fork_params[param] - # rmDir any unused params so we don't pass them to SB by mistake + # delete any unused params so we don't pass them to SB by mistake [fork_params.pop(k) for k,v in fork_params.items() if v is None] if status == 0: