From d9de9d55954dbca43ec69ebc8df4729f37c05d9d Mon Sep 17 00:00:00 2001 From: bhodaya Date: Tue, 5 May 2020 14:16:48 +0300 Subject: [PATCH 1/3] download video --- test/ci/test_tiktok.py | 4 ++-- youtube_dl/extractor/tiktok.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ci/test_tiktok.py b/test/ci/test_tiktok.py index 3f248ac56..cda730059 100644 --- a/test/ci/test_tiktok.py +++ b/test/ci/test_tiktok.py @@ -11,7 +11,7 @@ class TikTokTestYoutubeDl(unittest.TestCase): ydl = youtube_dl.YoutubeDL(params) info = ydl.extract_info(url, download=False) self.assertEquals(info['id'], '6807126376001441030') - self.assertEquals(info['url'], 'https://www.tiktok.com/@oriangaon/video/6807126376001441030') + self.assertEquals(info['webpage_url'], 'https://www.tiktok.com/@oriangaon/video/6807126376001441030') self.assertEquals(info['title'], '#foryou #foyou Mmmmm....,,') self.assertEquals(info['uploader'], 'Oriangaon') self.assertEquals(info['timestamp'], 1584907616) @@ -25,7 +25,7 @@ class TikTokTestYoutubeDl(unittest.TestCase): self.assertGreaterEqual(info['share_count'], 109) self.assertGreaterEqual(info['comment_count'], 40) self.assertEquals(info['duration'], 10) - self.assertEquals(info['ext'], 'mp.4') + self.assertEquals(info['ext'], 'mp4') self.assertGreater(len(info['embed_code']),0) def test_download_video(self): diff --git a/youtube_dl/extractor/tiktok.py b/youtube_dl/extractor/tiktok.py index 023b40ab6..4c4377504 100644 --- a/youtube_dl/extractor/tiktok.py +++ b/youtube_dl/extractor/tiktok.py @@ -109,9 +109,9 @@ class TikTokIE(TikTokBaseIE): 'subtitles': subtitles, 'comment_count': comment_count, 'duration': duration, - 'ext':'mp.4', + 'ext':'mp4', 'embed_code': embed_code, - 'format': format + 'formats': format } return info_dict From e3f32c957b09112e1f8818a78d5296990d041572 Mon Sep 17 00:00:00 2001 From: bhodaya Date: Wed, 6 May 2020 12:32:25 +0300 Subject: [PATCH 2/3] download video ext fix --- youtube_dl/extractor/tiktok.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/youtube_dl/extractor/tiktok.py b/youtube_dl/extractor/tiktok.py index 4c4377504..f18526ab8 100644 --- a/youtube_dl/extractor/tiktok.py +++ b/youtube_dl/extractor/tiktok.py @@ -21,8 +21,8 @@ class TikTokBaseIE(InfoExtractor): for format in format_urls: formats.append({ 'url': format, - 'ext': 'mp4', 'height': height, + 'ext': 'mp4', 'width': width, }) self._sort_formats(formats) @@ -109,7 +109,6 @@ class TikTokIE(TikTokBaseIE): 'subtitles': subtitles, 'comment_count': comment_count, 'duration': duration, - 'ext':'mp4', 'embed_code': embed_code, 'formats': format } From 9b21d732f1226bf3e00a9e686f6f6a920364ff9b Mon Sep 17 00:00:00 2001 From: bhodaya Date: Wed, 6 May 2020 12:59:15 +0300 Subject: [PATCH 3/3] download video ext fix --- test/ci/test_tiktok.py | 2 +- youtube_dl/extractor/tiktok.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ci/test_tiktok.py b/test/ci/test_tiktok.py index cda730059..7fd7f8f93 100644 --- a/test/ci/test_tiktok.py +++ b/test/ci/test_tiktok.py @@ -33,7 +33,7 @@ class TikTokTestYoutubeDl(unittest.TestCase): params = {} ydl = youtube_dl.YoutubeDL(params) info = ydl.extract_info(url, download=True) - file_name="Imagine lebron freaking out over something you did! #foryou #ballislife #lebron #nba-6783617809113943301.mp.4" + file_name="Imagine lebron freaking out over something you did! #foryou #ballislife #lebron #nba-6783617809113943301.mp4" self.assertTrue(os.path.exists(file_name)) os.remove(file_name) diff --git a/youtube_dl/extractor/tiktok.py b/youtube_dl/extractor/tiktok.py index f18526ab8..0dbf230ac 100644 --- a/youtube_dl/extractor/tiktok.py +++ b/youtube_dl/extractor/tiktok.py @@ -22,8 +22,8 @@ class TikTokBaseIE(InfoExtractor): formats.append({ 'url': format, 'height': height, - 'ext': 'mp4', 'width': width, + 'ext': 'mp4', }) self._sort_formats(formats) return {