Cool_Tools/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-20 13:57:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[abc:iview] use V3 API if possible

Browse Source
This commit is contained in:
ClosedPort22 2024-06-10 10:36:45 +08:00
parent db50f19d76
commit 81f217b552
No known key found for this signature in database
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
yt_dlp/extractor/abc.py
View File

@ -283,11 +283,19 @@ class ABCIViewIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
video_params = self._download_json( video_params = self._download_json(
'https://iview.abc.net.au/api/programs/' + video_id, video_id) 'https://api.iview.abc.net.au/v3/video/' + video_id, video_id,
errnote='Failed to download API V3 JSON', fatal=False)
# fallback to legacy API, which will return some useful info even if the video is unavailable
if not video_params:
video_params = self._download_json(
'https://iview.abc.net.au/api/programs/' + video_id, video_id,
note='Downloading legacy API JSON')
title = unescapeHTML(video_params.get('title') or video_params['seriesTitle']) title = unescapeHTML(video_params.get('title') or video_params['seriesTitle'])
stream = next(s for s in video_params['playlist'] if s.get('type') in ('program', 'livestream')) stream = traverse_obj(video_params, (
('_embedded', None), 'playlist', lambda _, v: v['type'] in ('program', 'livestream')),
get_all=False)
house_number = video_params.get('episodeHouseNumber') or video_id house_number = traverse_obj(video_params, ('houseNumber', 'episodeHouseNumber')) or video_id
path = '/auth/hls/sign?ts={0}&hn={1}&d=android-tablet'.format( path = '/auth/hls/sign?ts={0}&hn={1}&d=android-tablet'.format(
int(time.time()), house_number) int(time.time()), house_number)
sig = hmac.new( sig = hmac.new(
@ -320,17 +328,23 @@ def tokenize_url(url, token):
'ext': 'vtt', 'ext': 'vtt',
}] }]
is_live = video_params.get('livestream') == '1' is_live = video_params.get('livestream') == '1' or stream['type'] == 'livestream'
thumbnail = traverse_obj(
video_params,
('images', lambda _, v: v['name'] == 'episodeThumbnail', 'url'),
'thumbnail', expected_type=str, get_all=False)
series_id = traverse_obj(
video_params, ('analytics', 'oztam', 'seriesId'), 'seriesHouseNumber') or video_id[:7]
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'description': video_params.get('description'), 'description': video_params.get('description'),
'thumbnail': video_params.get('thumbnail'), 'thumbnail': thumbnail,
'duration': int_or_none(video_params.get('eventDuration')), 'duration': int_or_none(traverse_obj(video_params, 'duration', 'eventDuration')),
'timestamp': parse_iso8601(video_params.get('pubDate'), ' '), 'timestamp': parse_iso8601(video_params.get('pubDate'), ' '),
'series': unescapeHTML(video_params.get('seriesTitle')), 'series': unescapeHTML(video_params.get('seriesTitle')),
'series_id': video_params.get('seriesHouseNumber') or video_id[:7], 'series_id': series_id,
'season_number': int_or_none(self._search_regex( 'season_number': int_or_none(self._search_regex(
r'\bSeries\s+(\d+)\b', title, 'season number', default=None)), r'\bSeries\s+(\d+)\b', title, 'season number', default=None)),
'episode_number': int_or_none(self._search_regex( 'episode_number': int_or_none(self._search_regex(