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

supress error output from console

Browse source
This commit is contained in:
clinton-hall 2014-09-19 15:08:49 +09:30
commit 44b403d9dc
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nzbtomedia/transcoder/transcoder.py
View file

@ -54,16 +54,16 @@ def isVideoGood(videofile, status):
logger.info("FAILED: [%s] has %s video streams and %s audio streams. Assume corruption." % (fileNameExt, str(len(videoStreams)), str(len(audioStreams))), 'TRANSCODER') logger.info("FAILED: [%s] has %s video streams and %s audio streams. Assume corruption." % (fileNameExt, str(len(videoStreams)), str(len(audioStreams))), 'TRANSCODER')
return False return False
def zip_out(file, img): def zip_out(file, img, bitbucket):
procin = None procin = None
cmd = [nzbtomedia.SEVENZIP, '-so', 'e', img, file] cmd = [nzbtomedia.SEVENZIP, '-so', 'e', img, file]
try: try:
procin = subprocess.Popen(cmd, stdout=subprocess.PIPE) procin = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=bitbucket)
except: except:
logger.error("Extracting [%s] has failed" % (file), 'TRANSCODER') logger.error("Extracting [%s] has failed" % (file), 'TRANSCODER')
return procin return procin
def getVideoDetails(videofile, img=None): def getVideoDetails(videofile, img=None, bitbucket=None):
video_details = {} video_details = {}
result = 1 result = 1
file = videofile file = videofile
@ -79,7 +79,7 @@ def getVideoDetails(videofile, img=None):
command = [nzbtomedia.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', '-show_error', videofile] command = [nzbtomedia.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', '-show_error', videofile]
print_cmd(command) print_cmd(command)
if img: if img:
procin = zip_out(file, img) procin = zip_out(file, img, bitbucket)
proc = subprocess.Popen(command, stdout=subprocess.PIPE, stdin=procin.stdout) proc = subprocess.Popen(command, stdout=subprocess.PIPE, stdin=procin.stdout)
procin.stdout.close() procin.stdout.close()
else: else:
@ -106,7 +106,7 @@ def getVideoDetails(videofile, img=None):
logger.error("Checking [%s] has failed" % (file), 'TRANSCODER') logger.error("Checking [%s] has failed" % (file), 'TRANSCODER')
return video_details, result return video_details, result
def buildCommands(file, newDir, movieName): def buildCommands(file, newDir, movieName, bitbucket):
if isinstance(file, str): if isinstance(file, str):
inputFile = file inputFile = file
if '"concat:' in file: if '"concat:' in file:
@ -122,7 +122,7 @@ def buildCommands(file, newDir, movieName):
else: else:
img, data = file.iteritems().next() img, data = file.iteritems().next()
name = data['name'] name = data['name']
video_details, result = getVideoDetails(data['files'][0], img) video_details, result = getVideoDetails(data['files'][0], img, bitbucket)
inputFile = '-' inputFile = '-'
file = '-' file = '-'
@ -551,7 +551,7 @@ def ripISO(item, newDir, bitbucket):
try: try:
logger.debug("Attempting to extract .vob from image file %s" % (item), "TRANSCODER") logger.debug("Attempting to extract .vob from image file %s" % (item), "TRANSCODER")
print_cmd(cmd) print_cmd(cmd)
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE) proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=bitbucket)
out, err = proc.communicate() out, err = proc.communicate()
result = proc.returncode result = proc.returncode
fileList = [ re.match(".+(VIDEO_TS[\\\/]VTS_[0-9][0-9]_[0-9].[Vv][Oo][Bb])", line).groups()[0] for line in out.splitlines() if re.match(".+VIDEO_TS[\\\/]VTS_[0-9][0-9]_[0-9].[Vv][Oo][Bb]", line) ] fileList = [ re.match(".+(VIDEO_TS[\\\/]VTS_[0-9][0-9]_[0-9].[Vv][Oo][Bb])", line).groups()[0] for line in out.splitlines() if re.match(".+VIDEO_TS[\\\/]VTS_[0-9][0-9]_[0-9].[Vv][Oo][Bb]", line) ]
@ -631,7 +631,7 @@ def Transcode_directory(dirName):
for file in List: for file in List:
if isinstance(file, str) and os.path.splitext(file)[1] in nzbtomedia.IGNOREEXTENSIONS: if isinstance(file, str) and os.path.splitext(file)[1] in nzbtomedia.IGNOREEXTENSIONS:
continue continue
command = buildCommands(file, newDir, movieName) command = buildCommands(file, newDir, movieName, bitbucket)
newfilePath = command[-1] newfilePath = command[-1]
# transcoding files may remove the original file, so make sure to extract subtitles first # transcoding files may remove the original file, so make sure to extract subtitles first
@ -654,10 +654,9 @@ def Transcode_directory(dirName):
result = call(command, stdout=bitbucket, stderr=bitbucket) result = call(command, stdout=bitbucket, stderr=bitbucket)
else: else:
img, data = file.iteritems().next() img, data = file.iteritems().next()
#procin = zip_out(data['files'][0], img) proc = subprocess.Popen(command, stdout=bitbucket, stderr=bitbucket, stdin=subprocess.PIPE)
proc = subprocess.Popen(command, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
for vob in data['files']: for vob in data['files']:
procin = zip_out(vob, img) procin = zip_out(vob, img, bitbucket)
if procin: if procin:
shutil.copyfileobj(procin.stdout, proc.stdin) shutil.copyfileobj(procin.stdout, proc.stdin)
procin.stdout.close() procin.stdout.close()