mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-22 18:31:25 +02:00
Compare commits
No commits in common. "78c224432196c58914e224422cdfdc311f1f77d4" and "20ed3e02f21ecc31e70965b8eaa93f2f4b4562bc" have entirely different histories.
78c2244321
...
20ed3e02f2
|
@ -54,29 +54,26 @@ class NhkBaseIE(InfoExtractor):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
api_url = api_info.pop('url')
|
api_url = api_info.pop('url')
|
||||||
meta = traverse_obj(
|
meta = traverse_obj(self._download_json(api_url, vod_id, 'Downloading stream url info',
|
||||||
self._download_json(
|
fatal=False, query={
|
||||||
api_url, vod_id, 'Downloading stream url info', fatal=False, query={
|
**api_info,
|
||||||
**api_info,
|
'type': 'json',
|
||||||
'type': 'json',
|
'optional_id': vod_id,
|
||||||
'optional_id': vod_id,
|
'active_flg': 1, }), ('meta', 0))
|
||||||
'active_flg': 1,
|
|
||||||
}), ('meta', 0))
|
stream_url = traverse_obj(meta, ('movie_url', ('mb_auto', 'auto_sp', 'auto_pc'),
|
||||||
stream_url = traverse_obj(
|
{url_or_none}), get_all=False)
|
||||||
meta, ('movie_url', ('mb_auto', 'auto_sp', 'auto_pc'), {url_or_none}), get_all=False)
|
|
||||||
|
info = traverse_obj(meta, {
|
||||||
|
'duration': 'duration',
|
||||||
|
'timestamp': ('publication_date', {unified_timestamp}),
|
||||||
|
'release_timestamp': ('insert_date', {unified_timestamp}),
|
||||||
|
'modified_timestamp': ('update_date', {unified_timestamp}),
|
||||||
|
})
|
||||||
|
|
||||||
if stream_url:
|
if stream_url:
|
||||||
formats, subtitles = self._extract_m3u8_formats_and_subtitles(stream_url, vod_id)
|
return self._extract_m3u8_formats_and_subtitles(stream_url, vod_id), info
|
||||||
return {
|
|
||||||
**traverse_obj(meta, {
|
|
||||||
'duration': ('duration', {int_or_none}),
|
|
||||||
'timestamp': ('publication_date', {unified_timestamp}),
|
|
||||||
'release_timestamp': ('insert_date', {unified_timestamp}),
|
|
||||||
'modified_timestamp': ('update_date', {unified_timestamp}),
|
|
||||||
}),
|
|
||||||
'formats': formats,
|
|
||||||
'subtitles': subtitles,
|
|
||||||
}
|
|
||||||
raise ExtractorError('Unable to extract stream url')
|
raise ExtractorError('Unable to extract stream url')
|
||||||
|
|
||||||
def _extract_episode_info(self, url, episode=None):
|
def _extract_episode_info(self, url, episode=None):
|
||||||
|
@ -127,12 +124,15 @@ class NhkBaseIE(InfoExtractor):
|
||||||
'series': series,
|
'series': series,
|
||||||
'episode': episode_name,
|
'episode': episode_name,
|
||||||
}
|
}
|
||||||
|
|
||||||
if is_video:
|
if is_video:
|
||||||
vod_id = episode['vod_id']
|
vod_id = episode['vod_id']
|
||||||
|
stream_info, additional_info = self._extract_stream_info(vod_id)
|
||||||
|
|
||||||
info.update({
|
info.update({
|
||||||
**self._extract_stream_info(vod_id),
|
|
||||||
'id': vod_id,
|
'id': vod_id,
|
||||||
|
'formats': stream_info[0],
|
||||||
|
'subtitles': stream_info[1],
|
||||||
|
**additional_info,
|
||||||
})
|
})
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
@ -261,8 +261,8 @@ class NhkVodIE(NhkBaseIE):
|
||||||
'timestamp': 1690103400,
|
'timestamp': 1690103400,
|
||||||
'duration': 2939,
|
'duration': 2939,
|
||||||
'release_timestamp': 1693898699,
|
'release_timestamp': 1693898699,
|
||||||
'modified_timestamp': 1698057495,
|
'modified_timestamp': 1694223888,
|
||||||
'modified_date': '20231023',
|
'modified_date': '20230909',
|
||||||
'upload_date': '20230723',
|
'upload_date': '20230723',
|
||||||
},
|
},
|
||||||
}]
|
}]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user