diff options
| author | Sergey M․ <dstftw@gmail.com> | 2016-11-26 00:13:46 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2016-11-26 00:13:46 +0700 |
| commit | 9338a0eae34de9e81bc6b1cee5a000bc6ff9256c (patch) | |
| tree | 5e14c2de516d7152f3104cfd6f84b901cd7fd28c | |
| parent | 74394b5e10c1a681022e99fe1955837fb9078f69 (diff) | |
| download | youtube-dl-9338a0eae34de9e81bc6b1cee5a000bc6ff9256c.tar.gz youtube-dl-9338a0eae34de9e81bc6b1cee5a000bc6ff9256c.tar.xz youtube-dl-9338a0eae34de9e81bc6b1cee5a000bc6ff9256c.zip | |
[viki] Fix rtmp formats extraction (closes #11255)
| -rw-r--r-- | youtube_dl/extractor/viki.py | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py index 4351ac457..cb8bfb348 100644 --- a/youtube_dl/extractor/viki.py +++ b/youtube_dl/extractor/viki.py @@ -1,11 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import json -import time -import hmac import hashlib +import hmac import itertools +import json +import re +import time from .common import InfoExtractor from ..utils import ( @@ -276,9 +277,13 @@ class VikiIE(VikiBaseIE): height = int_or_none(self._search_regex( r'^(\d+)[pP]$', format_id, 'height', default=None)) for protocol, format_dict in stream_dict.items(): + # rtmps URLs does not seem to work + if protocol == 'rtmps': + continue + format_url = format_dict['url'] if format_id == 'm3u8': m3u8_formats = self._extract_m3u8_formats( - format_dict['url'], video_id, 'mp4', + format_url, video_id, 'mp4', entry_protocol='m3u8_native', preference=-1, m3u8_id='m3u8-%s' % protocol, fatal=False) # Despite CODECS metadata in m3u8 all video-only formats @@ -287,9 +292,23 @@ class VikiIE(VikiBaseIE): if f.get('acodec') == 'none' and f.get('vcodec') != 'none': f['acodec'] = None formats.extend(m3u8_formats) + elif format_url.startswith('rtmp'): + mobj = re.search( + r'^(?P<url>rtmp://[^/]+/(?P<app>.+?))/(?P<playpath>mp4:.+)$', + format_url) + if not mobj: + continue + formats.append({ + 'format_id': 'rtmp-%s' % format_id, + 'ext': 'flv', + 'url': mobj.group('url'), + 'play_path': mobj.group('playpath'), + 'app': mobj.group('app'), + 'page_url': url, + }) else: formats.append({ - 'url': format_dict['url'], + 'url': format_url, 'format_id': '%s-%s' % (format_id, protocol), 'height': height, }) |