From 2858a5989d1d41139116ec00e8c6a10f993ce6c3 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 9 Oct 2012 03:21:04 +0200 Subject: [PATCH] fix #16 --- you_get/common.py | 16 ++++++++++------ you_get/processor/ffmpeg.py | 6 ++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/you_get/common.py b/you_get/common.py index a4aa4d33..3bcd1196 100644 --- a/you_get/common.py +++ b/you_get/common.py @@ -456,9 +456,11 @@ def download_urls_chunked(urls, title, ext, total_size, output_dir = '.', refer from .processor.ffmpeg import has_ffmpeg_installed if has_ffmpeg_installed(): from .processor.ffmpeg import ffmpeg_convert_ts_to_mkv - ffmpeg_convert_ts_to_mkv(parts, os.path.join(output_dir, title + '.mkv')) - for part in parts: - os.remove(part) + if ffmpeg_convert_ts_to_mkv(parts, os.path.join(output_dir, title + '.mkv')): + for part in parts: + os.remove(part) + else: + os.remove(os.path.join(output_dir, title + '.mkv')) else: print('No ffmpeg is found. Conversion aborted.') else: @@ -482,9 +484,11 @@ def download_urls_chunked(urls, title, ext, total_size, output_dir = '.', refer from .processor.ffmpeg import has_ffmpeg_installed if has_ffmpeg_installed(): from .processor.ffmpeg import ffmpeg_concat_ts_to_mkv - ffmpeg_concat_ts_to_mkv(parts, os.path.join(output_dir, title + '.mkv')) - for part in parts: - os.remove(part) + if ffmpeg_concat_ts_to_mkv(parts, os.path.join(output_dir, title + '.mkv')): + for part in parts: + os.remove(part) + else: + os.remove(os.path.join(output_dir, title + '.mkv')) else: print('No ffmpeg is found. Merging aborted.') else: diff --git a/you_get/processor/ffmpeg.py b/you_get/processor/ffmpeg.py index 41ec56a6..f785bf96 100644 --- a/you_get/processor/ffmpeg.py +++ b/you_get/processor/ffmpeg.py @@ -54,7 +54,9 @@ def ffmpeg_concat_ts_to_mkv(files, output = 'output.mkv'): params += ['-f', 'matroska', '-c', 'copy', output] try: - subprocess.call(params) - return True + if subprocess.call(params) == 0: + return True + else: + return False except: return False