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

@ -16,10 +16,10 @@ class autoProcessMusic:
return 1 # failure
# auto-detect correct section
section = config().issubsection(inputCategory,checkenabled=True)[0]
section = config().findsection(inputCategory)
if len(section) == 0:
Logger.error(
"MAIN: We were unable to find a processor for category %s that was enabled, please check your autoProcessMedia.cfg file.", inputCategory)
"MAIN: We were unable to find a section for category %s, please check your autoProcessMedia.cfg file.", inputCategory)
return 1
socket.setdefaulttimeout(int(config.NZBTOMEDIA_TIMEOUT)) #initialize socket timeout.