[kakao] Fix extractor

Closes #699
This commit is contained in:
pukkandan 2021-08-15 14:27:44 +05:30
parent d967c68e4c
commit f8fabc9930
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
1 changed files with 26 additions and 30 deletions

View File

@ -7,6 +7,7 @@ from ..compat import compat_str
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
strip_or_none, strip_or_none,
traverse_obj,
unified_timestamp, unified_timestamp,
) )
@ -73,40 +74,35 @@ class KakaoIE(InfoExtractor):
formats = [] formats = []
for fmt in clip.get('videoOutputList', []): for fmt in clip.get('videoOutputList', []):
try: profile_name = fmt.get('profile')
profile_name = fmt['profile'] if not profile_name or profile_name == 'AUDIO':
if profile_name == 'AUDIO': continue
continue query.update({
query.update({ 'profile': profile_name,
'profile': profile_name, 'fields': '-*,url',
'fields': '-*,url', })
})
fmt_url_json = self._download_json( fmt_url_json = self._download_json(
cdn_api_base, video_id, cdn_api_base, video_id,
'Downloading video URL for profile %s' % profile_name, 'Downloading video URL for profile %s' % profile_name,
query=query, fatal=False) query=query, fatal=False)
fmt_url = traverse_obj(fmt_url_json, ('videoLocation', 'url'))
if not fmt_url:
continue
if fmt_url_json is None: formats.append({
continue 'url': fmt_url,
'format_id': profile_name,
fmt_vidLocation = fmt_url_json['videoLocation'] 'width': int_or_none(fmt.get('width')),
fmt_url = fmt_vidLocation['url'] 'height': int_or_none(fmt.get('height')),
formats.append({ 'format_note': fmt.get('label'),
'url': fmt_url, 'filesize': int_or_none(fmt.get('filesize')),
'format_id': profile_name, 'tbr': int_or_none(fmt.get('kbps')),
'width': int_or_none(fmt.get('width')), })
'height': int_or_none(fmt.get('height')),
'format_note': fmt.get('label'),
'filesize': int_or_none(fmt.get('filesize')),
'tbr': int_or_none(fmt.get('kbps')),
})
except KeyError:
pass
self._sort_formats(formats) self._sort_formats(formats)
thumbs = [] thumbs = []
for thumb in clip.get('clipChapterThumbnailList', []): for thumb in clip.get('clipChapterThumbnailList') or []:
thumbs.append({ thumbs.append({
'url': thumb.get('thumbnailUrl'), 'url': thumb.get('thumbnailUrl'),
'id': compat_str(thumb.get('timeInSec')), 'id': compat_str(thumb.get('timeInSec')),
@ -123,7 +119,7 @@ class KakaoIE(InfoExtractor):
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'description': strip_or_none(clip.get('description')), 'description': strip_or_none(clip.get('description')),
'uploader': clip_link.get('channel', {}).get('name'), 'uploader': traverse_obj(clip_link, ('channel', 'name')),
'uploader_id': clip_link.get('channelId'), 'uploader_id': clip_link.get('channelId'),
'thumbnails': thumbs, 'thumbnails': thumbs,
'timestamp': unified_timestamp(clip_link.get('createTime')), 'timestamp': unified_timestamp(clip_link.get('createTime')),