Added string substitutions to config and corrected logging error

This commit is contained in:
2013-07-19 23:18:51 +10:00
parent be97271559
commit 00de89d02c
2 changed files with 32 additions and 23 deletions

View File

@@ -105,10 +105,10 @@ def main(argv):
filemanager = FileManager(settings) filemanager = FileManager(settings)
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
generallogger = createlogger("general", settings.generallogfile, generallogger = createlogger("general", settings.generallogfile(),
logging.debug) logging.DEBUG)
actionlogger = createlogger("action", settings.actionlogfile, actionlogger = createlogger("action", settings.actionlogfile(),
logging.info) logging.INFO)
if inputoptions.readonly: if inputoptions.readonly:
if inputoptions.doencode: if inputoptions.doencode:

View File

@@ -18,46 +18,55 @@ IllegalCharacters = "?"
APIKey = 3678177136222bf5002be209220ccb20 APIKey = 3678177136222bf5002be209220ccb20
[ "Shows" ] [ "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" ]] [[ "Thomas the Tank Engine & Friends" ]]
InputDirectory = "/srv/storage2/files/VideoProcessing/Thomas/Input/" InputDirectory = "%(VideoProcessingDir)sThomas/Input/"
UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/Thomas/" UnknownDirectory = "%(UnknownInput)sThomas/"
OutputDirectory = "/srv/storage2/videos/Kids/TV/Thomas The Tank Engine & Friends/" OutputDirectory = "%(KidsTVDir)sThomas The Tank Engine & Friends/"
alias = "Thomas and Friends", alias = "Thomas and Friends",
MythTvEpisodePrefix = , MythTvEpisodePrefix = ,
SickbeardPrefix = "" SickbeardPrefix = ""
[[ "Chuggington" ]] [[ "Chuggington" ]]
InputDirectory = "/srv/storage2/files/VideoProcessing/Chuggington/Input/" InputDirectory = "%(VideoProcessingDir)sChuggington/Input/"
UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/Chuggington/" UnknownDirectory = "%(UnknownInput)sChuggington/"
OutputDirectory = "/srv/storage2/videos/Kids/TV/Chuggington/" OutputDirectory = "%(KidsTVDir)sChuggington/"
alias = , alias = ,
MythTvEpisodePrefix = , MythTvEpisodePrefix = ,
SickbeardPrefix = "" SickbeardPrefix = ""
[[ "Mike the Knight" ]] [[ "Mike the Knight" ]]
InputDirectory = "/srv/storage2/files/VideoProcessing/MikeTheKnight/Input/" InputDirectory = "%(VideoProcessingDir)sMikeTheKnight/Input/"
UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/MikeTheKnight/" UnknownDirectory = "%(UnknownInput)sMikeTheKnight/"
OutputDirectory = "/srv/storage2/videos/Kids/TV/Mike the Knight/" OutputDirectory = "%(KidsTVDir)sMike the Knight/"
alias = , alias = ,
MythTvEpisodePrefix = "Mike the Knight and the ", Mike the Knight and " MythTvEpisodePrefix = "Mike the Knight and the ", Mike the Knight and "
SickbeardPrefix = "" SickbeardPrefix = ""
[[ "Octonauts" ]] [[ "Octonauts" ]]
InputDirectory = "/srv/storage2/files/VideoProcessing/Octonauts/Input/" InputDirectory = "%(VideoProcessingDir)sOctonauts/Input/"
UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/Octonauts/" UnknownDirectory = "%(UnknownInput)sOctonauts/"
OutputDirectory = "/srv/storage2/videos/Kids/TV/Octonauts/" OutputDirectory = "%(KidsTVDir)sOctonauts/"
alias = "The Octonauts", alias = "The Octonauts",
MythTvEpisodePrefix = "The Octonauts and ", MythTvEpisodePrefix = "The Octonauts and ",
SickbeardPrefix = "The" SickbeardPrefix = "The"
[[ "In the Night Garden" ]] [[ "In the Night Garden" ]]
InputDirectory = "/srv/storage2/files/VideoProcessing/InTheNightGarden/Input/" InputDirectory = "%(VideoProcessingDir)sInTheNightGarden/Input/"
UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/InTheNightGarden/" UnknownDirectory = "%(UnknownInput)sInTheNightGarden/"
OutputDirectory = "/srv/storage2/videos/Kids/TV/In The Night Garden/" OutputDirectory = "%(KidsTVDir)sIn The Night Garden/"
alias = , alias = ,
MythTvEpisodePrefix = , MythTvEpisodePrefix = ,
SickbeardPrefix = "" SickbeardPrefix = ""
[[ "Raa Raa! The Noisy Lion" ]] [[ "Raa Raa! The Noisy Lion" ]]
InputDirectory = "/srv/storage2/files/VideoProcessing/RaaRaa/Input/" InputDirectory = "%(VideoProcessingDir)sRaaRaa/Input/"
UnknownDirectory = "/srv/storage2/files/VideoProcessing/Unknown/RaaRaa/" UnknownDirectory = "%(UnknownInput)sRaaRaa/"
OutputDirectory = "/srv/storage2/videos/Kids/TV/Raa Raa the Noisy Lion/" OutputDirectory = "%(KidsTVDir)sRaa Raa the Noisy Lion/"
alias = ,
MythTvEpisodePrefix = ,
SickbeardPrefix = ""
[[ "Fireman Sam" ]]
InputDirectory = "%(VideoProcessingDir)sFiremanSam/Input/"
UnknownDirectory = "%(UnknownInput)sFiremanSam/"
OutputDirectory = "%(KidsTVDir)sFireman Sam/"
alias = , alias = ,
MythTvEpisodePrefix = , MythTvEpisodePrefix = ,
SickbeardPrefix = "" SickbeardPrefix = ""