From a29206d51cc0fe45c548825775185261a4fa536c Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Wed, 22 Jan 2014 09:50:32 +1030
Subject: [PATCH] move socket timeout before url call for renamer. fixes #242

---
 autoProcess/autoProcessMovie.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/autoProcess/autoProcessMovie.py b/autoProcess/autoProcessMovie.py
index e3b97d93..7149fd15 100644
--- a/autoProcess/autoProcessMovie.py
+++ b/autoProcess/autoProcessMovie.py
@@ -258,6 +258,9 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
     process_all_exceptions(nzbName.lower(), dirName)
     nzbName, dirName = converto_to_ascii(nzbName, dirName)
 
+    TimeOut2 = int(wait_for) * 60 # If transfering files across directories, it now appears CouchPotato can take a while to confirm this url request... Try using wait_for timing.
+    socket.setdefaulttimeout(int(TimeOut2)) #initialize socket timeout. We may now be able to remove the delays from the wait_for section below?
+
     if status == 0:
         if transcode == 1:
             result = Transcoder.Transcode_directory(dirName)
@@ -311,8 +314,6 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
         url = baseURL + "movie.searcher.try_next/?id=" + movie_id
 
         Logger.debug("Opening URL: %s", url)
-        TimeOut2 = wait_for * 60 # If transfering files across directories, it now appears CouchPotato can take a while to confirm this url request... Try using wait_for timing.
-        socket.setdefaulttimeout(int(TimeOut2)) #initialize socket timeout. We may now be able to remove the delays from the wait_for section below?
 
         try:
             urlObj = urllib.urlopen(url)
@@ -338,8 +339,9 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
 
     # we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing.
     socket.setdefaulttimeout(int(TimeOut)) #initialize socket timeout.
+
     start = datetime.datetime.now()  # set time for timeout
-    pause_for = wait_for * 10 # keep this so we only ever have 6 complete loops. This may not be necessary now?
+    pause_for = int(wait_for) * 10 # keep this so we only ever have 6 complete loops. This may not be necessary now?
     while (datetime.datetime.now() - start) < datetime.timedelta(minutes=wait_for):  # only wait 2 (default) minutes, then return.
         movie_status, clientAgent, download_id, release_status = get_status(baseURL, movie_id, clientAgent, download_id) # get the current status fo this movie.
         if movie_status != initial_status:  # Something has changed. CPS must have processed this movie.