From a0f28804f624007922942f600b08a5a7caf21159 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sat, 25 Feb 2017 07:49:14 +1030
Subject: [PATCH] Add download id to Radarr call. Default 6 min wait. Fixes
 #1170

---
 autoProcessMedia.cfg.spec            | 4 ++--
 core/autoProcess/autoProcessMovie.py | 4 +++-
 nzbToMedia.py                        | 4 ++--
 nzbToNzbDrone.py                     | 2 +-
 nzbToRadarr.py                       | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/autoProcessMedia.cfg.spec b/autoProcessMedia.cfg.spec
index d1f9ae31..02798251 100644
--- a/autoProcessMedia.cfg.spec
+++ b/autoProcessMedia.cfg.spec
@@ -86,7 +86,7 @@
         keep_archive = 1
         extract = 1
         nzbExtractionBy = Downloader
-        wait_for = 2
+        wait_for = 6
         # Set this to minimum required size to consider a media file valid (in MB)
         minSize = 0
         # Enable/Disable deleting ignored files (samples and invalid media files)
@@ -153,7 +153,7 @@
         keep_archive = 1
         extract = 1
         nzbExtractionBy = Downloader
-        wait_for = 2
+        wait_for = 6
         # Set this to minimum required size to consider a media file valid (in MB)
         minSize = 0
         # Enable/Disable deleting ignored files (samples and invalid media files)
diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py
index 89cebeba..27ff1915 100644
--- a/core/autoProcess/autoProcessMovie.py
+++ b/core/autoProcess/autoProcessMovie.py
@@ -248,7 +248,9 @@ class autoProcessMovie(object):
                 logger.postprocess("Starting {0} scan for {1}".format(method, inputName), section)
 
             if section == "Radarr":
-                payload = {'name': 'DownloadedMovieScan', 'path': params['media_folder']}
+                payload = {'name': 'DownloadedMovieScan', 'path': params['media_folder'], 'downloadClientId': download_id}
+                if not download_id:
+                    payload.pop("downloadClientId")
                 logger.debug("Opening URL: {0} with PARAMS: {1}".format(baseURL, payload), section)
                 logger.postprocess("Starting DownloadedMovieScan scan for {0}".format(inputName), section)
 
diff --git a/nzbToMedia.py b/nzbToMedia.py
index 4d7b92d9..f4f8f55b 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -114,7 +114,7 @@
 # Radarr wait_for
 #
 # Set the number of minutes to wait after calling the renamer, to check the episode has changed status.
-#rawait_for=2
+#rawait_for=6
 
 # Radarr Delete Failed Downloads (0, 1).
 #
@@ -218,7 +218,7 @@
 # NzbDrone wait_for
 #
 # Set the number of minutes to wait after calling the renamer, to check the episode has changed status.
-#ndwait_for=2
+#ndwait_for=6
 
 # NzbDrone Delete Failed Downloads (0, 1).
 #
diff --git a/nzbToNzbDrone.py b/nzbToNzbDrone.py
index 2f7c8cfc..63e51193 100755
--- a/nzbToNzbDrone.py
+++ b/nzbToNzbDrone.py
@@ -66,7 +66,7 @@
 # NzbDrone wait_for
 #
 # Set the number of minutes to wait after calling the renamer, to check the episode has changed status.
-#ndwait_for=2
+#ndwait_for=6
 
 # NzbDrone Delete Failed Downloads (0, 1).
 #
diff --git a/nzbToRadarr.py b/nzbToRadarr.py
index 0565788a..321c8a63 100755
--- a/nzbToRadarr.py
+++ b/nzbToRadarr.py
@@ -66,7 +66,7 @@
 # Radarr wait_for
 #
 # Set the number of minutes to wait after calling the renamer, to check the episode has changed status.
-#rawait_for=2
+#rawait_for=6
 
 # Radarr Delete Failed Downloads (0, 1).
 #