github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 13:23:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

leave comic book archives alone. #351 #421

Browse source
This commit is contained in:
clinton-hall 2014-06-06 12:36:27 +09:30
commit 9eeff323ac
5 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TorrentToMedia.py
View file

@ -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:

4
nzbtomedia/__init__.py
View file

@ -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

3
nzbtomedia/autoProcess/autoProcessComics.py
View file

@ -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

2
nzbtomedia/extractor/extractor.py
View file

@ -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]]

17
nzbtomedia/nzbToMediaUtil.py
View file

@ -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: