mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-09-11 17:46:22 +02:00
[rtve.es:live] Fix extraction
* Update _VALID_URL to match the current URLs * Use the m3u8 manifest since I haven't figured out how to use the rtmp stream
This commit is contained in:
parent
2812c24c16
commit
3e76968220
@ -10,6 +10,7 @@ from ..utils import (
|
|||||||
ExtractorError,
|
ExtractorError,
|
||||||
float_or_none,
|
float_or_none,
|
||||||
remove_end,
|
remove_end,
|
||||||
|
remove_start,
|
||||||
sanitized_Request,
|
sanitized_Request,
|
||||||
std_headers,
|
std_headers,
|
||||||
struct_unpack,
|
struct_unpack,
|
||||||
@ -178,14 +179,14 @@ class RTVEInfantilIE(InfoExtractor):
|
|||||||
class RTVELiveIE(InfoExtractor):
|
class RTVELiveIE(InfoExtractor):
|
||||||
IE_NAME = 'rtve.es:live'
|
IE_NAME = 'rtve.es:live'
|
||||||
IE_DESC = 'RTVE.es live streams'
|
IE_DESC = 'RTVE.es live streams'
|
||||||
_VALID_URL = r'http://www\.rtve\.es/(?:deportes/directo|noticias|television)/(?P<id>[a-zA-Z0-9-]+)'
|
_VALID_URL = r'http://www\.rtve\.es/directo/(?P<id>[a-zA-Z0-9-]+)'
|
||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://www.rtve.es/noticias/directo-la-1/',
|
'url': 'http://www.rtve.es/directo/la-1/',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'directo-la-1',
|
'id': 'la-1',
|
||||||
'ext': 'flv',
|
'ext': 'mp4',
|
||||||
'title': 're:^La 1 de TVE [0-9]{4}-[0-9]{2}-[0-9]{2}Z[0-9]{6}$',
|
'title': 're:^La 1 [0-9]{4}-[0-9]{2}-[0-9]{2}Z[0-9]{6}$',
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': 'live stream',
|
'skip_download': 'live stream',
|
||||||
@ -198,23 +199,20 @@ class RTVELiveIE(InfoExtractor):
|
|||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
|
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
player_url = self._search_regex(
|
title = remove_end(self._og_search_title(webpage), ' en directo en RTVE.es')
|
||||||
r'<param name="movie" value="([^"]+)"/>', webpage, 'player URL')
|
title = remove_start(title, 'Estoy viendo ')
|
||||||
title = remove_end(self._og_search_title(webpage), ' en directo')
|
|
||||||
title += ' ' + time.strftime('%Y-%m-%dZ%H%M%S', start_time)
|
title += ' ' + time.strftime('%Y-%m-%dZ%H%M%S', start_time)
|
||||||
|
|
||||||
vidplayer_id = self._search_regex(
|
vidplayer_id = self._search_regex(
|
||||||
r' id="vidplayer([0-9]+)"', webpage, 'internal video ID')
|
r'playerId=player([0-9]+)', webpage, 'internal video ID')
|
||||||
png_url = 'http://www.rtve.es/ztnr/movil/thumbnail/default/videos/%s.png' % vidplayer_id
|
png_url = 'http://www.rtve.es/ztnr/movil/thumbnail/amonet/videos/%s.png' % vidplayer_id
|
||||||
png = self._download_webpage(png_url, video_id, 'Downloading url information')
|
png = self._download_webpage(png_url, video_id, 'Downloading url information')
|
||||||
video_url = _decrypt_url(png)
|
m3u8_url = _decrypt_url(png)
|
||||||
|
formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4')
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'ext': 'flv',
|
|
||||||
'title': title,
|
'title': title,
|
||||||
'url': video_url,
|
'formats': formats,
|
||||||
'app': 'rtve-live-live?ovpfv=2.1.2',
|
'is_live': True,
|
||||||
'player_url': player_url,
|
|
||||||
'rtmp_live': True,
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user