github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

[YoutubeDL] format spec: treat 'all' like a normal specifier

Browse source 
So you can use filters with it, for example 'all[width>=400][width<=600]'.
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-06-28 22:48:02 +02:00
parent 67134eaba1
commit 5acfa126c8
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/test_YoutubeDL.py
View file

@ -317,6 +317,11 @@ class TestFormatSelection(unittest.TestCase):
downloaded = ydl.downloaded_info_dicts[0] downloaded = ydl.downloaded_info_dicts[0]
self.assertEqual(downloaded['format_id'], 'G') self.assertEqual(downloaded['format_id'], 'G')
ydl = YDL({'format': 'all[width>=400][width<=600]'})
ydl.process_ie_result(info_dict)
downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
self.assertEqual(downloaded_ids, ['B', 'C', 'D'])
class TestYoutubeDL(unittest.TestCase): class TestYoutubeDL(unittest.TestCase):
def test_subtitles(self): def test_subtitles(self):

13
youtube_dl/YoutubeDL.py
View file

@ -990,7 +990,10 @@ class YoutubeDL(object):
format_spec = selector.selector format_spec = selector.selector
def selector_function(formats): def selector_function(formats):
if format_spec in ['best', 'worst', None]: if format_spec == 'all':
for f in formats:
yield f
elif format_spec in ['best', 'worst', None]:
format_idx = 0 if format_spec == 'worst' else -1 format_idx = 0 if format_spec == 'worst' else -1
audiovideo_formats = [ audiovideo_formats = [
f for f in formats f for f in formats
@ -1226,12 +1229,8 @@ class YoutubeDL(object):
req_format_list.append('bestvideo+bestaudio') req_format_list.append('bestvideo+bestaudio')
req_format_list.append('best') req_format_list.append('best')
req_format = '/'.join(req_format_list) req_format = '/'.join(req_format_list)
formats_to_download = [] format_selector = self.build_format_selector(req_format)
if req_format == 'all': formats_to_download = list(format_selector(formats))
formats_to_download = formats
else:
format_selector = self.build_format_selector(req_format)
formats_to_download = list(format_selector(formats))
if not formats_to_download: if not formats_to_download:
raise ExtractorError('requested format not available', raise ExtractorError('requested format not available',
expected=True) expected=True)