From a00a7e9d7e2636fac8ab3b56bc53c62b2e56e45e Mon Sep 17 00:00:00 2001
From: Clinton Hall <fock_wulf@hotmail.com>
Date: Sun, 17 Feb 2013 11:08:59 +1030
Subject: [PATCH] Fixes + logger.conf

---
 TorrentToMedia.py | 12 ++++++------
 logger.conf       | 24 ++++++++++++++++++++++++
 nzbToMediaEnv.py  | 25 -------------------------
 3 files changed, 30 insertions(+), 31 deletions(-)
 create mode 100644 logger.conf

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 053f6746..dc242474 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -10,7 +10,7 @@ from nzbToMediaEnv import VERSION
 
 Logger = logging.getLogger()
 logFile = os.path.join(os.path.dirname(sys.argv[0]), "postprocess.log")
-logging.config.fileConfig(os.path.join(os.path.dirname(sys.argv[0]), "nzbToMediaEnv.py"))
+logging.config.fileConfig(os.path.join(os.path.dirname(sys.argv[0]), "logger.conf"))
 fileHandler = logging.FileHandler(logFile, encoding='utf-8', delay=True)
 fileHandler.formatter = logging.Formatter('%(asctime)s|%(levelname)-7.7s %(message)s', '%H:%M:%S')
 fileHandler.level = logging.DEBUG
@@ -128,10 +128,10 @@ DirBase = os.path.split(os.path.normpath(Directory)) #Test for blackhole sub-dir
 if DirBase[1] == Name:
 	Logger.info("Files appear to be in their own directory")
 	DirBase2 = os.path.split(os.path.normpath(DirBase[0]))
-		if DirBase2[1] == Movie_Cat or DirBase == TV_Cat:
-			if not Category:
-				Logger.info("Determined Category to be: %s", DirBase2[1])
-				Category = DirBase2[1]
+	if DirBase2[1] == Movie_Cat or DirBase == TV_Cat:
+		if not Category:
+			Logger.info("Determined Category to be: %s", DirBase2[1])
+			Category = DirBase2[1]
 	
 elif DirBase[1] == Movie_Cat or DirBase == TV_Cat:
 	if os.path.isdir(os.path.join(Directory, Name)):
@@ -222,7 +222,7 @@ elif useLink == 1 and packed == 0 and video == 1: ## hardlink
 			source = os.path.join(dirpath, file)
 			target = os.path.join(destination, file)
 			
-			if os.name == 'nt'
+			if os.name == 'nt':
 				subprocess.call(['cmd', '/C', 'mklink', '/H', source, target], stdout=subprocess.PIPE)
 			elif os.name == 'posix':
 				os.link(source, target)
diff --git a/logger.conf b/logger.conf
new file mode 100644
index 00000000..03f0b033
--- /dev/null
+++ b/logger.conf
@@ -0,0 +1,24 @@
+# Logging configuration
+[loggers]
+keys = root
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = NOTSET
+handlers = console
+qualname =
+
+[handler_console]
+class = StreamHandler
+args = (sys.stdout,)
+level = INFO
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s|%(levelname)-7.7s %(message)s
+datefmt = %H:%M:%S
diff --git a/nzbToMediaEnv.py b/nzbToMediaEnv.py
index d2bd850d..9cb31078 100644
--- a/nzbToMediaEnv.py
+++ b/nzbToMediaEnv.py
@@ -1,26 +1 @@
 VERSION = 'V4.3'
-
-# Logging configuration
-[loggers]
-keys = root
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = NOTSET
-handlers = console
-qualname =
-
-[handler_console]
-class = StreamHandler
-args = (sys.stdout,)
-level = INFO
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s|%(levelname)-7.7s %(message)s
-datefmt = %H:%M:%S