v/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2020-11-18 19:53:54 -08:00
Code Issues Releases Wiki Activity

Update regex, use regex for thumbnail, use enumerate for quality

Browse Source
This commit is contained in:
Ken Swenson 2018-12-01 12:33:30 -05:00
parent 1673afd9f2
commit 916e0c422d
No known key found for this signature in database
GPG Key ID: DA332609CBCB7A9C
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/tiktok.py
View File

@ -15,11 +15,12 @@ class TikTokIE(InfoExtractor):
_VALID_URL = r'https?://(?:m\.)?tiktok\.com/v/(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:m\.)?tiktok\.com/v/(?P<id>[0-9]+)'
_TEST = { _TEST = {
'url': 'https://m.tiktok.com/v/6606727368545406213.html', 'url': 'https://m.tiktok.com/v/6606727368545406213.html',
'md5': 'd584b572e92fcd48888051f238022420',
'info_dict': { 'info_dict': {
'id': '6606727368545406213', 'id': '6606727368545406213',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Zureeal on TikTok', 'title': 'Zureeal on TikTok',
'thumbnail': 'http://m-p16.akamaized.net/img/tos-maliva-p-0068/5e7a4ec40fb146888fa27aa8d78f86fd~noop.image', 'thumbnail': r're:^https?://.*~noop.image',
'description': '#bowsette#mario#cosplay#uk#lgbt#gaming#asian#bowsettecosplay', 'description': '#bowsette#mario#cosplay#uk#lgbt#gaming#asian#bowsettecosplay',
'uploader': 'Zureeal', 'uploader': 'Zureeal',
'width': 540, 'width': 540,
@ -33,7 +34,7 @@ class TikTokIE(InfoExtractor):
data = self._parse_json( data = self._parse_json(
self._search_regex( self._search_regex(
r'var\s*data\s*=\s*({.+?});', webpage, 'data' r'var\s+data\s*=\s*({.+?});', webpage, 'data'
), video_id) ), video_id)
title = self._og_search_title(webpage) title = self._og_search_title(webpage)
@ -44,18 +45,18 @@ class TikTokIE(InfoExtractor):
formats = [] formats = []
for key, label in (('play_addr_lowbr', 'Low'), ('play_addr', 'Normal'), ('download_addr', 'Download')): for count, (key, label) in enumerate((('play_addr_lowbr', 'Low'), ('play_addr', 'Normal'), ('download_addr', 'Download')), -2):
for format in try_get(data, lambda x: x['video'][key]['url_list']): for format in try_get(data, lambda x: x['video'][key]['url_list']):
format_url = url_or_none(format) format_url = url_or_none(format)
if not format_url: if not format_url:
continue continue
formats.append({ formats.append({
'url': url, 'url': format_url,
'ext': 'mp4', 'ext': 'mp4',
'height': height, 'height': height,
'width': width, 'width': width,
'format_note': label, 'format_note': label,
'quality': -2 if label == 'Low' else (1 if label == 'Download' else 0) 'quality': count
}) })
self._sort_formats(formats) self._sort_formats(formats)