From 22a216e6d725b11f17ddce1aab68e9bc38c08522 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Fri, 13 Jul 2018 09:20:38 +1200 Subject: [PATCH 1/5] Update nzbToNzbDrone.py --- nzbToNzbDrone.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nzbToNzbDrone.py b/nzbToNzbDrone.py index 63e51193..8d14babb 100755 --- a/nzbToNzbDrone.py +++ b/nzbToNzbDrone.py @@ -68,6 +68,11 @@ # Set the number of minutes to wait after calling the renamer, to check the episode has changed status. #ndwait_for=6 +# NzbDrone import mode (Move, Copy). +# +# set to define inport behaviour Move or Copy +#ndimportmode=Copy + # NzbDrone Delete Failed Downloads (0, 1). # # set to 1 to delete failed, or 0 to leave files in place. From 043d01ef3eeced48d62cc9e4537e6020ee0bd88e Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Fri, 13 Jul 2018 09:23:04 +1200 Subject: [PATCH 2/5] Update nzbToRadarr.py --- nzbToRadarr.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nzbToRadarr.py b/nzbToRadarr.py index c2f22206..8f739e26 100755 --- a/nzbToRadarr.py +++ b/nzbToRadarr.py @@ -73,6 +73,11 @@ # Set the number of minutes to wait after calling the renamer, to check the episode has changed status. #rawait_for=6 +# Radarr import mode (Move, Copy). +# +# set to define import behaviour Move or Copy +#raimportmode=Copy + # Radarr Delete Failed Downloads (0, 1). # # set to 1 to delete failed, or 0 to leave files in place. From 538f98e0a5aa957368286dd892615e84a0c38e97 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Fri, 13 Jul 2018 09:23:55 +1200 Subject: [PATCH 3/5] Update nzbToNzbDrone.py Fix typo --- nzbToNzbDrone.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nzbToNzbDrone.py b/nzbToNzbDrone.py index 8d14babb..d1b67593 100755 --- a/nzbToNzbDrone.py +++ b/nzbToNzbDrone.py @@ -70,7 +70,7 @@ # NzbDrone import mode (Move, Copy). # -# set to define inport behaviour Move or Copy +# set to define import behaviour Move or Copy #ndimportmode=Copy # NzbDrone Delete Failed Downloads (0, 1). From e70a138648b4a6d030e06780aced72a5c772c0c2 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Fri, 13 Jul 2018 09:25:16 +1200 Subject: [PATCH 4/5] Update nzbToMedia.py --- nzbToMedia.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nzbToMedia.py b/nzbToMedia.py index b7717475..0958a9e4 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -126,6 +126,11 @@ # api key for www.omdbapi.com (used as alternative to imdb to assist with movie identification). #raomdbapikey= +# Radarr import mode (Move, Copy). +# +# set to define import behaviour Move or Copy +#raimportmode=Copy + # Radarr Delete Failed Downloads (0, 1). # # set to 1 to delete failed, or 0 to leave files in place. @@ -230,6 +235,11 @@ # Set the number of minutes to wait after calling the renamer, to check the episode has changed status. #ndwait_for=6 +# NzbDrone import mode (Move, Copy). +# +# set to define import behaviour Move or Copy +#ndimportmode=Copy + # NzbDrone Delete Failed Downloads (0, 1). # # set to 1 to delete failed, or 0 to leave files in place. From c8d8598f0d513a8ca222e1af2bfb12450422db05 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Fri, 13 Jul 2018 09:28:54 +1200 Subject: [PATCH 5/5] Needed cfgKeys and envKeys to match. Note. The envKeys are only set if the variable is also set in NZBGet WebUI, as per other commits just added. --- core/nzbToMediaConfig.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/nzbToMediaConfig.py b/core/nzbToMediaConfig.py index c2989e9c..527c7b5f 100644 --- a/core/nzbToMediaConfig.py +++ b/core/nzbToMediaConfig.py @@ -383,7 +383,7 @@ class ConfigObj(configobj.ConfigObj, Section): section = "NzbDrone" envCatKey = 'NZBPO_NDCATEGORY' envKeys = ['ENABLED', 'HOST', 'APIKEY', 'PORT', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', - 'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH'] + 'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH', 'IMPORTMODE'] #new cfgKey added for importMode cfgKeys = ['enabled', 'host', 'apikey', 'port', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'Torrent_NoLink', 'nzbExtractionBy', 'wait_for', 'delete_failed', 'remote_path','importMode'] @@ -403,7 +403,7 @@ class ConfigObj(configobj.ConfigObj, Section): section = "Radarr" envCatKey = 'NZBPO_RACATEGORY' envKeys = ['ENABLED', 'HOST', 'APIKEY', 'PORT', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', - 'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH', 'OMDBAPIKEY'] + 'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH', 'OMDBAPIKEY', 'IMPORTMODE'] #new cfgKey added for importMode cfgKeys = ['enabled', 'host', 'apikey', 'port', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'Torrent_NoLink', 'nzbExtractionBy', 'wait_for', 'delete_failed', 'remote_path', 'omdbapikey','importMode']