mirror of https://github.com/yt-dlp/yt-dlp.git
[extractor/tiktok] Fix and improve metadata extraction (#6777)
Authored by: bashonly
This commit is contained in:
bashonly
GitHub
parent
90c1f51206
commit
925936908a
|
|
@ -287,17 +287,15 @@ class TikTokBaseIE(InfoExtractor):
|
|||
thumbnails = []
|
||||
for cover_id in ('cover', 'ai_dynamic_cover', 'animated_cover', 'ai_dynamic_cover_bak',
|
||||
'origin_cover', 'dynamic_cover'):
|
||||
cover = video_info.get(cover_id)
|
||||
if cover:
|
||||
for cover_url in cover['url_list']:
|
||||
for cover_url in traverse_obj(video_info, (cover_id, 'url_list', ...)):
|
||||
thumbnails.append({
|
||||
'id': cover_id,
|
||||
'url': cover_url,
|
||||
})
|
||||
|
||||
stats_info = aweme_detail.get('statistics', {})
|
||||
author_info = aweme_detail.get('author', {})
|
||||
music_info = aweme_detail.get('music', {})
|
||||
stats_info = aweme_detail.get('statistics') or {}
|
||||
author_info = aweme_detail.get('author') or {}
|
||||
music_info = aweme_detail.get('music') or {}
|
||||
user_url = self._UPLOADER_URL_FORMAT % (traverse_obj(author_info,
|
||||
'sec_uid', 'id', 'uid', 'unique_id',
|
||||
expected_type=str_or_none, get_all=False))
|
||||
|
|
@ -319,20 +317,27 @@ class TikTokBaseIE(InfoExtractor):
|
|||
'extractor_key': TikTokIE.ie_key(),
|
||||
'extractor': TikTokIE.IE_NAME,
|
||||
'webpage_url': self._create_url(author_info.get('uid'), aweme_id),
|
||||
'title': aweme_detail.get('desc'),
|
||||
'description': aweme_detail.get('desc'),
|
||||
'view_count': int_or_none(stats_info.get('play_count')),
|
||||
'like_count': int_or_none(stats_info.get('digg_count')),
|
||||
'repost_count': int_or_none(stats_info.get('share_count')),
|
||||
'comment_count': int_or_none(stats_info.get('comment_count')),
|
||||
'uploader': str_or_none(author_info.get('unique_id')),
|
||||
'creator': str_or_none(author_info.get('nickname')),
|
||||
'uploader_id': str_or_none(author_info.get('uid')),
|
||||
**traverse_obj(aweme_detail, {
|
||||
'title': ('desc', {str}),
|
||||
'description': ('desc', {str}),
|
||||
'timestamp': ('create_time', {int_or_none}),
|
||||
}),
|
||||
**traverse_obj(stats_info, {
|
||||
'view_count': 'play_count',
|
||||
'like_count': 'digg_count',
|
||||
'repost_count': 'share_count',
|
||||
'comment_count': 'comment_count',
|
||||
}, expected_type=int_or_none),
|
||||
**traverse_obj(author_info, {
|
||||
'uploader': 'unique_id',
|
||||
'uploader_id': 'uid',
|
||||
'creator': 'nickname',
|
||||
'channel_id': 'sec_uid',
|
||||
}, expected_type=str_or_none),
|
||||
'uploader_url': user_url,
|
||||
'track': music_track,
|
||||
'album': str_or_none(music_info.get('album')) or None,
|
||||
'artist': music_author or None,
|
||||
'timestamp': int_or_none(aweme_detail.get('create_time')),
|
||||
'formats': formats,
|
||||
'subtitles': self.extract_subtitles(aweme_detail, aweme_id),
|
||||
'thumbnails': thumbnails,
|
||||
|
|
@ -344,37 +349,27 @@ class TikTokBaseIE(InfoExtractor):
|
|||
'_format_sort_fields': ('quality', 'codec', 'size', 'br'),
|
||||
}
|
||||
|
||||
def _parse_aweme_video_web(self, aweme_detail, webpage_url):
|
||||
def _parse_aweme_video_web(self, aweme_detail, webpage_url, video_id):
|
||||
video_info = aweme_detail['video']
|
||||
author_info = traverse_obj(aweme_detail, 'authorInfo', 'author', expected_type=dict, default={})
|
||||
music_info = aweme_detail.get('music') or {}
|
||||
stats_info = aweme_detail.get('stats') or {}
|
||||
user_url = self._UPLOADER_URL_FORMAT % (traverse_obj(author_info,
|
||||
'secUid', 'id', 'uid', 'uniqueId',
|
||||
expected_type=str_or_none, get_all=False)
|
||||
or aweme_detail.get('authorSecId'))
|
||||
channel_id = traverse_obj(author_info or aweme_detail, (('authorSecId', 'secUid'), {str}), get_all=False)
|
||||
user_url = self._UPLOADER_URL_FORMAT % channel_id if channel_id else None
|
||||
|
||||
formats = []
|
||||
play_url = video_info.get('playAddr')
|
||||
width = video_info.get('width')
|
||||
height = video_info.get('height')
|
||||
if isinstance(play_url, str):
|
||||
formats = [{
|
||||
width = int_or_none(video_info.get('width'))
|
||||
height = int_or_none(video_info.get('height'))
|
||||
|
||||
for play_url in traverse_obj(video_info, ('playAddr', ((..., 'src'), None), {url_or_none})):
|
||||
formats.append({
|
||||
'url': self._proto_relative_url(play_url),
|
||||
'ext': 'mp4',
|
||||
'width': width,
|
||||
'height': height,
|
||||
}]
|
||||
elif isinstance(play_url, list):
|
||||
formats = [{
|
||||
'url': self._proto_relative_url(url),
|
||||
'ext': 'mp4',
|
||||
'width': width,
|
||||
'height': height,
|
||||
} for url in traverse_obj(play_url, (..., 'src'), expected_type=url_or_none) if url]
|
||||
})
|
||||
|
||||
download_url = url_or_none(video_info.get('downloadAddr')) or traverse_obj(video_info, ('download', 'url'), expected_type=url_or_none)
|
||||
if download_url:
|
||||
for download_url in traverse_obj(video_info, (('downloadAddr', ('download', 'url')), {url_or_none})):
|
||||
formats.append({
|
||||
'format_id': 'download',
|
||||
'url': self._proto_relative_url(download_url),
|
||||
|
|
@ -382,38 +377,48 @@ class TikTokBaseIE(InfoExtractor):
|
|||
'width': width,
|
||||
'height': height,
|
||||
})
|
||||
|
||||
self._remove_duplicate_formats(formats)
|
||||
|
||||
thumbnails = []
|
||||
for thumbnail_name in ('thumbnail', 'cover', 'dynamicCover', 'originCover'):
|
||||
if aweme_detail.get(thumbnail_name):
|
||||
thumbnails = [{
|
||||
'url': self._proto_relative_url(aweme_detail[thumbnail_name]),
|
||||
for thumb_url in traverse_obj(aweme_detail, (
|
||||
(None, 'video'), ('thumbnail', 'cover', 'dynamicCover', 'originCover'), {url_or_none})):
|
||||
thumbnails.append({
|
||||
'url': self._proto_relative_url(thumb_url),
|
||||
'width': width,
|
||||
'height': height
|
||||
}]
|
||||
'height': height,
|
||||
})
|
||||
|
||||
return {
|
||||
'id': traverse_obj(aweme_detail, 'id', 'awemeId', expected_type=str_or_none),
|
||||
'title': aweme_detail.get('desc'),
|
||||
'duration': try_get(aweme_detail, lambda x: x['video']['duration'], int),
|
||||
'view_count': int_or_none(stats_info.get('playCount')),
|
||||
'like_count': int_or_none(stats_info.get('diggCount')),
|
||||
'repost_count': int_or_none(stats_info.get('shareCount')),
|
||||
'comment_count': int_or_none(stats_info.get('commentCount')),
|
||||
'timestamp': int_or_none(aweme_detail.get('createTime')),
|
||||
'creator': str_or_none(author_info.get('nickname')),
|
||||
'uploader': str_or_none(author_info.get('uniqueId') or aweme_detail.get('author')),
|
||||
'uploader_id': str_or_none(traverse_obj(author_info, 'id', 'uid', 'authorId')),
|
||||
'id': video_id,
|
||||
**traverse_obj(aweme_detail, {
|
||||
'title': ('desc', {str}),
|
||||
'description': ('desc', {str}),
|
||||
'duration': ('video', 'duration', {int_or_none}),
|
||||
'timestamp': ('createTime', {int_or_none}),
|
||||
}),
|
||||
**traverse_obj(author_info or aweme_detail, {
|
||||
'creator': ('nickname', {str}),
|
||||
'uploader': (('uniqueId', 'author'), {str}),
|
||||
'uploader_id': (('authorId', 'uid', 'id'), {str_or_none}),
|
||||
}, get_all=False),
|
||||
**traverse_obj(stats_info, {
|
||||
'view_count': 'playCount',
|
||||
'like_count': 'diggCount',
|
||||
'repost_count': 'shareCount',
|
||||
'comment_count': 'commentCount',
|
||||
}, expected_type=int_or_none),
|
||||
**traverse_obj(music_info, {
|
||||
'track': 'title',
|
||||
'album': ('album', {lambda x: x or None}),
|
||||
'artist': 'authorName',
|
||||
}, expected_type=str),
|
||||
'channel_id': channel_id,
|
||||
'uploader_url': user_url,
|
||||
'track': str_or_none(music_info.get('title')),
|
||||
'album': str_or_none(music_info.get('album')) or None,
|
||||
'artist': str_or_none(music_info.get('authorName')),
|
||||
'formats': formats,
|
||||
'thumbnails': thumbnails,
|
||||
'description': str_or_none(aweme_detail.get('desc')),
|
||||
'http_headers': {
|
||||
'Referer': webpage_url
|
||||
'Referer': webpage_url,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -447,7 +452,8 @@ class TikTokIE(TikTokBaseIE):
|
|||
'artist': 'Ysrbeats',
|
||||
'album': 'Lehanga',
|
||||
'track': 'Lehanga',
|
||||
}
|
||||
},
|
||||
'skip': '404 Not Found',
|
||||
}, {
|
||||
'url': 'https://www.tiktok.com/@patroxofficial/video/6742501081818877190?langCountry=en',
|
||||
'md5': '6f3cf8cdd9b28cb8363fe0a9a160695b',
|
||||
|
|
@ -462,6 +468,7 @@ class TikTokIE(TikTokBaseIE):
|
|||
'uploader': 'patrox',
|
||||
'uploader_id': '18702747',
|
||||
'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAiFnldaILebi5heDoVU6bn4jBWWycX6-9U3xuNPqZ8Ws',
|
||||
'channel_id': 'MS4wLjABAAAAiFnldaILebi5heDoVU6bn4jBWWycX6-9U3xuNPqZ8Ws',
|
||||
'creator': 'patroX',
|
||||
'thumbnail': r're:^https?://[\w\/\.\-]+(~[\w\-]+\.image)?',
|
||||
'upload_date': '20190930',
|
||||
|
|
@ -472,7 +479,7 @@ class TikTokIE(TikTokBaseIE):
|
|||
'comment_count': int,
|
||||
'artist': 'Evan Todd, Jessica Keenan Wynn, Alice Lee, Barrett Wilbert Weed & Jon Eidson',
|
||||
'track': 'Big Fun',
|
||||
}
|
||||
},
|
||||
}, {
|
||||
# Banned audio, only available on the app
|
||||
'url': 'https://www.tiktok.com/@barudakhb_/video/6984138651336838402',
|
||||
|
|
@ -485,6 +492,7 @@ class TikTokIE(TikTokBaseIE):
|
|||
'creator': 'md5:29f238c49bc0c176cb3cef1a9cea9fa6',
|
||||
'uploader_id': '6974687867511718913',
|
||||
'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAbhBwQC-R1iKoix6jDFsF-vBdfx2ABoDjaZrM9fX6arU3w71q3cOWgWuTXn1soZ7d',
|
||||
'channel_id': 'MS4wLjABAAAAbhBwQC-R1iKoix6jDFsF-vBdfx2ABoDjaZrM9fX6arU3w71q3cOWgWuTXn1soZ7d',
|
||||
'track': 'Boka Dance',
|
||||
'artist': 'md5:29f238c49bc0c176cb3cef1a9cea9fa6',
|
||||
'timestamp': 1626121503,
|
||||
|
|
@ -495,7 +503,7 @@ class TikTokIE(TikTokBaseIE):
|
|||
'like_count': int,
|
||||
'repost_count': int,
|
||||
'comment_count': int,
|
||||
}
|
||||
},
|
||||
}, {
|
||||
# Sponsored video, only available with feed workaround
|
||||
'url': 'https://www.tiktok.com/@MS4wLjABAAAATh8Vewkn0LYM7Fo03iec3qKdeCUOcBIouRk1mkiag6h3o_pQu_dUXvZ2EZlGST7_/video/7042692929109986561',
|
||||
|
|
@ -508,6 +516,7 @@ class TikTokIE(TikTokBaseIE):
|
|||
'creator': 'Slap And Run',
|
||||
'uploader_id': '7036055384943690754',
|
||||
'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAATh8Vewkn0LYM7Fo03iec3qKdeCUOcBIouRk1mkiag6h3o_pQu_dUXvZ2EZlGST7_',
|
||||
'channel_id': 'MS4wLjABAAAATh8Vewkn0LYM7Fo03iec3qKdeCUOcBIouRk1mkiag6h3o_pQu_dUXvZ2EZlGST7_',
|
||||
'track': 'Promoted Music',
|
||||
'timestamp': 1639754738,
|
||||
'duration': 30,
|
||||
|
|
@ -518,7 +527,6 @@ class TikTokIE(TikTokBaseIE):
|
|||
'repost_count': int,
|
||||
'comment_count': int,
|
||||
},
|
||||
'expected_warnings': ['trying with webpage', 'Unable to find video in feed']
|
||||
}, {
|
||||
# Video without title and description
|
||||
'url': 'https://www.tiktok.com/@pokemonlife22/video/7059698374567611694',
|
||||
|
|
@ -531,6 +539,7 @@ class TikTokIE(TikTokBaseIE):
|
|||
'creator': 'Pokemon',
|
||||
'uploader_id': '6820838815978423302',
|
||||
'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAA0tF1nBwQVVMyrGu3CqttkNgM68Do1OXUFuCY0CRQk8fEtSVDj89HqoqvbSTmUP2W',
|
||||
'channel_id': 'MS4wLjABAAAA0tF1nBwQVVMyrGu3CqttkNgM68Do1OXUFuCY0CRQk8fEtSVDj89HqoqvbSTmUP2W',
|
||||
'track': 'original sound',
|
||||
'timestamp': 1643714123,
|
||||
'duration': 6,
|
||||
|
|
@ -577,6 +586,7 @@ class TikTokIE(TikTokBaseIE):
|
|||
'uploader': '_le_cannibale_',
|
||||
'uploader_id': '6604511138619654149',
|
||||
'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAoShJqaw_5gvy48y3azFeFcT4jeyKWbB0VVYasOCt2tTLwjNFIaDcHAM4D-QGXFOP',
|
||||
'channel_id': 'MS4wLjABAAAAoShJqaw_5gvy48y3azFeFcT4jeyKWbB0VVYasOCt2tTLwjNFIaDcHAM4D-QGXFOP',
|
||||
'artist': 'nathan !',
|
||||
'track': 'grahamscott canon',
|
||||
'upload_date': '20220905',
|
||||
|
|
@ -587,6 +597,33 @@ class TikTokIE(TikTokBaseIE):
|
|||
'comment_count': int,
|
||||
'thumbnail': r're:^https://.+\.webp',
|
||||
},
|
||||
}, {
|
||||
# only available via web
|
||||
'url': 'https://www.tiktok.com/@moxypatch/video/7206382937372134662',
|
||||
'md5': '8d8c0be14127020cd9f5def4a2e6b411',
|
||||
'info_dict': {
|
||||
'id': '7206382937372134662',
|
||||
'ext': 'mp4',
|
||||
'title': 'md5:1d95c0b96560ca0e8a231af4172b2c0a',
|
||||
'description': 'md5:1d95c0b96560ca0e8a231af4172b2c0a',
|
||||
'creator': 'MoxyPatch',
|
||||
'uploader': 'moxypatch',
|
||||
'uploader_id': '7039142049363379205',
|
||||
'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAFhqKnngMHJSsifL0w1vFOP5kn3Ndo1ODp0XuIBkNMBCkALTvwILdpu12g3pTtL4V',
|
||||
'channel_id': 'MS4wLjABAAAAFhqKnngMHJSsifL0w1vFOP5kn3Ndo1ODp0XuIBkNMBCkALTvwILdpu12g3pTtL4V',
|
||||
'artist': 'your worst nightmare',
|
||||
'track': 'original sound',
|
||||
'upload_date': '20230303',
|
||||
'timestamp': 1677866781,
|
||||
'duration': 10,
|
||||
'view_count': int,
|
||||
'like_count': int,
|
||||
'repost_count': int,
|
||||
'comment_count': int,
|
||||
'thumbnail': r're:^https://.+',
|
||||
'thumbnails': 'count:3',
|
||||
},
|
||||
'expected_warnings': ['Unable to find video in feed'],
|
||||
}, {
|
||||
# Auto-captions available
|
||||
'url': 'https://www.tiktok.com/@hankgreen1/video/7047596209028074758',
|
||||
|
|
@ -612,7 +649,7 @@ class TikTokIE(TikTokBaseIE):
|
|||
video_data = traverse_obj(sigi_data, ('ItemModule', video_id), expected_type=dict)
|
||||
|
||||
if status == 0:
|
||||
return self._parse_aweme_video_web(video_data, url)
|
||||
return self._parse_aweme_video_web(video_data, url, video_id)
|
||||
elif status == 10216:
|
||||
raise ExtractorError('This video is private', expected=True)
|
||||
raise ExtractorError('Video not available', video_id=video_id)
|
||||
|
|
@ -839,6 +876,7 @@ class DouyinIE(TikTokBaseIE):
|
|||
'description': '#杨超越 小小水手带你去远航❤️',
|
||||
'uploader_id': '110403406559',
|
||||
'uploader_url': 'https://www.douyin.com/user/MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
|
||||
'channel_id': 'MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
|
||||
'creator': '杨超越',
|
||||
'duration': 19782,
|
||||
'timestamp': 1620905839,
|
||||
|
|
@ -848,6 +886,7 @@ class DouyinIE(TikTokBaseIE):
|
|||
'like_count': int,
|
||||
'repost_count': int,
|
||||
'comment_count': int,
|
||||
'thumbnail': r're:https?://.+\.jpe?g',
|
||||
},
|
||||
}, {
|
||||
'url': 'https://www.douyin.com/video/6982497745948921092',
|
||||
|
|
@ -859,8 +898,9 @@ class DouyinIE(TikTokBaseIE):
|
|||
'description': '这个夏日和小羊@杨超越 一起遇见白色幻想',
|
||||
'uploader_id': '408654318141572',
|
||||
'uploader_url': 'https://www.douyin.com/user/MS4wLjABAAAAZJpnglcjW2f_CMVcnqA_6oVBXKWMpH0F8LIHuUu8-lA',
|
||||
'channel_id': 'MS4wLjABAAAAZJpnglcjW2f_CMVcnqA_6oVBXKWMpH0F8LIHuUu8-lA',
|
||||
'creator': '杨超越工作室',
|
||||
'duration': 42608,
|
||||
'duration': 42479,
|
||||
'timestamp': 1625739481,
|
||||
'upload_date': '20210708',
|
||||
'track': '@杨超越工作室创作的原声',
|
||||
|
|
@ -868,6 +908,7 @@ class DouyinIE(TikTokBaseIE):
|
|||
'like_count': int,
|
||||
'repost_count': int,
|
||||
'comment_count': int,
|
||||
'thumbnail': r're:https?://.+\.jpe?g',
|
||||
},
|
||||
}, {
|
||||
'url': 'https://www.douyin.com/video/6953975910773099811',
|
||||
|
|
@ -879,8 +920,9 @@ class DouyinIE(TikTokBaseIE):
|
|||
'description': '#一起看海 出现在你的夏日里',
|
||||
'uploader_id': '110403406559',
|
||||
'uploader_url': 'https://www.douyin.com/user/MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
|
||||
'channel_id': 'MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
|
||||
'creator': '杨超越',
|
||||
'duration': 17228,
|
||||
'duration': 17343,
|
||||
'timestamp': 1619098692,
|
||||
'upload_date': '20210422',
|
||||
'track': '@杨超越创作的原声',
|
||||
|
|
@ -888,6 +930,7 @@ class DouyinIE(TikTokBaseIE):
|
|||
'like_count': int,
|
||||
'repost_count': int,
|
||||
'comment_count': int,
|
||||
'thumbnail': r're:https?://.+\.jpe?g',
|
||||
},
|
||||
}, {
|
||||
'url': 'https://www.douyin.com/video/6950251282489675042',
|
||||
|
|
@ -916,6 +959,7 @@ class DouyinIE(TikTokBaseIE):
|
|||
'description': '#哪个爱豆的105度最甜 换个角度看看我哈哈',
|
||||
'uploader_id': '110403406559',
|
||||
'uploader_url': 'https://www.douyin.com/user/MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
|
||||
'channel_id': 'MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
|
||||
'creator': '杨超越',
|
||||
'duration': 15115,
|
||||
'timestamp': 1621261163,
|
||||
|
|
@ -925,6 +969,7 @@ class DouyinIE(TikTokBaseIE):
|
|||
'like_count': int,
|
||||
'repost_count': int,
|
||||
'comment_count': int,
|
||||
'thumbnail': r're:https?://.+\.jpe?g',
|
||||
},
|
||||
}]
|
||||
_APP_VERSIONS = [('23.3.0', '230300')]
|
||||
|
|
@ -956,7 +1001,7 @@ class DouyinIE(TikTokBaseIE):
|
|||
|
||||
render_data = self._parse_json(
|
||||
render_data_json, video_id, transform_source=compat_urllib_parse_unquote)
|
||||
return self._parse_aweme_video_web(get_first(render_data, ('aweme', 'detail')), url)
|
||||
return self._parse_aweme_video_web(get_first(render_data, ('aweme', 'detail')), url, video_id)
|
||||
|
||||
|
||||
class TikTokVMIE(InfoExtractor):
|
||||
|
|
|
|||
Loading…
Reference in New Issue