[DrTuber] Applied third requested fixes for PR #13322

This commit is contained in:
Parmjit Virk 2017-06-15 16:41:09 -05:00
parent b625efd87e
commit 5c71d4a436

View File

@ -6,7 +6,6 @@ from .common import InfoExtractor
from ..utils import ( from ..utils import (
NO_DEFAULT, NO_DEFAULT,
str_to_int, str_to_int,
ExtractorError,
) )
@ -50,20 +49,16 @@ class DrTuberIE(InfoExtractor):
'embed': 0, 'embed': 0,
'aid': 0, 'aid': 0,
'domain_id': 0, 'domain_id': 0,
}, fatal=False) }, fatal=True)
formats = [] formats = []
if video_data: for video_url_key in video_data.get('files', {}):
for video_url_key in video_data.get('files', {}): if video_data['files'][video_url_key]:
# high-quality video format is preferred, if available formats.append({
if video_data['files'][video_url_key]: 'format_id': video_url_key.upper(),
formats.append({ 'quality': 2 if video_url_key == 'hq' else 1,
'format_id': video_url_key.upper(), 'url': video_data['files'][video_url_key]
'quality': 2 if video_url_key == 'hq' else 1, })
'url': video_data['files'][video_url_key]
})
if not formats:
raise ExtractorError('Video %s is not available' % video_id, expected=True)
self._check_formats(formats, video_id) self._check_formats(formats, video_id)
self._sort_formats(formats) self._sort_formats(formats)