From ab8248977fc195643171600eca917063ad601e69 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Tue, 15 Jul 2014 07:50:11 +0930 Subject: [PATCH] added back force_clean. Fixes #490 --- nzbtomedia/__init__.py | 2 +- nzbtomedia/nzbToMediaUtil.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index cdfbee7e..591de164 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -273,7 +273,7 @@ def initialize(section=None): GIT_PATH = CFG['General']['git_path'] GIT_USER = CFG['General']['git_user'] or 'clinton-hall' GIT_BRANCH = CFG['General']['git_branch'] or 'master' - FORCE_CLEAN = CFG["General"]["force_clean"] + FORCE_CLEAN = int(CFG["General"]["force_clean"]) FFMPEG_PATH = CFG["General"]["ffmpeg_path"] CHECK_MEDIA = int(CFG["General"]["check_media"]) SAFE_MODE = int(CFG["General"]["safe_mode"]) diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index d69029dc..a655dc23 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -578,7 +578,10 @@ def cleanDir(path, section, subsection): if not os.path.exists(path): logger.info('Directory %s has been processed and removed ...' % (path), 'CLEANDIR') return - + if nzbtomedia.FORCE_CLEAN: + logger.info('Doing Forceful Clean of %s' % (path), 'CLEANDIR') + rmDir(path) + return try: minSize = int(nzbtomedia.CFG[section][subsection]['minSize']) except:minSize = 0