daniel/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[francetv] Add support for live streams (closes #13689)

Browse Source
This commit is contained in:
Sergey M․ 2018-02-11 21:58:04 +07:00
parent 79080573b5
commit 760f81212f
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/extractor/francetv.py
View File

@ -11,10 +11,11 @@ from ..compat import (
) )
from ..utils import ( from ..utils import (
clean_html, clean_html,
determine_ext,
ExtractorError, ExtractorError,
int_or_none, int_or_none,
parse_duration, parse_duration,
determine_ext, try_get,
) )
from .dailymotion import DailymotionIE from .dailymotion import DailymotionIE
@ -77,6 +78,14 @@ class FranceTVIE(InfoExtractor):
}, { }, {
'url': 'francetv:NI_657393@Regions', 'url': 'francetv:NI_657393@Regions',
'only_matching': True, 'only_matching': True,
}, {
# france-3 live
'url': 'https://www.france.tv/france-3/direct.html',
'only_matching': True,
}, {
# france-3 live
'url': 'francetv:SIM_France3',
'only_matching': True,
}] }]
def _extract_video(self, video_id, catalogue=None): def _extract_video(self, video_id, catalogue=None):
@ -121,6 +130,8 @@ class FranceTVIE(InfoExtractor):
return signed_url return signed_url
return manifest_url return manifest_url
is_live = None
formats = [] formats = []
for video in info['videos']: for video in info['videos']:
if video['statut'] != 'ONLINE': if video['statut'] != 'ONLINE':
@ -128,6 +139,10 @@ class FranceTVIE(InfoExtractor):
video_url = video['url'] video_url = video['url']
if not video_url: if not video_url:
continue continue
if is_live is None:
is_live = (try_get(
video, lambda x: x['plages_ouverture'][0]['direct'],
bool) is True) or '/live.francetv.fr/' in video_url
format_id = video['format'] format_id = video['format']
ext = determine_ext(video_url) ext = determine_ext(video_url)
if ext == 'f4m': if ext == 'f4m':
@ -173,11 +188,12 @@ class FranceTVIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': self._live_title(title) if is_live else title,
'description': clean_html(info['synopsis']), 'description': clean_html(info['synopsis']),
'thumbnail': compat_urlparse.urljoin('http://pluzz.francetv.fr', info['image']), 'thumbnail': compat_urlparse.urljoin('http://pluzz.francetv.fr', info['image']),
'duration': int_or_none(info.get('real_duration')) or parse_duration(info['duree']), 'duration': int_or_none(info.get('real_duration')) or parse_duration(info['duree']),
'timestamp': int_or_none(info['diffusion']['timestamp']), 'timestamp': int_or_none(info['diffusion']['timestamp']),
'is_live': is_live,
'formats': formats, 'formats': formats,
'subtitles': subtitles, 'subtitles': subtitles,
} }