Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-09 14:25:39 +08:00
Code Issues Releases Wiki Activity

[ccma] fetch height from label, ensuring extraction with missing data.

Browse Source
This commit is contained in:
Andres 2018-03-26 20:12:12 +02:00
parent a648175e74
commit dfaae7e7eb
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
youtube_dl/extractor/ccma.py
View File

@ -3,6 +3,7 @@ from __future__ import unicode_literals
import re import re
from ..compat import compat_str
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
@ -52,20 +53,28 @@ class CCMAIE(InfoExtractor):
if md: if md:
media_data = md media_data = md
media_url = media_data.get('media', {}).get('url') media_url = media_data.get('media', {}).get('url')
ext = media_data.get('media', {}).get('format')
if ext:
ext = ext.lower()
if media_url and isinstance(media_url, list): if media_url and isinstance(media_url, list):
q = 0
for _url in media_url: for _url in media_url:
if 'label' in _url:
height = int_or_none(_url.get('label').replace('p', ''))
else:
height = None
formats.append({ formats.append({
'format_id': profile, 'format_id': profile,
'url': _url['file'], 'url': _url.get('file'),
'quality': q, 'height': height,
'ext': ext
}) })
q += 1 elif media_url and isinstance(media_url, compat_str):
elif media_url and isinstance(media_url, str):
formats.append({ formats.append({
'format_id': profile, 'format_id': profile,
'url': media_url, 'url': media_url,
'quality': 0, 'ext': ext
}) })
self._sort_formats(formats) self._sort_formats(formats)
@ -83,8 +92,8 @@ class CCMAIE(InfoExtractor):
if sub_url: if sub_url:
subtitles.setdefault( subtitles.setdefault(
subtitols.get('iso') or subtitols.get('text') or 'ca', []).append({ subtitols.get('iso') or subtitols.get('text') or 'ca', []).append({
'url': sub_url, 'url': sub_url,
}) })
thumbnails = [] thumbnails = []
imatges = media_data.get('imatges', {}) imatges = media_data.get('imatges', {})