[ruutu] Fix extraction (Closes #8107)

This commit is contained in:
Sergey M․ 2016-01-02 07:44:30 +06:00
parent 392f04d586
commit 76a353c9e5

View File

@ -75,9 +75,12 @@ def extract_formats(node):
preference = -1 if proto == 'rtmp' else 1 preference = -1 if proto == 'rtmp' else 1
label = child.get('label') label = child.get('label')
tbr = int_or_none(child.get('bitrate')) tbr = int_or_none(child.get('bitrate'))
format_id = '%s-%s' % (proto, label if label else tbr) if label or tbr else proto
if not self._is_valid_url(video_url, video_id, format_id):
continue
width, height = [int_or_none(x) for x in child.get('resolution', 'x').split('x')[:2]] width, height = [int_or_none(x) for x in child.get('resolution', 'x').split('x')[:2]]
formats.append({ formats.append({
'format_id': '%s-%s' % (proto, label if label else tbr), 'format_id': format_id,
'url': video_url, 'url': video_url,
'width': width, 'width': width,
'height': height, 'height': height,