mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-30 12:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tenplay] Improve extractor (#3280)

Browse source 
Authored by: aarubui
This commit is contained in:
aarubui 2022-04-03 23:53:22 +10:00 committed by GitHub
parent a17526e427
commit dc57e74a7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
yt_dlp/extractor/tenplay.py
View file

@ -7,6 +7,7 @@
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
HEADRequest, HEADRequest,
int_or_none,
urlencode_postdata, urlencode_postdata,
) )
@ -15,6 +16,28 @@ class TenPlayIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?10play\.com\.au/(?:[^/]+/)+(?P<id>tpv\d{6}[a-z]{5})' _VALID_URL = r'https?://(?:www\.)?10play\.com\.au/(?:[^/]+/)+(?P<id>tpv\d{6}[a-z]{5})'
_NETRC_MACHINE = '10play' _NETRC_MACHINE = '10play'
_TESTS = [{ _TESTS = [{
'url': 'https://10play.com.au/neighbours/web-extras/season-39/nathan-borg-is-the-first-aussie-actor-with-a-cochlear-implant-to-join-neighbours/tpv210128qupwd',
'info_dict': {
'id': '6226844312001',
'ext': 'mp4',
'title': 'Nathan Borg Is The First Aussie Actor With A Cochlear Implant To Join Neighbours',
'alt_title': 'Nathan Borg Is The First Aussie Actor With A Cochlear Implant To Join Neighbours',
'description': 'md5:a02d0199c901c2dd4c796f1e7dd0de43',
'duration': 186,
'season': 39,
'series': 'Neighbours',
'thumbnail': r're:https://.*\.jpg',
'uploader': 'Channel 10',
'age_limit': 15,
'timestamp': 1611810000,
'upload_date': '20210128',
'uploader_id': '2199827728001',
},
'params': {
'skip_download': True,
},
'skip': 'Only available in Australia',
}, {
'url': 'https://10play.com.au/todd-sampsons-body-hack/episodes/season-4/episode-7/tpv200921kvngh', 'url': 'https://10play.com.au/todd-sampsons-body-hack/episodes/season-4/episode-7/tpv200921kvngh',
'info_dict': { 'info_dict': {
'id': '6192880312001', 'id': '6192880312001',
@ -62,12 +85,17 @@ def _get_bearer_token(self, video_id):
def _real_extract(self, url): def _real_extract(self, url):
content_id = self._match_id(url) content_id = self._match_id(url)
_token = self._get_bearer_token(content_id)
data = self._download_json( data = self._download_json(
'https://10play.com.au/api/v1/videos/' + content_id, content_id) 'https://10play.com.au/api/v1/videos/' + content_id, content_id)
headers = {}
if data.get('memberGated') is True:
_token = self._get_bearer_token(content_id)
headers = {'Authorization': _token}
_video_url = self._download_json( _video_url = self._download_json(
data.get('playbackApiEndpoint'), content_id, 'Downloading video JSON', data.get('playbackApiEndpoint'), content_id, 'Downloading video JSON',
headers={'Authorization': _token}).get('source') headers=headers).get('source')
m3u8_url = self._request_webpage(HEADRequest( m3u8_url = self._request_webpage(HEADRequest(
_video_url), content_id).geturl() _video_url), content_id).geturl()
if '10play-not-in-oz' in m3u8_url: if '10play-not-in-oz' in m3u8_url:
@ -77,12 +105,16 @@ def _real_extract(self, url):
return { return {
'formats': formats, 'formats': formats,
'subtitles': {'en': [{'url': data.get('captionUrl')}]} if data.get('captionUrl') else None,
'id': data.get('altId') or content_id, 'id': data.get('altId') or content_id,
'title': data.get('title'), 'duration': data.get('duration'),
'title': data.get('subtitle'),
'alt_title': data.get('title'),
'description': data.get('description'), 'description': data.get('description'),
'age_limit': self._AUS_AGES.get(data.get('classification')), 'age_limit': self._AUS_AGES.get(data.get('classification')),
'series': data.get('showName'), 'series': data.get('tvShow'),
'season': data.get('showContentSeason'), 'season': int_or_none(data.get('season')),
'episode_number': int_or_none(data.get('episode')),
'timestamp': data.get('published'), 'timestamp': data.get('published'),
'thumbnail': data.get('imageUrl'), 'thumbnail': data.get('imageUrl'),
'uploader': 'Channel 10', 'uploader': 'Channel 10',