projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9a054fc
)
[canalc2] Add support for HTML5 videos (closes #15916, closes #15919)
author
Sergey M․
<dstftw@gmail.com>
Mon, 19 Mar 2018 16:40:19 +0000
(23:40 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 19 Mar 2018 16:40:19 +0000
(23:40 +0700)
youtube_dl/extractor/canalc2.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/canalc2.py
b/youtube_dl/extractor/canalc2.py
index acd87e371abeec9072b73a28cf37a32972ad41fd..407cc8084836cec7f82113eb71ff8e0314a8e932 100644
(file)
--- a/
youtube_dl/extractor/canalc2.py
+++ b/
youtube_dl/extractor/canalc2.py
@@
-31,6
+31,10
@@
class Canalc2IE(InfoExtractor):
webpage = self._download_webpage(
'http://www.canalc2.tv/video/%s' % video_id, video_id)
webpage = self._download_webpage(
'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 = []
for _, video_url in re.findall(r'file\s*=\s*(["\'])(.+?)\1', webpage):
if video_url.startswith('rtmp://'):
formats = []
for _, video_url in re.findall(r'file\s*=\s*(["\'])(.+?)\1', webpage):
if video_url.startswith('rtmp://'):
@@
-49,17
+53,21
@@
class Canalc2IE(InfoExtractor):
'url': video_url,
'format_id': 'http',
})
'url': video_url,
'format_id': 'http',
})
- self._sort_formats(formats)
- title = self._html_search_regex(
- r'(?s)class="[^"]*col_description[^"]*">.*?<h3>(.*?)</h3>', webpage, 'title')
- duration = parse_duration(self._search_regex(
- r'id=["\']video_duree["\'][^>]*>([^<]+)',
- webpage, 'duration', fatal=False))
+ if formats:
+ info = {
+ 'formats': formats,
+ }
+ else:
+ info = self._parse_html5_media_entries(url, webpage, url)[0]
+
+ self._sort_formats(info['formats'])
-
return
{
+
info.update(
{
'id': video_id,
'title': title,
'id': video_id,
'title': title,
- 'duration': duration,
- 'formats': formats,
- }
+ 'duration': parse_duration(self._search_regex(
+ r'id=["\']video_duree["\'][^>]*>([^<]+)',
+ webpage, 'duration', fatal=False)),
+ })
+ return info