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

[abc:iview] Apply suggestions from code review

Browse Source 
Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
This commit is contained in:
ClosedPort22 2024-06-28 01:15:49 +00:00 committed by GitHub
parent 16ed8814be
commit ad98e612dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
yt_dlp/extractor/abc.py
View File

@ -305,18 +305,17 @@ 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://api.iview.abc.net.au/v3/video/' + video_id, video_id, f'https://api.iview.abc.net.au/v3/video/{video_id}', video_id,
errnote='Failed to download API V3 JSON', fatal=False) 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 # fallback to legacy API, which will return some useful info even if the video is unavailable
if not video_params: if not video_params:
video_params = self._download_json( video_params = self._download_json(
'https://iview.abc.net.au/api/programs/' + video_id, video_id, f'https://iview.abc.net.au/api/programs/{video_id}', video_id,
note='Downloading legacy API JSON') note='Falling back to legacy API JSON')
stream = traverse_obj(video_params, ( stream = traverse_obj(video_params, (
('_embedded', None), 'playlist', lambda _, v: v['type'] in ('program', 'livestream')), ('_embedded', None), 'playlist', lambda _, v: v['type'] in ('program', 'livestream'), any)) or {}
get_all=False)
house_number = traverse_obj(video_params, ('houseNumber', 'episodeHouseNumber')) or video_id house_number = traverse_obj(video_params, 'houseNumber', 'episodeHouseNumber') or video_id
path = f'/auth/hls/sign?ts={int(time.time())}&hn={house_number}&d=android-tablet' path = f'/auth/hls/sign?ts={int(time.time())}&hn={house_number}&d=android-tablet'
sig = hmac.new( sig = hmac.new(
b'android.content.res.Resources', b'android.content.res.Resources',
@ -344,8 +343,7 @@ def tokenize_url(url, token):
break break
subtitles = {} subtitles = {}
src_vtt = traverse_obj(stream, ('captions', 'src-vtt')) if src_vtt := traverse_obj(stream, ('captions', 'src-vtt', {url_or_none})):
if src_vtt:
subtitles['en'] = [{ subtitles['en'] = [{
'url': src_vtt, 'url': src_vtt,
'ext': 'vtt', 'ext': 'vtt',
@ -357,8 +355,7 @@ def tokenize_url(url, token):
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'series_id': traverse_obj( 'series_id': traverse_obj(
video_params, video_params, ('analytics', 'oztam', 'seriesId'), 'seriesHouseNumber') or video_id[:7],
('analytics', 'oztam', 'seriesId'), 'seriesHouseNumber') or video_id[:7],
'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(
@ -366,14 +363,14 @@ def tokenize_url(url, token):
'episode_id': house_number, 'episode_id': house_number,
'episode': self._search_regex( 'episode': self._search_regex(
r'^(?:Series\s+\d+)?\s*(?:Ep(?:isode)?\s+\d+)?\s*(.*)$', title, 'episode', default='') or None, r'^(?:Series\s+\d+)?\s*(?:Ep(?:isode)?\s+\d+)?\s*(.*)$', title, 'episode', default='') or None,
'is_live': video_params.get('livestream') == '1' or stream['type'] == 'livestream', 'is_live': video_params.get('livestream') == '1' or stream.get('type') == 'livestream',
'formats': formats, 'formats': formats,
'subtitles': subtitles, 'subtitles': subtitles,
**traverse_obj(video_params, { **traverse_obj(video_params, {
'description': ('description', {str}), 'description': ('description', {str}),
'thumbnail': (( 'thumbnail': ((
('images', lambda _, v: v['name'] == 'episodeThumbnail', 'url'), 'thumbnail'), {str}, any), ('images', lambda _, v: v['name'] == 'episodeThumbnail', 'url'), 'thumbnail'), {url_or_none}, any),
'chapters': ('cuePoints', ..., { 'chapters': ('cuePoints', lambda _, v: int(v['start']) is not None, {
'start_time': ('start', {int_or_none}), 'start_time': ('start', {int_or_none}),
'end_time': ('end', {int_or_none}), 'end_time': ('end', {int_or_none}),
'title': ('type', {str}), 'title': ('type', {str}),