Merge branch 'clinton-hall/dev-CH'

Conflicts:
	TorrentToMedia.py
This commit is contained in:
echel0n 2014-04-11 00:25:13 -07:00
commit 279ce5e4d0
18 changed files with 324 additions and 461 deletions

View file

@ -196,22 +196,20 @@ elif len(sys.argv) >= config.SABNZB_0717_NO_OF_ARGUMENTS:
else:
result = 0
# init sub-sections
subsections = config().get_subsections(["NzbDrone"])
subsections = config()["NzbDrone"].subsections
Logger.warn("MAIN: Invalid number of arguments received from client.")
for section, subsection in subsections.items():
for category in subsection:
if config().isenabled(section, category):
if config()[section].isenabled(category):
dirNames = get_dirnames(section, category)
for dirName in dirNames:
Logger.info("MAIN: nzbToNzbDrone running %s:%s as a manual run...", section, category)
Logger.info("MAIN: nzbToNzbDrone running %s:%s as a manual run on folder %s ...", section, category, dirName)
results = autoProcessTV().processEpisode(dirName, os.path.basename(dirName), 0, inputCategory=category)
if results != 0:
result = results
Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category)
Logger.info("MAIN: A problem was reported when trying to manually run %s:%s on folder %s ...", section, category, dirName)
else:
Logger.info("MAIN: nzbTo%s %s:%s is DISABLED, you can enable this in autoProcessMedia.cfg ...", section,section, category)
Logger.info("MAIN: nzbToNzbDrone %s:%s is DISABLED, you can enable this in autoProcessMedia.cfg ...", section, category)
if result == 0:
Logger.info("MAIN: The autoProcessTV script completed successfully.")