PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-02 16:24:00 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

fix #16

Browse Source
This commit is contained in:
Mort Yao 2012-10-09 03:21:04 +02:00
parent ff61bf6646
commit 2858a5989d
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
you_get/common.py
View File

@ -456,9 +456,11 @@ def download_urls_chunked(urls, title, ext, total_size, output_dir = '.', refer
from .processor.ffmpeg import has_ffmpeg_installed from .processor.ffmpeg import has_ffmpeg_installed
if has_ffmpeg_installed(): if has_ffmpeg_installed():
from .processor.ffmpeg import ffmpeg_convert_ts_to_mkv from .processor.ffmpeg import ffmpeg_convert_ts_to_mkv
ffmpeg_convert_ts_to_mkv(parts, os.path.join(output_dir, title + '.mkv')) if ffmpeg_convert_ts_to_mkv(parts, os.path.join(output_dir, title + '.mkv')):
for part in parts: for part in parts:
os.remove(part) os.remove(part)
else:
os.remove(os.path.join(output_dir, title + '.mkv'))
else: else:
print('No ffmpeg is found. Conversion aborted.') print('No ffmpeg is found. Conversion aborted.')
else: else:
@ -482,9 +484,11 @@ def download_urls_chunked(urls, title, ext, total_size, output_dir = '.', refer
from .processor.ffmpeg import has_ffmpeg_installed from .processor.ffmpeg import has_ffmpeg_installed
if has_ffmpeg_installed(): if has_ffmpeg_installed():
from .processor.ffmpeg import ffmpeg_concat_ts_to_mkv from .processor.ffmpeg import ffmpeg_concat_ts_to_mkv
ffmpeg_concat_ts_to_mkv(parts, os.path.join(output_dir, title + '.mkv')) if ffmpeg_concat_ts_to_mkv(parts, os.path.join(output_dir, title + '.mkv')):
for part in parts: for part in parts:
os.remove(part) os.remove(part)
else:
os.remove(os.path.join(output_dir, title + '.mkv'))
else: else:
print('No ffmpeg is found. Merging aborted.') print('No ffmpeg is found. Merging aborted.')
else: else:

6
you_get/processor/ffmpeg.py
View File

@ -54,7 +54,9 @@ def ffmpeg_concat_ts_to_mkv(files, output = 'output.mkv'):
params += ['-f', 'matroska', '-c', 'copy', output] params += ['-f', 'matroska', '-c', 'copy', output]
try: try:
subprocess.call(params) if subprocess.call(params) == 0:
return True return True
else:
return False
except: except:
return False return False