MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-27 17:26:51 +01:00
Code Issues Releases Wiki Activity

[6play] add support for rtlplay.be and extract hd usp formats

Browse Source
This commit is contained in:
Remita Amine 2018-06-17 12:01:14 +01:00
parent 764cd4e6f3
commit 1882511754
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
youtube_dl/extractor/sixplay.py
View File

@ -19,29 +19,33 @@ from ..utils import (
class SixPlayIE(InfoExtractor): class SixPlayIE(InfoExtractor):
IE_NAME = '6play' IE_NAME = '6play'
_VALID_URL = r'(?:6play:|https?://(?:www\.)?6play\.fr/.+?-c_)(?P<id>[0-9]+)' _VALID_URL = r'(?:6play:|https?://(?:www\.)?(?P<domain>6play\.fr|rtlplay.be)/.+?-c_)(?P<id>[0-9]+)'
_TEST = { _TESTS = [{
'url': 'http://www.6play.fr/le-meilleur-patissier-p_1807/le-meilleur-patissier-special-fetes-mercredi-a-21-00-sur-m6-c_11638450', 'url': 'https://www.6play.fr/minute-par-minute-p_9533/le-but-qui-a-marque-lhistoire-du-football-francais-c_12041051',
'md5': '42310bffe4ba3982db112b9cd3467328', 'md5': '31fcd112637baa0c2ab92c4fcd8baf27',
'info_dict': { 'info_dict': {
'id': '11638450', 'id': '12041051',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Le Meilleur Pâtissier, spécial fêtes mercredi à 21:00 sur M6', 'title': 'Le but qui a marqué l\'histoire du football français !',
'description': 'md5:308853f6a5f9e2d55a30fc0654de415f', 'description': 'md5:b59e7e841d646ef1eb42a7868eb6a851',
'duration': 39,
'series': 'Le meilleur pâtissier',
}, },
'params': { }, {
'skip_download': True, 'url': 'https://www.rtlplay.be/rtl-info-13h-p_8551/les-titres-du-rtlinfo-13h-c_12045869',
}, 'only_matching': True,
} }]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) domain, video_id = re.search(self._VALID_URL, url).groups()
service, consumer_name = {
'6play.fr': ('6play', 'm6web'),
'rtlplay.be': ('rtlbe_rtl_play', 'rtlbe'),
}.get(domain, ('6play', 'm6web'))
data = self._download_json( data = self._download_json(
'https://pc.middleware.6play.fr/6play/v2/platforms/m6group_web/services/6play/videos/clip_%s' % video_id, 'https://pc.middleware.6play.fr/6play/v2/platforms/m6group_web/services/%s/videos/clip_%s' % (service, video_id),
video_id, query={ video_id, headers={
'x-customer-name': consumer_name
}, query={
'csa': 5, 'csa': 5,
'with': 'clips', 'with': 'clips',
}) })
@ -65,7 +69,12 @@ class SixPlayIE(InfoExtractor):
subtitles.setdefault('fr', []).append({'url': asset_url}) subtitles.setdefault('fr', []).append({'url': asset_url})
continue continue
if container == 'm3u8' or ext == 'm3u8': if container == 'm3u8' or ext == 'm3u8':
if protocol == 'usp' and not compat_parse_qs(compat_urllib_parse_urlparse(asset_url).query).get('token', [None])[0]: if protocol == 'usp':
if compat_parse_qs(compat_urllib_parse_urlparse(asset_url).query).get('token', [None])[0]:
urlh = self._request_webpage(asset_url, video_id, fatal=False)
if not urlh:
continue
asset_url = urlh.geturl()
asset_url = re.sub(r'/([^/]+)\.ism/[^/]*\.m3u8', r'/\1.ism/\1.m3u8', asset_url) asset_url = re.sub(r'/([^/]+)\.ism/[^/]*\.m3u8', r'/\1.ism/\1.m3u8', asset_url)
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
asset_url, video_id, 'mp4', 'm3u8_native', asset_url, video_id, 'mp4', 'm3u8_native',