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

[tiktok] Requested changes and all formats

Browse Source
This commit is contained in:
Ken Swenson 2018-11-10 14:43:24 -05:00
parent efe6088803
commit 48113833c8
No known key found for this signature in database
GPG Key ID: DA332609CBCB7A9C
1 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
youtube_dl/extractor/tiktok.py
View File

@ -3,11 +3,12 @@ from __future__ import unicode_literals
from .common import InfoExtractor
from ..utils import (
urlhandle_detect_ext,
try_get,
compat_str,
determine_ext,
int_or_none,
try_get,
url_or_none,
str_or_none,
urlhandle_detect_ext
)
@ -15,7 +16,7 @@ class TikTokIE(InfoExtractor):
_VALID_URL = r'https?://(?:m\.)?tiktok\.com/v/(?P<id>[0-9]+)'
_TEST = {
'url': 'https://m.tiktok.com/v/6606727368545406213.html',
'md5': '163ceff303bb52de60e6887fe399e6cd',
'md5': 'd584b572e92fcd48888051f238022420',
'info_dict': {
'id': '6606727368545406213',
'ext': 'mp4',
@ -23,6 +24,8 @@ class TikTokIE(InfoExtractor):
'thumbnail': 'http://m-p16.akamaized.net/img/tos-maliva-p-0068/5e7a4ec40fb146888fa27aa8d78f86fd~noop.image',
'description': 'Zureeal has just created an awesome short video with ♬ original sound - joogieboy1596',
'uploader': 'Zureeal',
'width': 540,
'height': 960,
}
}
@ -32,14 +35,66 @@ class TikTokIE(InfoExtractor):
data = self._parse_json(
self._search_regex(
r'var data = ({.*});', webpage, 'json_string', webpage, 'data'
r'var data = ({.+?});', webpage, 'json_string', webpage, 'data'
), video_id)
title = self._og_search_title(webpage)
description = self._og_search_description(webpage)
video_url = url_or_none(
try_get(data, lambda x: x['video']['play_addr']['url_list'][0], compat_str))
width = int_or_none(try_get(data, lambda x: x['video']['width'], int))
height = int_or_none(try_get(data, lambda x: x['video']['height'], int))
formats = []
for url in data['video']['play_addr']['url_list']:
ext = determine_ext(url)
if ext == 'unknown_video':
urlh = self._request_webpage(
url, video_id, note='Determining extension'
)
ext = urlhandle_detect_ext(urlh)
formats.append({
'url': url,
'ext': ext,
'height': height,
'width': width,
'quality': -2,
'format_note': "Normal quality",
})
for url in data['video']['download_addr']['url_list']:
ext = determine_ext(url)
if ext == 'unknown_video':
urlh = self._request_webpage(
url, video_id, note='Determining extension'
)
ext = urlhandle_detect_ext(urlh)
formats.append({
'url': url,
'ext': ext,
'height': height,
'width': width,
'quality': 1,
'format_note': "Download quality",
})
for url in data['video']['play_addr_lowbr']['url_list']:
ext = determine_ext(url)
if ext == 'unknown_video':
urlh = self._request_webpage(
url, video_id, note='Determining extension'
)
ext = urlhandle_detect_ext(urlh)
formats.append({
'url': url,
'ext': ext,
'height': height,
'width': width,
'quality': -3,
'format_note': "Low bitrate",
})
self._sort_formats(formats)
uploader = try_get(data, lambda x: x['author']['nickname'], compat_str)
@ -47,16 +102,13 @@ class TikTokIE(InfoExtractor):
try_get(
data, lambda x: x['video']['cover']['url_list'][0], compat_str))
ext = str_or_none(
urlhandle_detect_ext(
self._request_webpage(video_url, video_id, fatal=False)))
return {
'id': video_id,
'title': title,
'description': description,
'uploader': uploader,
'url': video_url,
'ext': ext,
'formats': formats,
'thumbnail': thumbnail,
'width': width,
'height': height,
}