R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[tiktok] Ensure optional fields aren't fatal

Browse Source
This commit is contained in:
Ken Swenson 2018-11-10 06:56:24 -05:00
parent b402f3de82
commit 5a79ced2a9
No known key found for this signature in database
GPG Key ID: DA332609CBCB7A9C
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/tiktok.py
View File

@ -26,16 +26,21 @@ class TikTokIE(InfoExtractor):
json_string = self._search_regex(r'var data = ({.*});', webpage, 'json_string') json_string = self._search_regex(r'var data = ({.*});', webpage, 'json_string')
json_data = self._parse_json(json_string, video_id) json_data = self._parse_json(json_string, video_id)
title = self._og_search_title(webpage) title = self._og_search_title(webpage)
description = self._og_search_description(webpage)
video_url = json_data.get("video").get("play_addr").get("url_list")[0] video_url = json_data.get("video").get("play_addr").get("url_list")[0]
uploader = json_data.get("author").get("nickname") uploader = json_data.get("author").get("nickname")
thumbnail = json_data.get("video").get("cover").get("url_list")[0] thumbnail_list = json_data.get("video").get("cover").get("url_list")
thumbnail = thumbnail_list[0] if len(thumbnail_list) > 0 else None
handle = self._download_webpage_handle(video_url, video_id, fatal=False)
URLHandle = handle[1] if handle is not False else None
ext = urlhandle_detect_ext(URLHandle)
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'description': self._og_search_description(webpage), 'description': description,
'uploader': uploader, 'uploader': uploader,
'url': video_url, 'url': video_url,
'ext': urlhandle_detect_ext(self._download_webpage_handle(video_url, video_id)[1]), 'ext': ext,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
} }