desastre
/
youtube-dl
forked from minhngoc25a/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vrt] Add support for direct hls playlists and YouTube (Closes #9108)

This commit is contained in:
Sergey M․ 2016-04-07 23:22:43 +06:00
parent 3afef2e3fc
commit ed6fb8b804
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
youtube_dl/extractor/vrt.py
View File

@ -4,7 +4,10 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import float_or_none from ..utils import (
determine_ext,
float_or_none,
)
class VRTIE(InfoExtractor): class VRTIE(InfoExtractor):
@ -52,6 +55,11 @@ class VRTIE(InfoExtractor):
'duration': 661, 'duration': 661,
} }
}, },
{
# YouTube video
'url': 'http://deredactie.be/cm/vrtnieuws/videozone/nieuws/cultuurenmedia/1.2622957',
'only_matching': True,
},
{ {
'url': 'http://cobra.canvas.be/cm/cobra/videozone/rubriek/film-videozone/1.2377055', 'url': 'http://cobra.canvas.be/cm/cobra/videozone/rubriek/film-videozone/1.2377055',
'only_matching': True, 'only_matching': True,
@ -66,7 +74,17 @@ class VRTIE(InfoExtractor):
video_id = self._search_regex( video_id = self._search_regex(
r'data-video-id="([^"]+)_[^"]+"', webpage, 'video id', fatal=False) r'data-video-id="([^"]+)_[^"]+"', webpage, 'video id', fatal=False)
src = self._search_regex(
r'data-video-src="([^"]+)"', webpage, 'video src', default=None)
video_type = self._search_regex(
r'data-video-type="([^"]+)"', webpage, 'video type', default=None)
if video_type == 'YouTubeVideo':
return self.url_result(src, 'Youtube')
formats = [] formats = []
mobj = re.search( mobj = re.search(
r'data-video-iphone-server="(?P<server>[^"]+)"\s+data-video-iphone-path="(?P<path>[^"]+)"', r'data-video-iphone-server="(?P<server>[^"]+)"\s+data-video-iphone-path="(?P<path>[^"]+)"',
webpage) webpage)
@ -74,11 +92,15 @@ class VRTIE(InfoExtractor):
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
'%s/%s' % (mobj.group('server'), mobj.group('path')), '%s/%s' % (mobj.group('server'), mobj.group('path')),
video_id, 'mp4', m3u8_id='hls', fatal=False)) video_id, 'mp4', m3u8_id='hls', fatal=False))
mobj = re.search(r'data-video-src="(?P<src>[^"]+)"', webpage)
if mobj: if src:
formats.extend(self._extract_f4m_formats( if determine_ext(src) == 'm3u8':
'%s/manifest.f4m' % mobj.group('src'), formats.extend(self._extract_m3u8_formats(
video_id, f4m_id='hds', fatal=False)) src, video_id, 'mp4', entry_protocol='m3u8_native',
m3u8_id='hls', fatal=False))
else:
formats.extend(self._extract_f4m_formats(
'%s/manifest.f4m' % src, video_id, f4m_id='hds', fatal=False))
if not formats and 'data-video-geoblocking="true"' in webpage: if not formats and 'data-video-geoblocking="true"' in webpage:
self.raise_geo_restricted('This video is only available in Belgium') self.raise_geo_restricted('This video is only available in Belgium')