From 7d25a4206e8481216fc4f994df303227e2b7db54 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Wed, 13 Aug 2014 05:39:10 +0930 Subject: [PATCH] ignore any folder with .!sync. Fixes #532 --- nzbtomedia/nzbToMediaUtil.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index f8915cbf..43aa7ef7 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -489,16 +489,16 @@ def getDirs(section, subsection, link = 'hard'): folders = [] logger.info("Searching %s for mediafiles to post-process ..." % (path)) - + sync = [ o for o in os.listdir(path) if os.path.splitext(o)[1] == '.!sync' ] # search for single files and move them into their own folder for post-processing for mediafile in [ os.path.join(path, o) for o in os.listdir(path) if os.path.isfile(os.path.join(path, o)) ]: + if len(sync) > 0: + break try: logger.debug("Found file %s in root directory %s." % (os.path.split(mediafile)[1], path)) newPath = None fileExt = os.path.splitext(mediafile)[1] - if fileExt == '.!sync': - continue try: if fileExt in nzbtomedia.AUDIOCONTAINER: f = beets.mediafile.MediaFile(mediafile) @@ -556,8 +556,12 @@ def getDirs(section, subsection, link = 'hard'): removeEmptyFolders(path, removeRoot=False) if os.listdir(path): - folders.extend([os.path.join(path, o) for o in os.listdir(path) if - os.path.isdir(os.path.join(path, o))]) + for dir in [os.path.join(path, o) for o in os.listdir(path) if + os.path.isdir(os.path.join(path, o))]: + sync = [ o for o in os.listdir(dir) if os.path.splitext(o)[1] == '.!sync' ] + if len(sync) > 0: + continue + folders.extend([dir]) return folders try: