mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-22 10:11:52 +00:00
[tenplay] fix format extraction(closes #26653)
This commit is contained in:
parent
bcfe485e01
commit
7acd042bbb
1 changed files with 23 additions and 11 deletions
|
@ -3,9 +3,10 @@ from __future__ import unicode_literals
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
HEADRequest,
|
||||||
parse_age_limit,
|
parse_age_limit,
|
||||||
parse_iso8601,
|
parse_iso8601,
|
||||||
smuggle_url,
|
# smuggle_url,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -24,14 +25,16 @@ class TenPlayIE(InfoExtractor):
|
||||||
'uploader_id': '2199827728001',
|
'uploader_id': '2199827728001',
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'format': 'bestvideo',
|
# 'format': 'bestvideo',
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://10play.com.au/how-to-stay-married/web-extras/season-1/terrys-talks-ep-1-embracing-change/tpv190915ylupc',
|
'url': 'https://10play.com.au/how-to-stay-married/web-extras/season-1/terrys-talks-ep-1-embracing-change/tpv190915ylupc',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
BRIGHTCOVE_URL_TEMPLATE = 'https://players.brightcove.net/2199827728001/cN6vRtRQt_default/index.html?videoId=%s'
|
# BRIGHTCOVE_URL_TEMPLATE = 'https://players.brightcove.net/2199827728001/cN6vRtRQt_default/index.html?videoId=%s'
|
||||||
|
_GEO_BYPASS = False
|
||||||
|
_FASTLY_URL_TEMPL = 'https://10-selector.global.ssl.fastly.net/s/kYEXFC/media/%s?mbr=true&manifest=m3u&format=redirect'
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
content_id = self._match_id(url)
|
content_id = self._match_id(url)
|
||||||
|
@ -40,19 +43,28 @@ class TenPlayIE(InfoExtractor):
|
||||||
video = data.get('video') or {}
|
video = data.get('video') or {}
|
||||||
metadata = data.get('metaData') or {}
|
metadata = data.get('metaData') or {}
|
||||||
brightcove_id = video.get('videoId') or metadata['showContentVideoId']
|
brightcove_id = video.get('videoId') or metadata['showContentVideoId']
|
||||||
brightcove_url = smuggle_url(
|
# brightcove_url = smuggle_url(
|
||||||
self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
|
# self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
|
||||||
{'geo_countries': ['AU']})
|
# {'geo_countries': ['AU']})
|
||||||
|
m3u8_url = self._request_webpage(HEADRequest(
|
||||||
|
self._FASTLY_URL_TEMPL % brightcove_id), brightcove_id).geturl()
|
||||||
|
if '10play-not-in-oz' in m3u8_url:
|
||||||
|
self.raise_geo_restricted(countries=['AU'])
|
||||||
|
formats = self._extract_m3u8_formats(m3u8_url, brightcove_id, 'mp4')
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'_type': 'url_transparent',
|
# '_type': 'url_transparent',
|
||||||
'url': brightcove_url,
|
# 'url': brightcove_url,
|
||||||
'id': content_id,
|
'formats': formats,
|
||||||
'title': video.get('title') or metadata.get('pageContentName') or metadata.get('showContentName'),
|
'id': brightcove_id,
|
||||||
|
'title': video.get('title') or metadata.get('pageContentName') or metadata['showContentName'],
|
||||||
'description': video.get('description'),
|
'description': video.get('description'),
|
||||||
'age_limit': parse_age_limit(video.get('showRatingClassification') or metadata.get('showProgramClassification')),
|
'age_limit': parse_age_limit(video.get('showRatingClassification') or metadata.get('showProgramClassification')),
|
||||||
'series': metadata.get('showName'),
|
'series': metadata.get('showName'),
|
||||||
'season': metadata.get('showContentSeason'),
|
'season': metadata.get('showContentSeason'),
|
||||||
'timestamp': parse_iso8601(metadata.get('contentPublishDate') or metadata.get('pageContentPublishDate')),
|
'timestamp': parse_iso8601(metadata.get('contentPublishDate') or metadata.get('pageContentPublishDate')),
|
||||||
'ie_key': 'BrightcoveNew',
|
'thumbnail': video.get('poster'),
|
||||||
|
'uploader_id': '2199827728001',
|
||||||
|
# 'ie_key': 'BrightcoveNew',
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue