mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-25 17:15:52 +01:00
[sportdeutschland] Add support for more plain videos
This commit is contained in:
parent
29a7e1f261
commit
3524cc25ca
@ -664,6 +664,9 @@ class InfoExtractor(object):
|
|||||||
elif line.startswith('#') or not line.strip():
|
elif line.startswith('#') or not line.strip():
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
|
if last_info is none:
|
||||||
|
formats.append({'url': line})
|
||||||
|
continue
|
||||||
tbr = int_or_none(last_info.get('BANDWIDTH'), scale=1000)
|
tbr = int_or_none(last_info.get('BANDWIDTH'), scale=1000)
|
||||||
|
|
||||||
f = {
|
f = {
|
||||||
|
@ -12,7 +12,7 @@ from ..utils import (
|
|||||||
|
|
||||||
class SportDeutschlandIE(InfoExtractor):
|
class SportDeutschlandIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://sportdeutschland\.tv/(?P<sport>[^/?#]+)/(?P<id>[^?#/]+)(?:$|[?#])'
|
_VALID_URL = r'https?://sportdeutschland\.tv/(?P<sport>[^/?#]+)/(?P<id>[^?#/]+)(?:$|[?#])'
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
'url': 'http://sportdeutschland.tv/badminton/live-li-ning-badminton-weltmeisterschaft-2014-kopenhagen',
|
'url': 'http://sportdeutschland.tv/badminton/live-li-ning-badminton-weltmeisterschaft-2014-kopenhagen',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'live-li-ning-badminton-weltmeisterschaft-2014-kopenhagen',
|
'id': 'live-li-ning-badminton-weltmeisterschaft-2014-kopenhagen',
|
||||||
@ -20,15 +20,28 @@ class SportDeutschlandIE(InfoExtractor):
|
|||||||
'title': 'LIVE: Li-Ning Badminton Weltmeisterschaft 2014 Kopenhagen',
|
'title': 'LIVE: Li-Ning Badminton Weltmeisterschaft 2014 Kopenhagen',
|
||||||
'categories': ['Badminton'],
|
'categories': ['Badminton'],
|
||||||
'view_count': int,
|
'view_count': int,
|
||||||
'thumbnail': 're:^https?://.*\.jpg',
|
'thumbnail': 're:^https?://.*\.jpg$',
|
||||||
'description': 're:^Die Badminton-WM 2014 aus Kopenhagen LIVE',
|
'description': 're:^Die Badminton-WM 2014 aus Kopenhagen LIVE',
|
||||||
'timestamp': 1409043600,
|
'timestamp': int,
|
||||||
'upload_date': '20140826',
|
'upload_date': 're:^201408[23][0-9]$',
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': 'Live stream',
|
'skip_download': 'Live stream',
|
||||||
},
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'http://sportdeutschland.tv/li-ning-badminton-wm-2014/lee-li-ning-badminton-weltmeisterschaft-2014-kopenhagen-herren-einzel-wei-vs',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'lee-li-ning-badminton-weltmeisterschaft-2014-kopenhagen-herren-einzel-wei-vs',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'upload_date': '20140825',
|
||||||
|
'description': 'md5:60a20536b57cee7d9a4ec005e8687504',
|
||||||
|
'timestamp': 1408976060,
|
||||||
|
'title': 'Li-Ning Badminton Weltmeisterschaft 2014 Kopenhagen: Herren Einzel, Wei Lee vs. Keun Lee',
|
||||||
|
'thumbnail': 're:^https?://.*\.jpg$',
|
||||||
|
'view_count': int,
|
||||||
|
'categories': ['Li-Ning Badminton WM 2014'],
|
||||||
}
|
}
|
||||||
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
@ -46,9 +59,12 @@ class SportDeutschlandIE(InfoExtractor):
|
|||||||
categories = list(data.get('section', {}).get('tags', {}).values())
|
categories = list(data.get('section', {}).get('tags', {}).values())
|
||||||
asset = data['asset']
|
asset = data['asset']
|
||||||
|
|
||||||
|
formats = []
|
||||||
smil_url = asset['video']
|
smil_url = asset['video']
|
||||||
|
if '.smil' in smil_url:
|
||||||
m3u8_url = smil_url.replace('.smil', '.m3u8')
|
m3u8_url = smil_url.replace('.smil', '.m3u8')
|
||||||
formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4')
|
formats.extend(
|
||||||
|
self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4'))
|
||||||
|
|
||||||
smil_doc = self._download_xml(
|
smil_doc = self._download_xml(
|
||||||
smil_url, video_id, note='Downloading SMIL metadata')
|
smil_url, video_id, note='Downloading SMIL metadata')
|
||||||
@ -61,6 +77,9 @@ class SportDeutschlandIE(InfoExtractor):
|
|||||||
'preference': -100,
|
'preference': -100,
|
||||||
'format_note': 'Seems to fail at example stream',
|
'format_note': 'Seems to fail at example stream',
|
||||||
} for n in smil_doc.findall('./body/video')])
|
} for n in smil_doc.findall('./body/video')])
|
||||||
|
else:
|
||||||
|
formats.append({'url': smil_url})
|
||||||
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -71,7 +90,7 @@ class SportDeutschlandIE(InfoExtractor):
|
|||||||
'description': asset.get('teaser'),
|
'description': asset.get('teaser'),
|
||||||
'categories': categories,
|
'categories': categories,
|
||||||
'view_count': asset.get('views'),
|
'view_count': asset.get('views'),
|
||||||
'rtmp_live': asset['live'],
|
'rtmp_live': asset.get('live'),
|
||||||
'timestamp': parse_iso8601(asset.get('date')),
|
'timestamp': parse_iso8601(asset.get('date')),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user