From 9eeff323ac6b956700812d75f0745be21e51d366 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 6 Jun 2014 12:36:27 +0930
Subject: [PATCH] leave comic book archives alone. #351 #421

---
 TorrentToMedia.py                           |  5 +----
 nzbtomedia/__init__.py                      |  4 +---
 nzbtomedia/autoProcess/autoProcessComics.py |  3 +--
 nzbtomedia/extractor/extractor.py           |  2 ++
 nzbtomedia/nzbToMediaUtil.py                | 17 +----------------
 5 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 37fc2810..a3095fb1 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -137,10 +137,7 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
     for inputFile in inputFiles:
         filePath = os.path.dirname(inputFile)
         fileName, fileExt = os.path.splitext(os.path.basename(inputFile))
-        if fileExt in nzbtomedia.EXT_REPLACE:
-            fullFileName = fileName + nzbtomedia.EXT_REPLACE[fileExt]
-        else:
-            fullFileName = os.path.basename(inputFile)
+        fullFileName = os.path.basename(inputFile)
 
         targetFile = nzbtomedia.os.path.join(outputDestination, fullFileName)
         if inputCategory in nzbtomedia.NOFLATTEN:
diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py
index 99651de9..b86df7e0 100644
--- a/nzbtomedia/__init__.py
+++ b/nzbtomedia/__init__.py
@@ -109,7 +109,6 @@ DELUGEPWD = None
 
 EXTCONTAINER = []
 COMPRESSEDCONTAINER = []
-EXT_REPLACE = {}
 MEDIACONTAINER = []
 AUDIOCONTAINER = []
 METACONTAINER = []
@@ -163,7 +162,7 @@ def initialize(section=None):
         OUTPUTVIDEOBITRATE, OUTPUTAUDIOCODEC, OUTPUTAUDIOBITRATE, OUTPUTSUBTITLECODEC, OUTPUTFASTSTART, OUTPUTQUALITYPERCENT, \
         NICENESS, LOG_DEBUG, FORCE_CLEAN, FFMPEG_PATH, FFMPEG, FFPROBE, AUDIOCONTAINER, EXTCONTAINER, TORRENT_CLASS, \
         DELETE_ORIGINAL, PASSWORDSFILE, USER_DELAY, USER_SCRIPT, USER_SCRIPT_CLEAN, USER_SCRIPT_MEDIAEXTENSIONS, \
-        USER_SCRIPT_PARAM, USER_SCRIPT_RUNONCE, USER_SCRIPT_SUCCESSCODES, DOWNLOADINFO, EXT_REPLACE, CHECK_MEDIA, SAFE_MODE, \
+        USER_SCRIPT_PARAM, USER_SCRIPT_RUNONCE, USER_SCRIPT_SUCCESSCODES, DOWNLOADINFO, CHECK_MEDIA, SAFE_MODE, \
         TORRENT_DEFAULTDIR, NZB_DEFAULTDIR, REMOTEPATHS
 
     if __INITIALIZED__:
@@ -290,7 +289,6 @@ def initialize(section=None):
                   re.compile('.part\d+.rar$', re.I),
                   re.compile('.rar$', re.I)]
     COMPRESSEDCONTAINER += [re.compile('%s$' % ext, re.I) for ext in CFG["Extensions"]["compressedExtensions"]]
-    EXT_REPLACE = {'.cbr':'.rar', '.cbz':'.zip'}  # extensions used for comic books need to be replaced before we can extract.
     MEDIACONTAINER = CFG["Extensions"]["mediaExtensions"]
     AUDIOCONTAINER = CFG["Extensions"]["audioExtensions"]
     METACONTAINER = CFG["Extensions"]["metaExtensions"]  # .nfo,.sub,.srt
diff --git a/nzbtomedia/autoProcess/autoProcessComics.py b/nzbtomedia/autoProcess/autoProcessComics.py
index 278a78ab..f44bfa88 100644
--- a/nzbtomedia/autoProcess/autoProcessComics.py
+++ b/nzbtomedia/autoProcess/autoProcessComics.py
@@ -3,7 +3,7 @@ import time
 import nzbtomedia
 import requests
 import time
-from nzbtomedia.nzbToMediaUtil import convert_to_ascii, replaceExtensions, remoteDir
+from nzbtomedia.nzbToMediaUtil import convert_to_ascii, remoteDir
 from nzbtomedia import logger
 
 class autoProcessComics:
@@ -30,7 +30,6 @@ class autoProcessComics:
             remote_path = 0
 
         inputName, dirName = convert_to_ascii(inputName, dirName)
-#        replaceExtensions(dirName)
         clean_name, ext = os.path.splitext(inputName)
         if len(ext) == 4:  # we assume this was a standrard extension. 
             inputName = clean_name
diff --git a/nzbtomedia/extractor/extractor.py b/nzbtomedia/extractor/extractor.py
index d58e492c..c0978761 100644
--- a/nzbtomedia/extractor/extractor.py
+++ b/nzbtomedia/extractor/extractor.py
@@ -65,6 +65,8 @@ def extract(filePath, outputDestination):
             cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
     elif ext[1] in (".1", ".01", ".001") and os.path.splitext(ext[0])[1] in (".rar", ".zip", ".7z"):
         cmd = EXTRACT_COMMANDS[os.path.splitext(ext[0])[1]]
+    elif ext[1] in (".cb7", ".cba", ".cbr", ".cbt", ".cbz"):  # don't extract these comic book archives.
+        return False
     else:
         if ext[1] in EXTRACT_COMMANDS:
             cmd = EXTRACT_COMMANDS[ext[1]]
diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py
index 4fb3612e..eea0a3c0 100644
--- a/nzbtomedia/nzbToMediaUtil.py
+++ b/nzbtomedia/nzbToMediaUtil.py
@@ -38,22 +38,7 @@ def sanitizeName(name):
     name = name.strip(' .')
 
     return name
-
-def replaceExtensions(path):
-    for dirpath, dirnames, filesnames in os.walk(path):
-        for filename in filesnames:
-            name, ext = os.path.splitext(filename)
-            if ext in nzbtomedia.EXT_REPLACE:
-                file = os.path.join(dirpath, filename)
-                target = os.path.join(dirpath, name + nzbtomedia.EXT_REPLACE[ext])
-                try:
-                    logger.debug("Renaming %s to %s" % (file, target), 'RENAME')
-                    shutil.move(file, target)
-                except:
-                    logger.error("Could not rename %s to %s" % (file, target), 'RENAME')
-            else:
-                continue         
-
+     
 def makeDir(path):
     if not os.path.isdir(path):
         try: