MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-24 05:36:56 +01:00
Code Issues Projects Releases Wiki Activity

[tenplay] Fix extractor (#314)

Browse Source 
Authored by: king-millez
This commit is contained in:
king-millez 2021-05-19 21:13:34 +10:00 committed by GitHub
parent ff2751ac9c
commit 74e001af1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
yt_dlp/extractor/tenplay.py
View File

@ -1,70 +1,89 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
from datetime import datetime
import base64
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
HEADRequest, HEADRequest,
parse_age_limit, urlencode_postdata,
parse_iso8601,
# smuggle_url,
) )
class TenPlayIE(InfoExtractor): 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'
_TESTS = [{ _TESTS = [{
'url': 'https://10play.com.au/masterchef/episodes/season-1/masterchef-s1-ep-1/tpv190718kwzga', 'url': 'https://10play.com.au/todd-sampsons-body-hack/episodes/season-4/episode-7/tpv200921kvngh',
'info_dict': { 'info_dict': {
'id': '6060533435001', 'id': '6192880312001',
'ext': 'mp4', 'ext': 'mp4',
'title': 'MasterChef - S1 Ep. 1', 'title': "Todd Sampson's Body Hack - S4 Ep. 2",
'description': 'md5:4fe7b78e28af8f2d900cd20d900ef95c', 'description': 'md5:fa278820ad90f08ea187f9458316ac74',
'age_limit': 10, 'age_limit': 15,
'timestamp': 1240828200, 'timestamp': 1600770600,
'upload_date': '20090427', 'upload_date': '20200922',
'uploader_id': '2199827728001', 'uploader': 'Channel 10',
'uploader_id': '2199827728001'
}, },
'params': { 'params': {
# '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'
_GEO_BYPASS = False _GEO_BYPASS = False
_FASTLY_URL_TEMPL = 'https://10-selector.global.ssl.fastly.net/s/kYEXFC/media/%s?mbr=true&manifest=m3u&format=redirect'
_AUS_AGES = {
'G': 0,
'PG': 15,
'M': 15,
'MA': 15,
'R': 18,
'X': 18
}
def _get_bearer_token(self, video_id):
username, password = self._get_login_info()
if username is None or password is None:
self.raise_login_required('Your 10play account\'s details must be provided with --username and --password.')
_timestamp = datetime.now().strftime('%Y%m%d000000')
_auth_header = base64.b64encode(_timestamp.encode('ascii')).decode('ascii')
data = self._download_json('https://10play.com.au/api/user/auth', video_id, 'Getting bearer token', headers={
'X-Network-Ten-Auth': _auth_header,
}, data=urlencode_postdata({
'email': username,
'password': password,
}))
return "Bearer " + data['jwt']['accessToken']
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/video/' + content_id, content_id) 'https://10play.com.au/api/v1/videos/' + content_id, content_id)
video = data.get('video') or {} _video_url = self._download_json(
metadata = data.get('metaData') or {} data.get('playbackApiEndpoint'), content_id, 'Downloading video JSON',
brightcove_id = video.get('videoId') or metadata['showContentVideoId'] headers={'Authorization': _token}).get('source')
# brightcove_url = smuggle_url(
# self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
# {'geo_countries': ['AU']})
m3u8_url = self._request_webpage(HEADRequest( m3u8_url = self._request_webpage(HEADRequest(
self._FASTLY_URL_TEMPL % brightcove_id), brightcove_id).geturl() _video_url), content_id).geturl()
if '10play-not-in-oz' in m3u8_url: if '10play-not-in-oz' in m3u8_url:
self.raise_geo_restricted(countries=['AU']) self.raise_geo_restricted(countries=['AU'])
formats = self._extract_m3u8_formats(m3u8_url, brightcove_id, 'mp4') formats = self._extract_m3u8_formats(m3u8_url, content_id, 'mp4')
self._sort_formats(formats) self._sort_formats(formats)
return { return {
# '_type': 'url_transparent',
# 'url': brightcove_url,
'formats': formats, 'formats': formats,
'id': brightcove_id, 'id': data.get('altId') or content_id,
'title': video.get('title') or metadata.get('pageContentName') or metadata['showContentName'], 'title': data.get('title'),
'description': video.get('description'), 'description': data.get('description'),
'age_limit': parse_age_limit(video.get('showRatingClassification') or metadata.get('showProgramClassification')), 'age_limit': self._AUS_AGES[data.get('classification')],
'series': metadata.get('showName'), 'series': data.get('showName'),
'season': metadata.get('showContentSeason'), 'season': data.get('showContentSeason'),
'timestamp': parse_iso8601(metadata.get('contentPublishDate') or metadata.get('pageContentPublishDate')), 'timestamp': data.get('published'),
'thumbnail': video.get('poster'), 'thumbnail': data.get('imageUrl'),
'uploader': 'Channel 10',
'uploader_id': '2199827728001', 'uploader_id': '2199827728001',
# 'ie_key': 'BrightcoveNew',
} }