From 5165ee31bab4b00b86a86109f4386f5082fa8542 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 4 Apr 2014 09:39:26 +1030
Subject: [PATCH] log warning, prevent crash, and exit gracefully if no manual
 directories defined.

---
 autoProcess/nzbToMediaUtil.py | 15 +++++++++------
 nzbToMedia.py                 |  2 +-
 nzbToSickBeard.py             |  8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/autoProcess/nzbToMediaUtil.py b/autoProcess/nzbToMediaUtil.py
index e849e3a8..6792629f 100644
--- a/autoProcess/nzbToMediaUtil.py
+++ b/autoProcess/nzbToMediaUtil.py
@@ -467,14 +467,17 @@ def get_dirnames(section, category):
         outputDirectory = ""
 
     # set dirName
-    dirNames = None
+    dirNames = []
     if watch_dir != "":
         if os.path.exists(watch_dir):
-            dirNames = [os.path.join(watch_dir, o) for o in os.listdir(watch_dir) if
-                        os.path.isdir(os.path.join(watch_dir, o))]
-    elif outputDirectory != "":
+            dirNames.extend([os.path.join(watch_dir, o) for o in os.listdir(watch_dir) if
+                        os.path.isdir(os.path.join(watch_dir, o))])
+    if outputDirectory != "":
         if os.path.exists(outputDirectory):
-            dirNames = [os.path.join(outputDirectory, o) for o in os.listdir(outputDirectory) if
-                        os.path.isdir(os.path.join(outputDirectory, o))]
+            dirNames.extend([os.path.join(outputDirectory, o) for o in os.listdir(outputDirectory) if
+                        os.path.isdir(os.path.join(outputDirectory, o))])
+
+    if not dirNames:
+        Logger.warn("No Directories identified to Scan.")
 
     return dirNames
\ No newline at end of file
diff --git a/nzbToMedia.py b/nzbToMedia.py
index b8446a56..58a48b80 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -414,7 +414,7 @@ if inputCategory in cpsCategory:
     Logger.info("MAIN: Calling CouchPotatoServer to post-process: %s", inputName)
     result = autoProcessMovie.process(nzbDir, inputName, status, clientAgent, download_id, inputCategory)
 elif inputCategory in sbCategory:
-    result = 0
+    result = 1
     if isinstance(nzbDir, list):
         for dirName in nzbDir:
             Logger.info("MAIN: Calling Sick-Beard to post-process: %s", inputName)
diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py
index fef4a4a6..b694d7cc 100755
--- a/nzbToSickBeard.py
+++ b/nzbToSickBeard.py
@@ -229,13 +229,13 @@ elif len(sys.argv) >= SABNZB_0717_NO_OF_ARGUMENTS:
     clientAgent = "sabnzbd"
     result = autoProcessTV.processEpisode(sys.argv[1], sys.argv[2], sys.argv[7], clientAgent, sys.argv[5])
 else:
-    result = 0
-    sbCategory = (config().get("SickBeard", "sbCategory")).split(',')  # tv
-    dirNames = get_dirnames("SickBeard", sbCategory[0])
-
     Logger.debug("MAIN: Invalid number of arguments received from client.")
     Logger.info("MAIN: Running autoProcessTV as a manual run...")
 
+    result = 1
+    sbCategory = (config().get("SickBeard", "sbCategory")).split(',')  # tv
+    dirNames = get_dirnames("SickBeard", sbCategory[0])
+
     for dirName in dirNames:
         Logger.info("MAIN: Calling Sick-Beard to post-process: %s", dirName)
         result = autoProcessTV.processEpisode(dirName, dirName, 0)