DuckDuckWhale/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-16 22:46:45 +00:00
Code Issues Releases Wiki Activity

[canalc2] Add support for HTML5 videos (closes #15916, closes #15919)

Browse Source
This commit is contained in:
Sergey M․ 2018-03-19 23:40:19 +07:00
parent 9a054fcbba
commit 38f59e2793
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
youtube_dl/extractor/canalc2.py
View File

@ -31,6 +31,10 @@ class Canalc2IE(InfoExtractor):
webpage = self._download_webpage( webpage = self._download_webpage(
'http://www.canalc2.tv/video/%s' % video_id, video_id) 'http://www.canalc2.tv/video/%s' % video_id, video_id)
title = self._html_search_regex(
r'(?s)class="[^"]*col_description[^"]*">.*?<h3>(.+?)</h3>',
webpage, 'title')
formats = [] formats = []
for _, video_url in re.findall(r'file\s*=\s*(["\'])(.+?)\1', webpage): for _, video_url in re.findall(r'file\s*=\s*(["\'])(.+?)\1', webpage):
if video_url.startswith('rtmp://'): if video_url.startswith('rtmp://'):
@ -49,17 +53,21 @@ class Canalc2IE(InfoExtractor):
'url': video_url, 'url': video_url,
'format_id': 'http', 'format_id': 'http',
}) })
self._sort_formats(formats)
title = self._html_search_regex( if formats:
r'(?s)class="[^"]*col_description[^"]*">.*?<h3>(.*?)</h3>', webpage, 'title') info = {
duration = parse_duration(self._search_regex( 'formats': formats,
r'id=["\']video_duree["\'][^>]*>([^<]+)', }
webpage, 'duration', fatal=False)) else:
info = self._parse_html5_media_entries(url, webpage, url)[0]
return { self._sort_formats(info['formats'])
info.update({
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'duration': duration, 'duration': parse_duration(self._search_regex(
'formats': formats, r'id=["\']video_duree["\'][^>]*>([^<]+)',
} webpage, 'duration', fatal=False)),
})
return info