From f8fabc993085dcc75c1354785feb6cf17d83fa8a Mon Sep 17 00:00:00 2001 From: pukkandan Date: Sun, 15 Aug 2021 14:27:44 +0530 Subject: [PATCH] [kakao] Fix extractor Closes #699 --- yt_dlp/extractor/kakao.py | 56 ++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/yt_dlp/extractor/kakao.py b/yt_dlp/extractor/kakao.py index fefd8a215..97c986d8c 100644 --- a/yt_dlp/extractor/kakao.py +++ b/yt_dlp/extractor/kakao.py @@ -7,6 +7,7 @@ from ..utils import ( int_or_none, strip_or_none, + traverse_obj, unified_timestamp, ) @@ -73,40 +74,35 @@ def _real_extract(self, url): formats = [] for fmt in clip.get('videoOutputList', []): - try: - profile_name = fmt['profile'] - if profile_name == 'AUDIO': - continue - query.update({ - 'profile': profile_name, - 'fields': '-*,url', - }) + profile_name = fmt.get('profile') + if not profile_name or profile_name == 'AUDIO': + continue + query.update({ + 'profile': profile_name, + 'fields': '-*,url', + }) - fmt_url_json = self._download_json( - cdn_api_base, video_id, - 'Downloading video URL for profile %s' % profile_name, - query=query, fatal=False) + fmt_url_json = self._download_json( + cdn_api_base, video_id, + 'Downloading video URL for profile %s' % profile_name, + query=query, fatal=False) + fmt_url = traverse_obj(fmt_url_json, ('videoLocation', 'url')) + if not fmt_url: + continue - if fmt_url_json is None: - continue - - fmt_vidLocation = fmt_url_json['videoLocation'] - fmt_url = fmt_vidLocation['url'] - formats.append({ - 'url': fmt_url, - 'format_id': profile_name, - '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 + formats.append({ + 'url': fmt_url, + 'format_id': profile_name, + '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')), + }) self._sort_formats(formats) thumbs = [] - for thumb in clip.get('clipChapterThumbnailList', []): + for thumb in clip.get('clipChapterThumbnailList') or []: thumbs.append({ 'url': thumb.get('thumbnailUrl'), 'id': compat_str(thumb.get('timeInSec')), @@ -123,7 +119,7 @@ def _real_extract(self, url): 'id': video_id, 'title': title, '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'), 'thumbnails': thumbs, 'timestamp': unified_timestamp(clip_link.get('createTime')),