diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py index e3f6e69c..9794b193 100755 --- a/nzbToCouchPotato.py +++ b/nzbToCouchPotato.py @@ -241,7 +241,7 @@ else: dirNames = get_dirnames(section, category) for dirName in dirNames: 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: result = results Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, subsection) diff --git a/nzbToGamez.py b/nzbToGamez.py index b99ec432..b8c75a61 100755 --- a/nzbToGamez.py +++ b/nzbToGamez.py @@ -171,7 +171,7 @@ else: dirNames = get_dirnames(section, category) for dirName in dirNames: 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: result = results Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) diff --git a/nzbToHeadPhones.py b/nzbToHeadPhones.py index eba0cfa1..2a6bf473 100755 --- a/nzbToHeadPhones.py +++ b/nzbToHeadPhones.py @@ -181,7 +181,7 @@ else: dirNames = get_dirnames(section, category) for dirName in dirNames: 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: result = results Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) diff --git a/nzbToMylar.py b/nzbToMylar.py index 59958bc3..cac3c06c 100755 --- a/nzbToMylar.py +++ b/nzbToMylar.py @@ -173,7 +173,7 @@ else: dirNames = get_dirnames(section, category) for dirName in dirNames: 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: result = results Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) diff --git a/nzbToNzbDrone.py b/nzbToNzbDrone.py index 2178db8d..a611977c 100755 --- a/nzbToNzbDrone.py +++ b/nzbToNzbDrone.py @@ -205,7 +205,7 @@ else: dirNames = get_dirnames(section, category) for dirName in dirNames: 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: result = results Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py index 61696786..d36a730f 100755 --- a/nzbToSickBeard.py +++ b/nzbToSickBeard.py @@ -238,7 +238,7 @@ else: dirNames = get_dirnames(section, category) for dirName in dirNames: 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: result = results Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) diff --git a/nzbtomedia/nzbToMediaAutoFork.py b/nzbtomedia/nzbToMediaAutoFork.py index 466885e4..230dce43 100644 --- a/nzbtomedia/nzbToMediaAutoFork.py +++ b/nzbtomedia/nzbToMediaAutoFork.py @@ -5,37 +5,37 @@ from lib import requests from nzbToMediaConfig import config -def autoFork(section, category): +def autoFork(section, inputCategory): Logger = logging.getLogger() # config settings try: - host = config()[section][category]["host"] - port = config()[section][category]["port"] + host = config()[section][inputCategory]["host"] + port = config()[section][inputCategory]["port"] except: host = None port = None try: - username = config()[section][category]["username"] - password = config()[section][category]["password"] + username = config()[section][inputCategory]["username"] + password = config()[section][inputCategory]["password"] except: username = None password = None try: - ssl = int(config()[section][category]["ssl"]) + ssl = int(config()[section][inputCategory]["ssl"]) except (config, ValueError): ssl = 0 try: - web_root = config()[section][category]["web_root"] + web_root = config()[section][inputCategory]["web_root"] except config: web_root = "" 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: fork = "auto" @@ -57,7 +57,7 @@ def autoFork(section, category): else: r = requests.get(url) 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 if r.ok: @@ -65,10 +65,10 @@ def autoFork(section, category): break if detected: - Logger.info("" + section + ":" + category + " fork auto-detection successful ...") + Logger.info("" + section + ":" + inputCategory + " fork auto-detection successful ...") 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)] - 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] \ No newline at end of file