From bf727877d16bc38d557c889c295c88429517ca72 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Sun, 10 Aug 2014 09:54:01 +0930 Subject: [PATCH] ensure correct name is logged. Fixes #527 --- nzbtomedia/nzbToMediaSceneExceptions.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nzbtomedia/nzbToMediaSceneExceptions.py b/nzbtomedia/nzbToMediaSceneExceptions.py index 94254a33..b7bb5682 100644 --- a/nzbtomedia/nzbToMediaSceneExceptions.py +++ b/nzbtomedia/nzbToMediaSceneExceptions.py @@ -33,15 +33,15 @@ def process_all_exceptions(name, dirname): def replace_filename(filename, dirname, name): head, fileExtension = os.path.splitext(os.path.basename(filename)) if media_pattern.search(os.path.basename(dirname).replace(' ','.')) is not None: - newname = os.path.basename(dirname) + newname = os.path.basename(dirname).replace(' ', '.') logger.debug("Replacing file name %s with directory name %s" % (head, newname), "EXCEPTION") elif media_pattern.search(name.replace(' ','.').lower()) is not None: - newname = name + newname = name.replace(' ', '.') logger.debug("Replacing file name %s with download name %s" % (head, newname), "EXCEPTION") else: logger.warning("No name replacement determined for %s" % (head), "EXCEPTION") return - newfile = newname.replace(' ', '.') + fileExtension + newfile = newname + fileExtension newfilePath = os.path.join(dirname, newfile) try: os.rename(filename, newfilePath) @@ -66,8 +66,9 @@ def reverse_filename(filename, dirname, name): newname = new_words[::-1] + na_parts.group(1)[::-1] else: newname = head[::-1].title() + newname = newname.replace(' ', '.') logger.debug("Reversing filename %s to %s" % (head, newname), "EXCEPTION") - newfile = newname.replace(' ', '.') + fileExtension + newfile = newname + fileExtension newfilePath = os.path.join(dirname, newfile) try: os.rename(filename, newfilePath)