From 2c59c64db6e3690a353b2656db0380093e52dd54 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Fri, 14 Jun 2013 18:20:37 +0930 Subject: [PATCH] allow manula run for Mylar. fixes #155 --- autoProcess/autoProcessComics.py | 11 +++++++++-- autoProcessMedia.cfg.sample | 1 + nzbToMylar.py | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/autoProcess/autoProcessComics.py b/autoProcess/autoProcessComics.py index 866bda50..00771057 100644 --- a/autoProcess/autoProcessComics.py +++ b/autoProcess/autoProcessComics.py @@ -54,11 +54,18 @@ def processEpisode(dirName, nzbName=None, status=0): web_root = config.get("Mylar", "web_root") except ConfigParser.NoOptionError: web_root = "" - + + try: + watch_dir = config.get("Mylar", "watch_dir") + except ConfigParser.NoOptionError: + watch_dir = "" params = {} + + if dirName == "Manual Run" and watch_dir != "": + dirName = watch_dir params['nzb_folder'] = dirName - if nzbName != None: + if nzbName != None and nzbName != "Manual Run": params['nzb_name'] = nzbName myOpener = AuthURLOpener(username, password) diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample index aecdb7c6..e9c04fe0 100644 --- a/autoProcessMedia.cfg.sample +++ b/autoProcessMedia.cfg.sample @@ -57,6 +57,7 @@ password= ###### ADVANCED USE - ONLY EDIT IF YOU KNOW WHAT YOU'RE DOING ###### web_root= ssl=0 +watch_dir = [Gamez] diff --git a/nzbToMylar.py b/nzbToMylar.py index 46ec5784..fc88ffb2 100755 --- a/nzbToMylar.py +++ b/nzbToMylar.py @@ -172,8 +172,10 @@ elif len(sys.argv) == NZBGET_NO_OF_ARGUMENTS: Logger.info("Script triggered from NZBGet, starting autoProcessComics...") result = autoProcessComics.processEpisode(sys.argv[1], sys.argv[2], sys.argv[3]) else: - Logger.warn("Invalid number of arguments received from client. Exiting") - sys.exit(-1) + + Logger.warn("Invalid number of arguments received from client.") + Logger.info("Running autoProcessComics as a manual run...") + result = autoProcessComics.processEpisode('Manual Run', 'Manual Run', 0) if result == 0: Logger.info("MAIN: The autoProcessComics script completed successfully.")