diff options
| author | Remita Amine <remitamine@gmail.com> | 2017-02-04 17:02:12 +0100 |
|---|---|---|
| committer | Remita Amine <remitamine@gmail.com> | 2017-02-04 17:05:35 +0100 |
| commit | 8e4041cf3f8e769ee2188f3db4747b7133ab5c2d (patch) | |
| tree | 238466809e479802c317b01858191c33366fa4a9 | |
| parent | 31487eb9746123b7c4e28be7e48908773beab40c (diff) | |
| download | youtube-dl-8e4041cf3f8e769ee2188f3db4747b7133ab5c2d.tar.gz youtube-dl-8e4041cf3f8e769ee2188f3db4747b7133ab5c2d.tar.xz youtube-dl-8e4041cf3f8e769ee2188f3db4747b7133ab5c2d.zip | |
[radiocanada] fix extraction for toutv rtmp formats
| -rw-r--r-- | youtube_dl/extractor/radiocanada.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/youtube_dl/extractor/radiocanada.py b/youtube_dl/extractor/radiocanada.py index 321917ad0..3b40002a8 100644 --- a/youtube_dl/extractor/radiocanada.py +++ b/youtube_dl/extractor/radiocanada.py @@ -54,9 +54,8 @@ class RadioCanadaIE(InfoExtractor): raise ExtractorError('This video is DRM protected.', expected=True) device_types = ['ipad'] - if app_code != 'toutv': - device_types.append('flash') if not smuggled_data: + device_types.append('flash') device_types.append('android') formats = [] @@ -103,7 +102,7 @@ class RadioCanadaIE(InfoExtractor): continue f_url = re.sub(r'\d+\.%s' % ext, '%d.%s' % (tbr, ext), v_url) protocol = determine_protocol({'url': f_url}) - formats.append({ + f = { 'format_id': '%s-%d' % (protocol, tbr), 'url': f_url, 'ext': 'flv' if protocol == 'rtmp' else ext, @@ -111,7 +110,14 @@ class RadioCanadaIE(InfoExtractor): 'width': int_or_none(url_e.get('width')), 'height': int_or_none(url_e.get('height')), 'tbr': tbr, - }) + } + mobj = re.match(r'(?P<url>rtmp://[^/]+/[^/]+)/(?P<playpath>[^?]+)(?P<auth>\?.+)', f_url) + if mobj: + f.update({ + 'url': mobj.group('url') + mobj.group('auth'), + 'play_path': mobj.group('playpath'), + }) + formats.append(f) if protocol == 'rtsp': base_url = self._search_regex( r'rtsp://([^?]+)', f_url, 'base url', default=None) |