mirror of https://github.com/yt-dlp/yt-dlp.git
Compare commits
4 Commits
a513887a1f
...
d908999fc8
Author | SHA1 | Date |
---|---|---|
aarubui | d908999fc8 | |
aarubui | 1d9f4ab95f | |
sepro | 46f4c80bc3 | |
aarubui | 4f369b9fb3 |
|
@ -36,7 +36,7 @@ class SampleFocusIE(InfoExtractor):
|
|||
|
||||
def _real_extract(self, url):
|
||||
display_id = self._match_id(url)
|
||||
webpage = self._download_webpage(url, display_id)
|
||||
webpage = self._download_webpage(url, display_id, impersonate=True)
|
||||
|
||||
sample_id = self._search_regex(
|
||||
r'<input[^>]+id=(["\'])sample_id\1[^>]+value=(?:["\'])(?P<id>\d+)',
|
||||
|
@ -82,7 +82,15 @@ class SampleFocusIE(InfoExtractor):
|
|||
return {
|
||||
'id': sample_id,
|
||||
'title': title,
|
||||
'url': mp3_url,
|
||||
'formats': [{
|
||||
'url': mp3_url,
|
||||
'ext': 'mp3',
|
||||
'vcodec': 'none',
|
||||
'acodec': 'mp3',
|
||||
'http_headers': {
|
||||
'Referer': url,
|
||||
},
|
||||
}],
|
||||
'display_id': display_id,
|
||||
'thumbnail': thumbnail,
|
||||
'uploader': uploader,
|
||||
|
|
|
@ -1,49 +1,53 @@
|
|||
import base64
|
||||
import datetime as dt
|
||||
import functools
|
||||
import itertools
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..networking import HEADRequest
|
||||
from ..utils import int_or_none, traverse_obj, urlencode_postdata, urljoin
|
||||
from ..utils import int_or_none, traverse_obj, urljoin
|
||||
|
||||
|
||||
class TenPlayIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://(?:www\.)?10play\.com\.au/(?:[^/]+/)+(?P<id>tpv\d{6}[a-z]{5})'
|
||||
_NETRC_MACHINE = '10play'
|
||||
_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',
|
||||
'url': 'https://10play.com.au/neighbours/web-extras/season-41/heres-a-first-look-at-mischa-bartons-neighbours-debut/tpv230911hyxnz',
|
||||
'info_dict': {
|
||||
'id': '6226844312001',
|
||||
'id': '6336940246112',
|
||||
'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': 'Season 39',
|
||||
'season_number': 39,
|
||||
'title': 'Here\'s A First Look At Mischa Barton\'s Neighbours Debut',
|
||||
'alt_title': 'Here\'s A First Look At Mischa Barton\'s Neighbours Debut',
|
||||
'description': 'Neighbours Premieres Monday, September 18 At 4:30pm On 10 And 10 Play And 6:30pm On 10 Peach',
|
||||
'duration': 74,
|
||||
'season': 'Season 41',
|
||||
'season_number': 41,
|
||||
'series': 'Neighbours',
|
||||
'thumbnail': r're:https://.*\.jpg',
|
||||
'uploader': 'Channel 10',
|
||||
'age_limit': 15,
|
||||
'timestamp': 1611810000,
|
||||
'upload_date': '20210128',
|
||||
'timestamp': 1694386800,
|
||||
'upload_date': '20230910',
|
||||
'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/neighbours/episodes/season-42/episode-9107/tpv240902nzqyp',
|
||||
'info_dict': {
|
||||
'id': '6192880312001',
|
||||
'id': '9000000000091177',
|
||||
'ext': 'mp4',
|
||||
'title': "Todd Sampson's Body Hack - S4 Ep. 2",
|
||||
'description': 'md5:fa278820ad90f08ea187f9458316ac74',
|
||||
'title': 'Neighbours - S42 Ep. 9107',
|
||||
'alt_title': 'Thu 05 Sep',
|
||||
'description': 'md5:37a1f4271be34b9ee2b533426a5fbaef',
|
||||
'duration': 1388,
|
||||
'episode': 'Episode 9107',
|
||||
'episode_number': 9107,
|
||||
'season': 'Season 42',
|
||||
'season_number': 42,
|
||||
'series': 'Neighbours',
|
||||
'thumbnail': r're:https://.*\.jpg',
|
||||
'age_limit': 15,
|
||||
'timestamp': 1600770600,
|
||||
'upload_date': '20200922',
|
||||
'timestamp': 1725517860,
|
||||
'upload_date': '20240905',
|
||||
'uploader': 'Channel 10',
|
||||
'uploader_id': '2199827728001',
|
||||
},
|
||||
|
@ -54,7 +58,6 @@ class TenPlayIE(InfoExtractor):
|
|||
'url': 'https://10play.com.au/how-to-stay-married/web-extras/season-1/terrys-talks-ep-1-embracing-change/tpv190915ylupc',
|
||||
'only_matching': True,
|
||||
}]
|
||||
_GEO_BYPASS = False
|
||||
|
||||
_AUS_AGES = {
|
||||
'G': 0,
|
||||
|
@ -66,42 +69,31 @@ class TenPlayIE(InfoExtractor):
|
|||
'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 = dt.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):
|
||||
content_id = self._match_id(url)
|
||||
data = self._download_json(
|
||||
'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 = self._download_json(
|
||||
f'https://pubads.g.doubleclick.net/ondemand/hls/content/2489270/vid/{data["altId"]}/streams',
|
||||
content_id, data=b'')
|
||||
|
||||
_video_url = self._download_json(
|
||||
data.get('playbackApiEndpoint'), content_id, 'Downloading video JSON',
|
||||
headers=headers).get('source')
|
||||
m3u8_url = self._request_webpage(HEADRequest(
|
||||
_video_url), content_id).url
|
||||
if '10play-not-in-oz' in m3u8_url:
|
||||
self.raise_geo_restricted(countries=['AU'])
|
||||
formats = self._extract_m3u8_formats(m3u8_url, content_id, 'mp4')
|
||||
formats, subtitles = self._extract_m3u8_formats_and_subtitles(video['stream_manifest'], content_id, 'mp4')
|
||||
for sub in video.get('subtitles', []):
|
||||
if ttml_url := sub.get('ttml'):
|
||||
subtitles.setdefault(sub.get('language') or 'en', []).append({
|
||||
'url': ttml_url,
|
||||
'ext': 'ttml',
|
||||
})
|
||||
if webvtt_url := sub.get('webvtt'):
|
||||
subtitles.setdefault(sub.get('language') or 'en', []).append({
|
||||
'url': webvtt_url,
|
||||
'ext': 'vtt',
|
||||
})
|
||||
|
||||
return {
|
||||
'formats': formats,
|
||||
'subtitles': {'en': [{'url': data.get('captionUrl')}]} if data.get('captionUrl') else None,
|
||||
'subtitles': subtitles,
|
||||
'id': data.get('altId') or content_id,
|
||||
'duration': data.get('duration'),
|
||||
'title': data.get('subtitle'),
|
||||
|
|
Loading…
Reference in New Issue