From 00de89d02c41b21dcc657851666d79f0524cde5c Mon Sep 17 00:00:00 2001
From: Shane Frischkorn <shanef@gmail.com>
Date: Fri, 19 Jul 2013 23:18:51 +1000
Subject: [PATCH] Added string substitutions to config and corrected logging
 error

---
 TVEncoder.py |  8 ++++----
 settings.cfg | 47 ++++++++++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/TVEncoder.py b/TVEncoder.py
index fcf78ea..dad2e57 100644
--- a/TVEncoder.py
+++ b/TVEncoder.py
@@ -105,10 +105,10 @@ def main(argv):
     filemanager = FileManager(settings)
 
     logging.basicConfig(level=logging.DEBUG)
-    generallogger = createlogger("general", settings.generallogfile,
-                                 logging.debug)
-    actionlogger = createlogger("action", settings.actionlogfile,
-                                logging.info)
+    generallogger = createlogger("general", settings.generallogfile(),
+                                 logging.DEBUG)
+    actionlogger = createlogger("action", settings.actionlogfile(),
+                                logging.INFO)
 
     if inputoptions.readonly:
         if inputoptions.doencode:
diff --git a/settings.cfg b/settings.cfg
index 9ff8c44..59cecf1 100644
--- a/settings.cfg
+++ b/settings.cfg
@@ -18,46 +18,55 @@ IllegalCharacters = "?"
 	APIKey = 3678177136222bf5002be209220ccb20
 
 [ "Shows" ]
-	UnknownInput = "/srv/storage2/files/VideoProcessing/Unknown/"
+    VideoProcessingDir = "/srv/storage2/files/VideoProcessing/"
+    KidsTVDir = "/srv/storage2/videos/Kids/TV/"
+    UnknownInput = "%(VideoProcessingDir)sUnknown/"
     [[ "Thomas the Tank Engine & Friends" ]]
-	    InputDirectory = "/srv/storage2/files/VideoProcessing/Thomas/Input/"
-	    UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/Thomas/"
-        OutputDirectory = "/srv/storage2/videos/Kids/TV/Thomas The Tank Engine & Friends/"
+        InputDirectory = "%(VideoProcessingDir)sThomas/Input/"
+        UnknownDirectory = "%(UnknownInput)sThomas/"
+        OutputDirectory = "%(KidsTVDir)sThomas The Tank Engine & Friends/"
         alias = "Thomas and Friends",
         MythTvEpisodePrefix = ,
         SickbeardPrefix = ""
 	[[ "Chuggington" ]]
-		InputDirectory = "/srv/storage2/files/VideoProcessing/Chuggington/Input/"
-	    UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/Chuggington/"
-        OutputDirectory = "/srv/storage2/videos/Kids/TV/Chuggington/"
+        InputDirectory = "%(VideoProcessingDir)sChuggington/Input/"
+        UnknownDirectory = "%(UnknownInput)sChuggington/"
+        OutputDirectory = "%(KidsTVDir)sChuggington/"
         alias = ,
         MythTvEpisodePrefix = ,
         SickbeardPrefix = ""
 	[[ "Mike the Knight" ]]
-		InputDirectory = "/srv/storage2/files/VideoProcessing/MikeTheKnight/Input/"
-	    UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/MikeTheKnight/"
-        OutputDirectory = "/srv/storage2/videos/Kids/TV/Mike the Knight/"
+        InputDirectory = "%(VideoProcessingDir)sMikeTheKnight/Input/"
+	   UnknownDirectory = "%(UnknownInput)sMikeTheKnight/"
+        OutputDirectory = "%(KidsTVDir)sMike the Knight/"
         alias = ,
         MythTvEpisodePrefix = "Mike the Knight and the ", Mike the Knight and "
         SickbeardPrefix = ""
 	[[ "Octonauts" ]]
-		InputDirectory = "/srv/storage2/files/VideoProcessing/Octonauts/Input/"
-	    UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/Octonauts/"
-        OutputDirectory = "/srv/storage2/videos/Kids/TV/Octonauts/"
+        InputDirectory = "%(VideoProcessingDir)sOctonauts/Input/"
+	   UnknownDirectory = "%(UnknownInput)sOctonauts/"
+        OutputDirectory = "%(KidsTVDir)sOctonauts/"
         alias = "The Octonauts",
         MythTvEpisodePrefix = "The Octonauts and ",
         SickbeardPrefix = "The"
 	[[ "In the Night Garden" ]]
-		InputDirectory = "/srv/storage2/files/VideoProcessing/InTheNightGarden/Input/"
-	    UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/InTheNightGarden/"
-        OutputDirectory = "/srv/storage2/videos/Kids/TV/In The Night Garden/"
+        InputDirectory = "%(VideoProcessingDir)sInTheNightGarden/Input/"
+	   UnknownDirectory = "%(UnknownInput)sInTheNightGarden/"
+        OutputDirectory = "%(KidsTVDir)sIn The Night Garden/"
         alias = ,
         MythTvEpisodePrefix = ,
         SickbeardPrefix = ""
 	[[ "Raa Raa! The Noisy Lion" ]]
-		InputDirectory = "/srv/storage2/files/VideoProcessing/RaaRaa/Input/"
-	    UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/RaaRaa/"
-        OutputDirectory = "/srv/storage2/videos/Kids/TV/Raa Raa the Noisy Lion/"
+        InputDirectory = "%(VideoProcessingDir)sRaaRaa/Input/"
+	   UnknownDirectory = "%(UnknownInput)sRaaRaa/"
+        OutputDirectory = "%(KidsTVDir)sRaa Raa the Noisy Lion/"
+        alias = ,
+        MythTvEpisodePrefix = ,
+        SickbeardPrefix = ""
+	[[ "Fireman Sam" ]]
+        InputDirectory = "%(VideoProcessingDir)sFiremanSam/Input/"
+	   UnknownDirectory = "%(UnknownInput)sFiremanSam/"
+        OutputDirectory = "%(KidsTVDir)sFireman Sam/"
         alias = ,
         MythTvEpisodePrefix = ,
         SickbeardPrefix = ""
\ No newline at end of file