From 7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 29 Dec 2015 00:58:24 +0600 Subject: Simplify formats accumulation for f4m/m3u8/smil formats Now all _extract_*_formats routines return a list --- youtube_dl/extractor/toggle.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'youtube_dl/extractor/toggle.py') diff --git a/youtube_dl/extractor/toggle.py b/youtube_dl/extractor/toggle.py index a47239952..c54b876d3 100644 --- a/youtube_dl/extractor/toggle.py +++ b/youtube_dl/extractor/toggle.py @@ -132,13 +132,11 @@ class ToggleIE(InfoExtractor): vid_format = vid_format.replace(' ', '') # if geo-restricted, m3u8 is inaccessible, but mp4 is okay if ext == 'm3u8': - m3u8_formats = self._extract_m3u8_formats( + formats.extend(self._extract_m3u8_formats( video_url, video_id, ext='mp4', m3u8_id=vid_format, note='Downloading %s m3u8 information' % vid_format, errnote='Failed to download %s m3u8 information' % vid_format, - fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + fatal=False)) elif ext in ('mp4', 'wvm'): # wvm are drm-protected files formats.append({ -- cgit v1.2.3