[bloomberg] Improve formats extraction
authorSergey M․ <dstftw@gmail.com>
Sat, 28 Nov 2015 16:45:19 +0000 (22:45 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 28 Nov 2015 16:45:19 +0000 (22:45 +0600)
youtube_dl/extractor/bloomberg.py

index c28ed0c7978dfc1cea7e0596918d1727e3a43b24..ebeef8f2ab19e9dfcf6cdbc9c30616958344876d 100644 (file)
@@ -37,10 +37,19 @@ class BloombergIE(InfoExtractor):
             'http://www.bloomberg.com/api/embed?id=%s' % video_id, video_id)
         formats = []
         for stream in embed_info['streams']:
+            stream_url = stream.get('url')
+            if not stream_url:
+                continue
             if stream['muxing_format'] == 'TS':
-                formats.extend(self._extract_m3u8_formats(stream['url'], video_id))
+                m3u8_formats = self._extract_m3u8_formats(
+                    stream_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+                if m3u8_formats:
+                    formats.extend(m3u8_formats)
             else:
-                formats.extend(self._extract_f4m_formats(stream['url'], video_id))
+                f4m_formats = self._extract_f4m_formats(
+                    stream_url, video_id, f4m_id='hds', fatal=False)
+                if f4m_formats:
+                    formats.extend(f4m_formats)
         self._sort_formats(formats)
 
         return {