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

[TikTok] Fix extraction for sigi-based webpages (#2164)

Browse Source 
Fixes: #2133
Authored by: MinePlayersPE
This commit is contained in:
MinePlayersPE 2021-12-30 11:20:17 +07:00 committed by GitHub
parent abbeeebc4c
commit 11aa91a12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
yt_dlp/extractor/tiktok.py
View File

@ -220,12 +220,13 @@ def extract_addr(addr, add_meta={}):
def _parse_aweme_video_web(self, aweme_detail, webpage_url): def _parse_aweme_video_web(self, aweme_detail, webpage_url):
video_info = aweme_detail['video'] video_info = aweme_detail['video']
author_info = traverse_obj(aweme_detail, 'author', 'authorInfo', default={}) author_info = traverse_obj(aweme_detail, 'authorInfo', 'author', expected_type=dict, default={})
music_info = aweme_detail.get('music') or {} music_info = aweme_detail.get('music') or {}
stats_info = aweme_detail.get('stats') or {} stats_info = aweme_detail.get('stats') or {}
user_url = self._UPLOADER_URL_FORMAT % (traverse_obj(author_info, user_url = self._UPLOADER_URL_FORMAT % (traverse_obj(author_info,
'secUid', 'id', 'uid', 'uniqueId', 'secUid', 'id', 'uid', 'uniqueId',
expected_type=str_or_none, get_all=False)) expected_type=str_or_none, get_all=False)
or aweme_detail.get('authorSecId'))
formats = [] formats = []
play_url = video_info.get('playAddr') play_url = video_info.get('playAddr')
@ -277,8 +278,8 @@ def _parse_aweme_video_web(self, aweme_detail, webpage_url):
'comment_count': int_or_none(stats_info.get('commentCount')), 'comment_count': int_or_none(stats_info.get('commentCount')),
'timestamp': int_or_none(aweme_detail.get('createTime')), 'timestamp': int_or_none(aweme_detail.get('createTime')),
'creator': str_or_none(author_info.get('nickname')), 'creator': str_or_none(author_info.get('nickname')),
'uploader': str_or_none(author_info.get('uniqueId')), 'uploader': str_or_none(author_info.get('uniqueId') or aweme_detail.get('author')),
'uploader_id': str_or_none(author_info.get('id')), 'uploader_id': str_or_none(author_info.get('id') or aweme_detail.get('authorId')),
'uploader_url': user_url, 'uploader_url': user_url,
'track': str_or_none(music_info.get('title')), 'track': str_or_none(music_info.get('title')),
'album': str_or_none(music_info.get('album')) or None, 'album': str_or_none(music_info.get('album')) or None,
@ -415,19 +416,26 @@ def _real_extract(self, url):
# If we only call once, we get a 403 when downlaoding the video. # If we only call once, we get a 403 when downlaoding the video.
self._download_webpage(url, video_id) self._download_webpage(url, video_id)
webpage = self._download_webpage(url, video_id, note='Downloading video webpage') webpage = self._download_webpage(url, video_id, note='Downloading video webpage')
json_string = self._search_regex( next_json = self._search_regex(
r'id=\"__NEXT_DATA__\"\s+type=\"application\/json\"\s*[^>]+>\s*(?P<json_string_ld>[^<]+)', r'id=\"__NEXT_DATA__\"\s+type=\"application\/json\"\s*[^>]+>\s*(?P<next_data>[^<]+)',
webpage, 'json_string', group='json_string_ld') webpage, 'next data', group='next_data', default=None)
json_data = self._parse_json(json_string, video_id)
props_data = try_get(json_data, lambda x: x['props'], expected_type=dict) if next_json:
next_data = self._parse_json(next_json, video_id)
status = traverse_obj(next_data, ('props', 'pageProps', 'statusCode'), expected_type=int) or 0
video_data = traverse_obj(next_data, ('props', 'pageProps', 'itemInfo', 'itemStruct'), expected_type=dict)
else:
sigi_json = self._search_regex(
r'>\s*window\[[\'"]SIGI_STATE[\'"]\]\s*=\s*(?P<sigi_state>{.+});',
webpage, 'sigi data', group='sigi_state')
sigi_data = self._parse_json(sigi_json, video_id)
status = traverse_obj(sigi_data, ('VideoPage', 'statusCode'), expected_type=int) or 0
video_data = traverse_obj(sigi_data, ('ItemModule', video_id), expected_type=dict)
# Chech statusCode for success
status = props_data.get('pageProps').get('statusCode')
if status == 0: if status == 0:
return self._parse_aweme_video_web(props_data['pageProps']['itemInfo']['itemStruct'], url) return self._parse_aweme_video_web(video_data, url)
elif status == 10216: elif status == 10216:
raise ExtractorError('This video is private', expected=True) raise ExtractorError('This video is private', expected=True)
raise ExtractorError('Video not available', video_id=video_id) raise ExtractorError('Video not available', video_id=video_id)