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

@ -15,21 +15,21 @@ class autoProcessComics:
return 1 # failure
# auto-detect correct section
section = ''.join(map(str, config().issubsection(inputCategory, checkenabled=True)))
section = config().findsection(inputCategory)
if not section:
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.
Logger.info("Loading config from %s", config.CONFIG_FILE)
host = config()[section][inputCategory]["host"]
port = config()[section][inputCategory]["port"]
username = config()[section][inputCategory]["username"]
password = config()[section][inputCategory]["password"]
try:
ssl = int(config()[section][inputCategory]["ssl"])
except: