MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-25 04:35:52 +01:00
Code Issues Projects Releases Wiki Activity

[extractor/Crunchyroll] Handle missing metadata correctly (#4405)

Browse Source 
Closes #4399

Authored by pukkandan, Burve
This commit is contained in:
Burve 2022-07-26 06:41:52 +03:00 committed by GitHub
parent 26bafe7028
commit 7d0f6f0c45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
yt_dlp/extractor/crunchyroll.py
View File

@ -813,56 +813,36 @@ def _real_extract(self, url):
episode_response = self._download_json( episode_response = self._download_json(
f'{api_domain}/cms/v2{bucket}/episodes/{internal_id}', display_id, f'{api_domain}/cms/v2{bucket}/episodes/{internal_id}', display_id,
note='Retrieving episode metadata', note='Retrieving episode metadata', query=params)
query=params)
if episode_response.get('is_premium_only') and not episode_response.get('playback'): if episode_response.get('is_premium_only') and not episode_response.get('playback'):
raise ExtractorError('This video is for premium members only.', expected=True) raise ExtractorError('This video is for premium members only.', expected=True)
stream_response = self._download_json(
episode_response['playback'], display_id,
note='Retrieving stream info')
thumbnails = [] stream_response = self._download_json(episode_response['playback'], display_id, note='Retrieving stream info')
for thumbnails_data in traverse_obj(episode_response, ('images', 'thumbnail')): get_streams = lambda name: (traverse_obj(stream_response, name) or {}).items()
for thumbnail_data in thumbnails_data:
thumbnails.append({
'url': thumbnail_data.get('source'),
'width': thumbnail_data.get('width'),
'height': thumbnail_data.get('height'),
})
subtitles = {}
for lang, subtitle_data in stream_response.get('subtitles').items():
subtitles[lang] = [{
'url': subtitle_data.get('url'),
'ext': subtitle_data.get('format')
}]
requested_hardsubs = [('' if val == 'none' else val) for val in (self._configuration_arg('hardsub') or ['none'])] requested_hardsubs = [('' if val == 'none' else val) for val in (self._configuration_arg('hardsub') or ['none'])]
hardsub_preference = qualities(requested_hardsubs[::-1]) hardsub_preference = qualities(requested_hardsubs[::-1])
requested_formats = self._configuration_arg('format') or ['adaptive_hls'] requested_formats = self._configuration_arg('format') or ['adaptive_hls']
formats = [] formats = []
for stream_type, streams in stream_response.get('streams', {}).items(): for stream_type, streams in get_streams('streams'):
if stream_type not in requested_formats: if stream_type not in requested_formats:
continue continue
for stream in streams.values(): for stream in streams.values():
hardsub_lang = stream.get('hardsub_locale') or '' hardsub_lang = stream.get('hardsub_locale') or ''
if hardsub_lang.lower() not in requested_hardsubs: if hardsub_lang.lower() not in requested_hardsubs:
continue continue
format_id = join_nonempty( format_id = join_nonempty(stream_type, format_field(stream, 'hardsub_locale', 'hardsub-%s'))
stream_type,
format_field(stream, 'hardsub_locale', 'hardsub-%s'))
if not stream.get('url'): if not stream.get('url'):
continue continue
if stream_type.split('_')[-1] == 'hls': if stream_type.endswith('hls'):
adaptive_formats = self._extract_m3u8_formats( adaptive_formats = self._extract_m3u8_formats(
stream['url'], display_id, 'mp4', m3u8_id=format_id, stream['url'], display_id, 'mp4', m3u8_id=format_id,
note='Downloading %s information' % format_id, fatal=False, note=f'Downloading {format_id} HLS manifest')
fatal=False) elif stream_type.endswith('dash'):
elif stream_type.split('_')[-1] == 'dash':
adaptive_formats = self._extract_mpd_formats( adaptive_formats = self._extract_mpd_formats(
stream['url'], display_id, mpd_id=format_id, stream['url'], display_id, mpd_id=format_id,
note='Downloading %s information' % format_id, fatal=False, note=f'Downloading {format_id} MPD manifest')
fatal=False)
for f in adaptive_formats: for f in adaptive_formats:
if f.get('acodec') != 'none': if f.get('acodec') != 'none':
f['language'] = stream_response.get('audio_locale') f['language'] = stream_response.get('audio_locale')
@ -872,10 +852,10 @@ def _real_extract(self, url):
return { return {
'id': internal_id, 'id': internal_id,
'title': '%s Episode %s – %s' % (episode_response.get('season_title'), episode_response.get('episode'), episode_response.get('title')), 'title': '%s Episode %s – %s' % (
'description': episode_response.get('description').replace(r'\r\n', '\n'), episode_response.get('season_title'), episode_response.get('episode'), episode_response.get('title')),
'description': try_get(episode_response, lambda x: x['description'].replace(r'\r\n', '\n')),
'duration': float_or_none(episode_response.get('duration_ms'), 1000), 'duration': float_or_none(episode_response.get('duration_ms'), 1000),
'thumbnails': thumbnails,
'series': episode_response.get('series_title'), 'series': episode_response.get('series_title'),
'series_id': episode_response.get('series_id'), 'series_id': episode_response.get('series_id'),
'season': episode_response.get('season_title'), 'season': episode_response.get('season_title'),
@ -883,8 +863,18 @@ def _real_extract(self, url):
'season_number': episode_response.get('season_number'), 'season_number': episode_response.get('season_number'),
'episode': episode_response.get('title'), 'episode': episode_response.get('title'),
'episode_number': episode_response.get('sequence_number'), 'episode_number': episode_response.get('sequence_number'),
'subtitles': subtitles, 'formats': formats,
'formats': formats 'thumbnails': [{
'url': thumb.get('source'),
'width': thumb.get('width'),
'height': thumb.get('height'),
} for thumb in traverse_obj(episode_response, ('images', 'thumbnail', ..., ...)) or []],
'subtitles': {
lang: [{
'url': subtitle_data.get('url'),
'ext': subtitle_data.get('format')
}] for lang, subtitle_data in get_streams('subtitles')
},
} }