From 198796e8b4e28937106b40f81d36820220fa358e Mon Sep 17 00:00:00 2001 From: Jeffrey Kriegsman Date: Fri, 4 Dec 2015 08:09:17 +0100 Subject: [PATCH 1/2] Update SickRage dir. Fixex clinton-hall/nzbToMedia#895 --- core/__init__.py | 4 ++-- core/autoProcess/autoProcessTV.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 06f170c9..5ee64d43 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -56,8 +56,8 @@ FORK_SICKRAGE = "sickrage" FORKS[FORK_DEFAULT] = {"dir": None} FORKS[FORK_FAILED] = {"dirName": None, "failed": None} FORKS[FORK_FAILED_TORRENT] = {"dir": None, "failed": None, "process_method": None} -FORKS[FORK_SICKRAGE] = {"dir": None, "failed": None, "process_method": None, "force": None, "delete_on": None} -ALL_FORKS = {"dir": None, "dirName": None, "failed": None, "process_method": None, "force": None, "delete_on": None} +FORKS[FORK_SICKRAGE] = {"proc_dir": None, "failed": None, "process_method": None, "force": None, "delete_on": None} +ALL_FORKS = {"dir": None, "dirName": None, "proc_dir": None, "failed": None, "process_method": None, "force": None, "delete_on": None} SICKBEARD_FAILED = [FORK_FAILED, FORK_FAILED_TORRENT, FORK_SICKRAGE] SICKBEARD_TORRENT = [FORK_FAILED_TORRENT, FORK_SICKRAGE] diff --git a/core/autoProcess/autoProcessTV.py b/core/autoProcess/autoProcessTV.py index f0507365..3f8858e5 100644 --- a/core/autoProcess/autoProcessTV.py +++ b/core/autoProcess/autoProcessTV.py @@ -200,7 +200,7 @@ class autoProcessTV: if param == "failed": fork_params[param] = failed - if param in ["dirName", "dir"]: + if param in ["dirName", "dir", "proc_dir"]: fork_params[param] = dirName if remote_path: fork_params[param] = remoteDir(dirName) From c896c39dae0941d990d0a4f839f651ff21048f2f Mon Sep 17 00:00:00 2001 From: Jeffrey Kriegsman Date: Fri, 4 Dec 2015 22:18:49 +0100 Subject: [PATCH 2/2] Fork sickrage and sickragetv --- core/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 5ee64d43..e557043b 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -52,14 +52,16 @@ FORKS = {} FORK_DEFAULT = "default" FORK_FAILED = "failed" FORK_FAILED_TORRENT = "failed-torrent" +FORK_SICKRAGETV = "sickragetv" FORK_SICKRAGE = "sickrage" FORKS[FORK_DEFAULT] = {"dir": None} FORKS[FORK_FAILED] = {"dirName": None, "failed": None} FORKS[FORK_FAILED_TORRENT] = {"dir": None, "failed": None, "process_method": None} -FORKS[FORK_SICKRAGE] = {"proc_dir": None, "failed": None, "process_method": None, "force": None, "delete_on": None} +FORKS[FORK_SICKRAGETV] = {"proc_dir": None, "failed": None, "process_method": None, "force": None, "delete_on": None} +FORKS[FORK_SICKRAGE] = {"dir": None, "failed": None, "process_method": None, "force": None, "delete_on": None} ALL_FORKS = {"dir": None, "dirName": None, "proc_dir": None, "failed": None, "process_method": None, "force": None, "delete_on": None} -SICKBEARD_FAILED = [FORK_FAILED, FORK_FAILED_TORRENT, FORK_SICKRAGE] -SICKBEARD_TORRENT = [FORK_FAILED_TORRENT, FORK_SICKRAGE] +SICKBEARD_FAILED = [FORK_FAILED, FORK_FAILED_TORRENT, FORK_SICKRAGETV, FORK_SICKRAGE] +SICKBEARD_TORRENT = [FORK_FAILED_TORRENT, FORK_SICKRAGETV, FORK_SICKRAGE] # NZBGet Exit Codes NZBGET_POSTPROCESS_PARCHECK = 92