From aeaf58ceb7f6cdfbffe155f281a287d0b15c5d1d Mon Sep 17 00:00:00 2001 From: echel0n Date: Mon, 7 Apr 2014 03:09:16 -0700 Subject: [PATCH] Added check to all nzbTo* scripts for enabled/disabled sub-sections --- nzbToCouchPotato.py | 15 ++++++++------- nzbToGamez.py | 15 ++++++++------- nzbToHeadPhones.py | 15 ++++++++------- nzbToMedia.py | 15 ++++++++------- nzbToMylar.py | 15 ++++++++------- nzbToNzbDrone.py | 15 ++++++++------- nzbToSickBeard.py | 15 ++++++++------- 7 files changed, 56 insertions(+), 49 deletions(-) diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py index 9794b193..8476baae 100755 --- a/nzbToCouchPotato.py +++ b/nzbToCouchPotato.py @@ -238,13 +238,14 @@ else: Logger.warn("MAIN: Invalid number of arguments received from client.") for section, subsection in subsections.items(): for category in subsection: - 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) - if results != 0: - result = results - Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, subsection) + if int(config()[section][category]['enabled']) == 1: + 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) + if results != 0: + result = results + Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, subsection) if result == 0: Logger.info("MAIN: The autoProcessMovie script completed successfully.") diff --git a/nzbToGamez.py b/nzbToGamez.py index b8c75a61..fdf93d5b 100755 --- a/nzbToGamez.py +++ b/nzbToGamez.py @@ -168,13 +168,14 @@ else: Logger.warn("MAIN: Invalid number of arguments received from client.") for section, subsection in subsections.items(): for category in subsection: - 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) - if results != 0: - result = results - Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) + if int(config()[section][category]['enabled']) == 1: + 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) + if results != 0: + result = results + Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) if result == 0: Logger.info("MAIN: The autoProcessGames script completed successfully.") diff --git a/nzbToHeadPhones.py b/nzbToHeadPhones.py index 2a6bf473..eea0622d 100755 --- a/nzbToHeadPhones.py +++ b/nzbToHeadPhones.py @@ -178,13 +178,14 @@ else: Logger.warn("MAIN: Invalid number of arguments received from client.") for section, subsection in subsections.items(): for category in subsection: - 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) - if results != 0: - result = results - Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) + if int(config()[section][category]['enabled']) == 1: + 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) + if results != 0: + result = results + Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) if result == 0: Logger.info("MAIN: The autoProcessMusic script completed successfully.") diff --git a/nzbToMedia.py b/nzbToMedia.py index 6ec99493..0bed912c 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -448,13 +448,14 @@ else: Logger.warn("MAIN: Invalid number of arguments received from client.") for section, subsection in subsections.items(): for category in subsection: - dirNames = get_dirnames(section, category) - for dirName in dirNames: - Logger.info("MAIN: nzbToMedia running %s:%s as a manual run...", section, category) - results = 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) + if int(config()[section][category]['enabled']) == 1: + dirNames = get_dirnames(section, category) + for dirName in dirNames: + Logger.info("MAIN: nzbToMedia running %s:%s as a manual run...", section, category) + results = 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) if result == 0: Logger.info("MAIN: The nzbToMedia script completed successfully.") diff --git a/nzbToMylar.py b/nzbToMylar.py index cac3c06c..cbfafe40 100755 --- a/nzbToMylar.py +++ b/nzbToMylar.py @@ -170,13 +170,14 @@ else: Logger.warn("MAIN: Invalid number of arguments received from client.") for section, subsection in subsections.items(): for category in subsection: - 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) - if results != 0: - result = results - Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) + if int(config()[section][category]['enabled']) == 1: + 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) + if results != 0: + result = results + Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) if result == 0: Logger.info("MAIN: The autoProcessComics script completed successfully.") diff --git a/nzbToNzbDrone.py b/nzbToNzbDrone.py index 6c7a596b..e724fef6 100755 --- a/nzbToNzbDrone.py +++ b/nzbToNzbDrone.py @@ -202,13 +202,14 @@ else: Logger.warn("MAIN: Invalid number of arguments received from client.") for section, subsection in subsections.items(): for category in subsection: - 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) - if results != 0: - result = results - Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) + if int(config()[section][category]['enabled']) == 1: + 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) + if results != 0: + result = results + Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) if result == 0: Logger.info("MAIN: The autoProcessTV script completed successfully.") diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py index d36a730f..a48e0891 100755 --- a/nzbToSickBeard.py +++ b/nzbToSickBeard.py @@ -235,13 +235,14 @@ else: Logger.warn("MAIN: Invalid number of arguments received from client.") for section, subsection in subsections.items(): for category in subsection: - 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) - if results != 0: - result = results - Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) + if int(config()[section][category]['enabled']) == 1: + 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) + if results != 0: + result = results + Logger.info("MAIN: A problem was reported when trying to manually run %s:%s.", section, category) if result == 0: Logger.info("MAIN: The autoProcessTV script completed successfully.")