From 5a79ced2a9136675b353172f247996697dd06346 Mon Sep 17 00:00:00 2001 From: Ken Swenson Date: Sat, 10 Nov 2018 06:56:24 -0500 Subject: [PATCH] [tiktok] Ensure optional fields aren't fatal --- youtube_dl/extractor/tiktok.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/tiktok.py b/youtube_dl/extractor/tiktok.py index 39ab561fa..082ee908a 100644 --- a/youtube_dl/extractor/tiktok.py +++ b/youtube_dl/extractor/tiktok.py @@ -26,16 +26,21 @@ class TikTokIE(InfoExtractor): json_string = self._search_regex(r'var data = ({.*});', webpage, 'json_string') json_data = self._parse_json(json_string, video_id) 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] 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 { 'id': video_id, 'title': title, - 'description': self._og_search_description(webpage), + 'description': description, 'uploader': uploader, 'url': video_url, - 'ext': urlhandle_detect_ext(self._download_webpage_handle(video_url, video_id)[1]), + 'ext': ext, 'thumbnail': thumbnail, }