Merge ce031e9d18
into 4d05f84325
This commit is contained in:
commit
f57da151d3
@ -136,6 +136,11 @@ class TestFormatSelection(unittest.TestCase):
|
|||||||
]
|
]
|
||||||
info_dict = _make_result(formats)
|
info_dict = _make_result(formats)
|
||||||
|
|
||||||
|
ydl = YDL({'format': ''}) # no criteria => anything goes
|
||||||
|
ydl.process_ie_result(info_dict.copy())
|
||||||
|
downloaded = ydl.downloaded_info_dicts[0]
|
||||||
|
self.assertEqual(downloaded['format_id'], '35')
|
||||||
|
|
||||||
ydl = YDL({'format': '20/47'})
|
ydl = YDL({'format': '20/47'})
|
||||||
ydl.process_ie_result(info_dict.copy())
|
ydl.process_ie_result(info_dict.copy())
|
||||||
downloaded = ydl.downloaded_info_dicts[0]
|
downloaded = ydl.downloaded_info_dicts[0]
|
||||||
|
@ -1293,6 +1293,9 @@ class YoutubeDL(object):
|
|||||||
'{0}\n\t{1}\n\t{2}^'.format(note, format_spec, ' ' * start[1]))
|
'{0}\n\t{1}\n\t{2}^'.format(note, format_spec, ' ' * start[1]))
|
||||||
return SyntaxError(message)
|
return SyntaxError(message)
|
||||||
|
|
||||||
|
if not format_spec:
|
||||||
|
format_spec = 'worst'
|
||||||
|
|
||||||
PICKFIRST = 'PICKFIRST'
|
PICKFIRST = 'PICKFIRST'
|
||||||
MERGE = 'MERGE'
|
MERGE = 'MERGE'
|
||||||
SINGLE = 'SINGLE'
|
SINGLE = 'SINGLE'
|
||||||
|
Loading…
Reference in New Issue
Block a user