From 00ca156564bb5d42aa1609779f5f2d673baad823 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 29 Apr 2014 13:53:40 +0930
Subject: [PATCH] further requests status checks. fixes #348 #351

---
 nzbtomedia/autoProcess/autoProcessComics.py |  7 +++++--
 nzbtomedia/autoProcess/autoProcessGames.py  |  5 ++++-
 nzbtomedia/autoProcess/autoProcessMovie.py  | 10 ++++++++--
 nzbtomedia/autoProcess/autoProcessMusic.py  |  8 ++++++--
 nzbtomedia/autoProcess/autoProcessTV.py     |  7 +++++--
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/nzbtomedia/autoProcess/autoProcessComics.py b/nzbtomedia/autoProcess/autoProcessComics.py
index a0fb7065..78876934 100644
--- a/nzbtomedia/autoProcess/autoProcessComics.py
+++ b/nzbtomedia/autoProcess/autoProcessComics.py
@@ -54,5 +54,8 @@ class autoProcessComics:
         for line in r.iter_lines():
             if line: logger.postprocess("%s" % (line), section)
 
-        time.sleep(60) #wait 1 minute for now... need to see just what gets logged and how long it takes to process
-        return 0 # Success
+        if not r.status_code == requests.codes.ok:
+            logger.error("Server returned status %s" % (str(r.status_code)), section)
+            return 1
+        else:
+            return 0
diff --git a/nzbtomedia/autoProcess/autoProcessGames.py b/nzbtomedia/autoProcess/autoProcessGames.py
index 6c1f851f..88c58423 100644
--- a/nzbtomedia/autoProcess/autoProcessGames.py
+++ b/nzbtomedia/autoProcess/autoProcessGames.py
@@ -55,7 +55,10 @@ class autoProcessGames:
         result = r.json()
         logger.postprocess("%s" % (result),section)
 
-        if result['success']:
+        if not r.status_code == requests.codes.ok:
+            logger.error("Server returned status %s" % (str(r.status_code)), section)
+            return 1
+        elif result['success']:
             logger.postprocess("SUCCESS: Status for %s has been set to %s in Gamez" % (gamezID, downloadStatus),section)
             return 0 # Success
         else:
diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py
index 9d227da1..d17580ac 100644
--- a/nzbtomedia/autoProcess/autoProcessMovie.py
+++ b/nzbtomedia/autoProcess/autoProcessMovie.py
@@ -180,7 +180,10 @@ class autoProcessMovie:
                 return 1  # failure
 
             result = r.json()
-            if result['success']:
+            if not r.status_code == requests.codes.ok:
+                logger.error("Server returned status %s" % (str(r.status_code)), section)
+                return 1
+            elif result['success']:
                 logger.postprocess("SUCCESS: Finished %s scan for folder %s" % (method, dirName), section)
             else:
                 logger.error("FAILED: %s scan was unable to finish for folder %s. exiting!" % (method, dirName),
@@ -233,7 +236,10 @@ class autoProcessMovie:
                 return 1  # failure
 
             result = r.json()
-            if result['success']:
+            if not r.status_code == requests.codes.ok:
+                logger.error("Server returned status %s" % (str(r.status_code)), section)
+                return 1
+            elif result['success']:
                 logger.postprocess("SUCCESS: Snatched the next highest release ...", section)
                 return 0
             else:
diff --git a/nzbtomedia/autoProcess/autoProcessMusic.py b/nzbtomedia/autoProcess/autoProcessMusic.py
index f9665d61..06815a58 100644
--- a/nzbtomedia/autoProcess/autoProcessMusic.py
+++ b/nzbtomedia/autoProcess/autoProcessMusic.py
@@ -84,8 +84,12 @@ class autoProcessMusic:
                 return 1  # failure
 
             logger.debug("Result: %s" % (r.text),section)
-            if r.text == "OK":
-                logger.postprocess("SUCCESS: Post-Processing started for %s in folder %s ..." % (inputName, dirName),section)
+
+            if not r.status_code == requests.codes.ok:
+                logger.error("Server returned status %s" % (str(r.status_code)), section)
+                return 1
+            elif r.text == "OK":
+                logger.postprocess("SUCCESS: Post-Processing started for %s in folder %s ..." % (inputName, dirName),section) 
             else:
                 logger.error("FAILED: Post-Processing has NOT started for %s in folder %s. exiting!" % (inputName, dirName),section)
                 return 1 # failure
diff --git a/nzbtomedia/autoProcess/autoProcessTV.py b/nzbtomedia/autoProcess/autoProcessTV.py
index 53fd5b6e..616023d7 100644
--- a/nzbtomedia/autoProcess/autoProcessTV.py
+++ b/nzbtomedia/autoProcess/autoProcessTV.py
@@ -158,7 +158,10 @@ class autoProcessTV:
             logger.postprocess("Deleting failed files and folder %s" % (dirName),section)
             rmDir(dirName)
 
-        if Success:
+        if not r.status_code == requests.codes.ok:
+            logger.error("Server returned status %s" % (str(r.status_code)), section)
+            return 1
+        elif Success:
             return 0
         else:
-            return 1
+            return 1  # We did not receive Success confirmation.