R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ntvde] Fix extraction

Browse Source
This commit is contained in:
Sergey M․ 2016-01-14 22:05:04 +06:00
parent 5cc9c5dfa8
commit 163e8369b0
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
youtube_dl/extractor/ntvde.py
View File

@ -2,6 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urlparse
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
js_to_json, js_to_json,
@ -42,18 +43,24 @@ class NTVDeIE(InfoExtractor):
webpage, 'player data'), webpage, 'player data'),
video_id, transform_source=js_to_json) video_id, transform_source=js_to_json)
duration = parse_duration(vdata.get('duration')) duration = parse_duration(vdata.get('duration'))
formats = [{
formats = []
if vdata.get('video'):
formats.append({
'format_id': 'flash', 'format_id': 'flash',
'url': 'rtmp://fms.n-tv.de/' + vdata['video'], 'url': 'rtmp://fms.n-tv.de/%s' % vdata['video'],
}, { })
if vdata.get('videoMp4'):
formats.append({
'format_id': 'mobile', 'format_id': 'mobile',
'url': 'http://video.n-tv.de' + vdata['videoMp4'], 'url': compat_urlparse.urljoin('http://video.n-tv.de', vdata['videoMp4']),
'tbr': 400, # estimation 'tbr': 400, # estimation
}] })
m3u8_url = 'http://video.n-tv.de' + vdata['videoM3u8'] if vdata.get('videoM3u8'):
m3u8_url = compat_urlparse.urljoin('http://video.n-tv.de', vdata['videoM3u8'])
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, ext='mp4', m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',
entry_protocol='m3u8_native', preference=0)) preference=0, m3u8_id='hls', fatal=False))
self._sort_formats(formats) self._sort_formats(formats)
return { return {