From c3afbffb1070fde220359022872ddc62b76ffb1b Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sun, 4 Jan 2009 20:38:55 -0500 Subject: [PATCH] git complained about whitespace errors when applying wgw's patches... could be a CR/LF issue? --- config.py | 8 ++++---- plugins/video/transcode.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config.py b/config.py index 0a0b2c5..ddc9ad4 100644 --- a/config.py +++ b/config.py @@ -129,11 +129,11 @@ def getPixelAR(ref): def get(section, key): return config.get(section, key) -def getFFmpegWait(): - if config.has_option('Server', 'ffmpeg_wait'): +def getFFmpegWait(): + if config.has_option('Server', 'ffmpeg_wait'): return max(int(float(config.get('Server', 'ffmpeg_wait'))), 1) - else: - return 10 + else: + return 10 def getFFmpegTemplate(tsn): if tsn and config.has_section('_tivo_' + tsn): diff --git a/plugins/video/transcode.py b/plugins/video/transcode.py index 09d856a..9885c1e 100644 --- a/plugins/video/transcode.py +++ b/plugins/video/transcode.py @@ -506,14 +506,14 @@ def video_info(inFile): ffmpeg = subprocess.Popen(cmd, stderr=err_tmp, stdout=subprocess.PIPE, stdin=subprocess.PIPE) - # wait configured # of seconds: if ffmpeg is not back give up + # wait configured # of seconds: if ffmpeg is not back give up wait = config.getFFmpegWait() - logging.debug( - 'starting ffmpeg, will wait %s seconds for it to complete' % wait) - for i in xrange(wait*20): - time.sleep(.05) + logging.debug( + 'starting ffmpeg, will wait %s seconds for it to complete' % wait) + for i in xrange(wait*20): + time.sleep(.05) if not ffmpeg.poll() == None: - break + break if ffmpeg.poll() == None: kill(ffmpeg.pid) @@ -521,9 +521,9 @@ def video_info(inFile): info_cache[inFile] = (mtime, vInfo) return vInfo - err_tmp.seek(0) - output = err_tmp.read() - err_tmp.close() + err_tmp.seek(0) + output = err_tmp.read() + err_tmp.close() logging.debug('ffmpeg output=%s' % output) rezre = re.compile(r'.*Video: ([^,]+),.*') -- 2.11.4.GIT