1
0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-23 08:26:50 +00:00

[drtuber] Fix formats extraction (fixes 12058)

This commit is contained in:
Parmjit Virk 2017-06-22 12:08:36 -05:00 committed by Sergey M
parent 18166bb8e8
commit 0f4a5a73e7

View File

@ -44,8 +44,23 @@ class DrTuberIE(InfoExtractor):
webpage = self._download_webpage( webpage = self._download_webpage(
'http://www.drtuber.com/video/%s' % video_id, display_id) 'http://www.drtuber.com/video/%s' % video_id, display_id)
video_url = self._html_search_regex( video_data = self._download_json(
r'<source src="([^"]+)"', webpage, 'video URL') 'http://www.drtuber.com/player_config_json/', video_id, query={
'vid': video_id,
'embed': 0,
'aid': 0,
'domain_id': 0,
})
formats = []
for format_id, video_url in video_data['files'].items():
if video_url:
formats.append({
'format_id': format_id,
'quality': 2 if format_id == 'hq' else 1,
'url': video_url
})
self._sort_formats(formats)
title = self._html_search_regex( title = self._html_search_regex(
(r'class="title_watch"[^>]*><(?:p|h\d+)[^>]*>([^<]+)<', (r'class="title_watch"[^>]*><(?:p|h\d+)[^>]*>([^<]+)<',
@ -75,7 +90,7 @@ class DrTuberIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'display_id': display_id, 'display_id': display_id,
'url': video_url, 'formats': formats,
'title': title, 'title': title,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'like_count': like_count, 'like_count': like_count,