More small fixes

This commit is contained in:
echel0n 2014-04-07 02:22:02 -07:00
parent ce543cdcb9
commit 5c264f0405
7 changed files with 18 additions and 18 deletions

View file

@ -241,7 +241,7 @@ else:
dirNames = get_dirnames(section, category) dirNames = get_dirnames(section, category)
for dirName in dirNames: for dirName in dirNames:
Logger.info("MAIN: nzbToCouchPotato running %s:%s as a manual run...", section, subsection) Logger.info("MAIN: nzbToCouchPotato running %s:%s as a manual run...", section, subsection)
results = autoProcessMovie.process(dirName, os.path.basename(dirName), 0, inputCategory=category) results = autoProcessMovie().process(dirName, os.path.basename(dirName), 0, inputCategory=category)
if results != 0: if results != 0:
result = results result = results
Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, subsection) Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, subsection)

View file

@ -171,7 +171,7 @@ else:
dirNames = get_dirnames(section, category) dirNames = get_dirnames(section, category)
for dirName in dirNames: for dirName in dirNames:
Logger.info("MAIN: nzbToGamez running %s:%s as a manual run...", section, category) Logger.info("MAIN: nzbToGamez running %s:%s as a manual run...", section, category)
results = autoProcessGames.process(dirName, os.path.basename(dirName), 0, inputCategory=category) results = autoProcessGames().process(dirName, os.path.basename(dirName), 0, inputCategory=category)
if results != 0: if results != 0:
result = results 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.", section, category)

View file

@ -181,7 +181,7 @@ else:
dirNames = get_dirnames(section, category) dirNames = get_dirnames(section, category)
for dirName in dirNames: for dirName in dirNames:
Logger.info("MAIN: nzbToHeadPhones running %s:%s as a manual run...", section, category) Logger.info("MAIN: nzbToHeadPhones running %s:%s as a manual run...", section, category)
results = autoProcessMusic.process(dirName, os.path.basename(dirName), 0, inputCategory=category) results = autoProcessMusic().process(dirName, os.path.basename(dirName), 0, inputCategory=category)
if results != 0: if results != 0:
result = results 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.", section, category)

View file

@ -173,7 +173,7 @@ else:
dirNames = get_dirnames(section, category) dirNames = get_dirnames(section, category)
for dirName in dirNames: for dirName in dirNames:
Logger.info("MAIN: nzbToMylar running %s:%s as a manual run...", section, category) Logger.info("MAIN: nzbToMylar running %s:%s as a manual run...", section, category)
results = autoProcessComics.processEpisode(dirName, os.path.basename(dirName), 0, inputCategory=category) results = autoProcessComics().processEpisode(dirName, os.path.basename(dirName), 0, inputCategory=category)
if results != 0: if results != 0:
result = results 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.", section, category)

View file

@ -205,7 +205,7 @@ else:
dirNames = get_dirnames(section, category) dirNames = get_dirnames(section, category)
for dirName in dirNames: 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...", section, category)
results = autoProcessTV.processEpisode(dirName, os.path.basename(dirName), 0, inputCategory=category) results = autoProcessTV().processEpisode(dirName, os.path.basename(dirName), 0, inputCategory=category)
if results != 0: if results != 0:
result = results 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.", section, category)

View file

@ -238,7 +238,7 @@ else:
dirNames = get_dirnames(section, category) dirNames = get_dirnames(section, category)
for dirName in dirNames: for dirName in dirNames:
Logger.info("MAIN: nzbTo%s running %s:%s as a manual run...", section, section, category) Logger.info("MAIN: nzbTo%s running %s:%s as a manual run...", section, section, category)
results = autoProcessTV.processEpisode(dirName, os.path.basename(dirName), 0, inputCategory=category) results = autoProcessTV().processEpisode(dirName, os.path.basename(dirName), 0, inputCategory=category)
if results != 0: if results != 0:
result = results 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.", section, category)

View file

@ -5,37 +5,37 @@ from lib import requests
from nzbToMediaConfig import config from nzbToMediaConfig import config
def autoFork(section, category): def autoFork(section, inputCategory):
Logger = logging.getLogger() Logger = logging.getLogger()
# config settings # config settings
try: try:
host = config()[section][category]["host"] host = config()[section][inputCategory]["host"]
port = config()[section][category]["port"] port = config()[section][inputCategory]["port"]
except: except:
host = None host = None
port = None port = None
try: try:
username = config()[section][category]["username"] username = config()[section][inputCategory]["username"]
password = config()[section][category]["password"] password = config()[section][inputCategory]["password"]
except: except:
username = None username = None
password = None password = None
try: try:
ssl = int(config()[section][category]["ssl"]) ssl = int(config()[section][inputCategory]["ssl"])
except (config, ValueError): except (config, ValueError):
ssl = 0 ssl = 0
try: try:
web_root = config()[section][category]["web_root"] web_root = config()[section][inputCategory]["web_root"]
except config: except config:
web_root = "" web_root = ""
try: try:
fork = config.FORKS.items()[config.FORKS.keys().index(config()[section][category]["fork"])] fork = config.FORKS.items()[config.FORKS.keys().index(config()[section][inputCategory]["fork"])]
except: except:
fork = "auto" fork = "auto"
@ -57,7 +57,7 @@ def autoFork(section, category):
else: else:
r = requests.get(url) r = requests.get(url)
except requests.ConnectionError: except requests.ConnectionError:
Logger.info("Could not connect to " + section + ":" + category + " to perform auto-fork detection!") Logger.info("Could not connect to " + section + ":" + inputCategory + " to perform auto-fork detection!")
break break
if r.ok: if r.ok:
@ -65,10 +65,10 @@ def autoFork(section, category):
break break
if detected: if detected:
Logger.info("" + section + ":" + category + " fork auto-detection successful ...") Logger.info("" + section + ":" + inputCategory + " fork auto-detection successful ...")
else: else:
Logger.info("" + section + ":" + category + " fork auto-detection failed") Logger.info("" + section + ":" + inputCategory + " fork auto-detection failed")
fork = config.FORKS.items()[config.FORKS.keys().index(config.FORK_DEFAULT)] fork = config.FORKS.items()[config.FORKS.keys().index(config.FORK_DEFAULT)]
Logger.info("" + section + ":" + category + " fork set to %s", fork[0]) Logger.info("" + section + ":" + inputCategory + " fork set to %s", fork[0])
return fork[0], fork[1] return fork[0], fork[1]