Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[YoutubeDL] Clarify incompatible formats merge message

Browse source 
When `-f` is not specified it's misleading to see `You have requested ...` as user did not actually request any formats.
This commit is contained in:
Sergey M․ 2015-05-17 20:56:03 +06:00
parent 588b82bbf8
commit 4a5a898a8f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
youtube_dl/YoutubeDL.py
View file

@ -1368,7 +1368,7 @@ class YoutubeDL(object):
postprocessors = [] postprocessors = []
self.report_warning('You have requested multiple ' self.report_warning('You have requested multiple '
'formats but ffmpeg or avconv are not installed.' 'formats but ffmpeg or avconv are not installed.'
' The formats won\'t be merged') ' The formats won\'t be merged.')
else: else:
postprocessors = [merger] postprocessors = [merger]
@ -1395,8 +1395,8 @@ class YoutubeDL(object):
requested_formats = info_dict['requested_formats'] requested_formats = info_dict['requested_formats']
if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats): if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats):
info_dict['ext'] = 'mkv' info_dict['ext'] = 'mkv'
self.report_warning('You have requested formats incompatible for merge. ' self.report_warning(
'The formats will be merged into mkv') 'Requested formats are incompatible for merge and will be merged into mkv.')
# Ensure filename always has a correct extension for successful merge # Ensure filename always has a correct extension for successful merge
filename = '%s.%s' % (filename_wo_ext, info_dict['ext']) filename = '%s.%s' % (filename_wo_ext, info_dict['ext'])
if os.path.exists(encodeFilename(filename)): if os.path.exists(encodeFilename(filename)):