From 5bd3a6ac9d98107a8df536028ed71c8ac61bfce5 Mon Sep 17 00:00:00 2001 From: echel0n Date: Fri, 25 Apr 2014 02:46:04 -0700 Subject: [PATCH] Fixed issue with getDirs function --- TorrentToMedia.py | 12 ++++++------ nzbToMedia.py | 12 ++++++------ nzbtomedia/nzbToMediaUtil.py | 9 ++++----- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index eaeb69f6..21012964 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -312,10 +312,10 @@ def main(args): # Perform Manual Post-Processing logger.warning("Invalid number of arguments received from client, Switching to manual run mode ...") - for section, subsection in nzbtomedia.SECTIONS.items(): - for category in subsection: - for dirName in nzbtomedia.getDirs(subsection[category]): - logger.info("Starting manual run for %s:%s - Folder:%s" % (section, category, dirName)) + for section, subsections in nzbtomedia.SECTIONS.items(): + for subsection in subsections: + for dirName in nzbtomedia.getDirs(section,subsection): + logger.info("Starting manual run for %s:%s - Folder:%s" % (section, subsection, dirName)) logger.info("Checking database for download info for %s ..." % (os.path.basename(dirName))) downloadInfo = nzbtomedia.get_downloadInfo(os.path.basename(dirName), 0) @@ -344,11 +344,11 @@ def main(args): if not clientAgent.lower() in (nzbtomedia.TORRENT_CLIENTS,'manual'): continue - results = processTorrent(dirName, os.path.basename(dirName), category, inputHash, inputID, + results = processTorrent(dirName, os.path.basename(dirName), subsection, inputHash, inputID, clientAgent) if results != 0: logger.error("A problem was reported when trying to perform a manual run for %s:%s." % ( - section, category)) + section, subsection)) result = results if result == 0: diff --git a/nzbToMedia.py b/nzbToMedia.py index 663e73fe..a6213ea9 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -460,10 +460,10 @@ def main(args, section=None): # Perform Manual Post-Processing logger.warning("Invalid number of arguments received from client, Switching to manual run mode ...") - for section, subsection in nzbtomedia.SECTIONS.items(): - for category in subsection: - for dirName in getDirs(subsection[category]): - logger.info("Starting manual run for %s:%s - Folder:%s" % (section, category, dirName)) + for section, subsections in nzbtomedia.SECTIONS.items(): + for subsection in subsections: + for dirName in getDirs(section, subsection): + logger.info("Starting manual run for %s:%s - Folder:%s" % (section, subsection, dirName)) logger.info("Checking database for download info for %s ..." % (os.path.basename(dirName))) downloadInfo = get_downloadInfo(os.path.basename(dirName), 0) @@ -489,10 +489,10 @@ def main(args, section=None): continue results = process(dirName, os.path.basename(dirName), 0, clientAgent=clientAgent, - download_id=download_id, inputCategory=category) + download_id=download_id, inputCategory=subsection) if results != 0: logger.error("A problem was reported when trying to perform a manual run for %s:%s." % ( - section, category)) + section, subsection)) result = results if result == 0: diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index 19d55e93..b08234ff 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -383,8 +383,7 @@ def parse_args(clientAgent, args): return None, None, None, None, None -def getDirs(subsection): - subsectionName = subsection.keys()[0] +def getDirs(section, subsection): to_return = [] def processDir(path): @@ -437,16 +436,16 @@ def getDirs(subsection): os.path.isdir(os.path.join(path, o))]) return folders - watch_dir = subsection["watch_dir"] + watch_dir = nzbtomedia.CFG[section][subsection]["watch_dir"] if os.path.exists(watch_dir): to_return.extend(processDir(watch_dir)) - outputDirectory = os.path.join(nzbtomedia.OUTPUTDIRECTORY, subsectionName) + outputDirectory = os.path.join(nzbtomedia.OUTPUTDIRECTORY, subsection) if os.path.exists(outputDirectory): to_return.extend(processDir(outputDirectory)) if not to_return: - logger.debug("No directories identified in %s for post-processing" % (subsectionName)) + logger.debug("No directories identified in %s:%s for post-processing" % (section,subsection)) return list(set(to_return))