From 7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec Mon Sep 17 00:00:00 2001 From: Sergey M․ 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/zdf.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'youtube_dl/extractor/zdf.py') diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 92c12bac6..2a1f2f6d1 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -125,20 +125,14 @@ class ZDFIE(InfoExtractor): if ext == 'meta': continue elif ext == 'smil': - smil_formats = self._extract_smil_formats( - video_url, video_id, fatal=False) - if smil_formats: - formats.extend(smil_formats) + formats.extend(self._extract_smil_formats( + video_url, video_id, fatal=False)) elif ext == 'm3u8': - m3u8_formats = self._extract_m3u8_formats( - video_url, video_id, 'mp4', m3u8_id='hls', fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + formats.extend(self._extract_m3u8_formats( + video_url, video_id, 'mp4', m3u8_id='hls', fatal=False)) elif ext == 'f4m': - f4m_formats = self._extract_f4m_formats( - video_url, video_id, f4m_id='hds', fatal=False) - if f4m_formats: - formats.extend(f4m_formats) + formats.extend(self._extract_f4m_formats( + video_url, video_id, f4m_id='hds', fatal=False)) else: proto = format_m.group('proto').lower() -- cgit v1.2.3