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

Merge branch 'print-merged-filename' of https://github.com/zmwangx/you-get into zmwangx-print-merged-filename

Browse Source
This commit is contained in:
Mort Yao 2016-05-14 23:49:57 +02:00
commit 6938894337
No known key found for this signature in database
GPG Key ID: 07DA00CB78203251
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/you_get/common.py
View File

@ -736,7 +736,7 @@ def download_urls(urls, title, ext, total_size, output_dir='.', refer=None, merg
if has_ffmpeg_installed():
from .processor.ffmpeg import ffmpeg_concat_av
ret = ffmpeg_concat_av(parts, output_filepath, ext)
print('Done.')
print('Merged into %s' % output_filename)
if ret == 0:
for part in parts: os.remove(part)
@ -749,7 +749,7 @@ def download_urls(urls, title, ext, total_size, output_dir='.', refer=None, merg
else:
from .processor.join_flv import concat_flv
concat_flv(parts, output_filepath)
print('Done.')
print('Merged into %s' % output_filename)
except:
raise
else:
@ -765,7 +765,7 @@ def download_urls(urls, title, ext, total_size, output_dir='.', refer=None, merg
else:
from .processor.join_mp4 import concat_mp4
concat_mp4(parts, output_filepath)
print('Done.')
print('Merged into %s' % output_filename)
except:
raise
else:
@ -781,7 +781,7 @@ def download_urls(urls, title, ext, total_size, output_dir='.', refer=None, merg
else:
from .processor.join_ts import concat_ts
concat_ts(parts, output_filepath)
print('Done.')
print('Merged into %s' % output_filename)
except:
raise
else: