[rutube] Extract m3u8 formats (fixes #3984)

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-12-01 18:20:36 +01:00
parent c41a9650c3
commit 05177b34a6

View file

@ -53,6 +53,7 @@ def _real_extract(self, url):
m3u8_url = options['video_balancer'].get('m3u8') m3u8_url = options['video_balancer'].get('m3u8')
if m3u8_url is None: if m3u8_url is None:
raise ExtractorError('Couldn\'t find m3u8 manifest url') raise ExtractorError('Couldn\'t find m3u8 manifest url')
formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4')
return { return {
'id': video['id'], 'id': video['id'],
@ -60,8 +61,7 @@ def _real_extract(self, url):
'description': video['description'], 'description': video['description'],
'duration': video['duration'], 'duration': video['duration'],
'view_count': video['hits'], 'view_count': video['hits'],
'url': m3u8_url, 'formats': formats,
'ext': 'mp4',
'thumbnail': video['thumbnail_url'], 'thumbnail': video['thumbnail_url'],
'uploader': author.get('name'), 'uploader': author.get('name'),
'uploader_id': compat_str(author['id']) if author else None, 'uploader_id': compat_str(author['id']) if author else None,