mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-25 02:05:50 +01:00
[canalc2] Fix extraction (Closes #8191)
This commit is contained in:
parent
27783821af
commit
7a34302e95
@ -9,9 +9,9 @@ from ..utils import parse_duration
|
|||||||
|
|
||||||
class Canalc2IE(InfoExtractor):
|
class Canalc2IE(InfoExtractor):
|
||||||
IE_NAME = 'canalc2.tv'
|
IE_NAME = 'canalc2.tv'
|
||||||
_VALID_URL = r'https?://(?:www\.)?canalc2\.tv/video/(?P<id>\d+)'
|
_VALID_URL = r'https?://(?:(?:www\.)?canalc2\.tv/video/|archives-canalc2\.u-strasbg\.fr/video\.asp\?.*\bidVideo=)(?P<id>\d+)'
|
||||||
|
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
'url': 'http://www.canalc2.tv/video/12163',
|
'url': 'http://www.canalc2.tv/video/12163',
|
||||||
'md5': '060158428b650f896c542dfbb3d6487f',
|
'md5': '060158428b650f896c542dfbb3d6487f',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -23,24 +23,36 @@ class Canalc2IE(InfoExtractor):
|
|||||||
'params': {
|
'params': {
|
||||||
'skip_download': True, # Requires rtmpdump
|
'skip_download': True, # Requires rtmpdump
|
||||||
}
|
}
|
||||||
}
|
}, {
|
||||||
|
'url': 'http://archives-canalc2.u-strasbg.fr/video.asp?idVideo=11427&voir=oui',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
webpage = self._download_webpage(url, video_id)
|
|
||||||
video_url = self._search_regex(
|
webpage = self._download_webpage(
|
||||||
r'jwplayer\((["\'])Player\1\)\.setup\({[^}]*file\s*:\s*(["\'])(?P<file>.+?)\2',
|
'http://www.canalc2.tv/video/%s' % video_id, video_id)
|
||||||
webpage, 'video_url', group='file')
|
|
||||||
formats = [{'url': video_url}]
|
formats = []
|
||||||
|
for _, video_url in re.findall(r'file\s*=\s*(["\'])(.+?)\1', webpage):
|
||||||
if video_url.startswith('rtmp://'):
|
if video_url.startswith('rtmp://'):
|
||||||
rtmp = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+/))(?P<play_path>mp4:.+)$', video_url)
|
rtmp = re.search(
|
||||||
formats[0].update({
|
r'^(?P<url>rtmp://[^/]+/(?P<app>.+/))(?P<play_path>mp4:.+)$', video_url)
|
||||||
|
formats.append({
|
||||||
'url': rtmp.group('url'),
|
'url': rtmp.group('url'),
|
||||||
|
'format_id': 'rtmp',
|
||||||
'ext': 'flv',
|
'ext': 'flv',
|
||||||
'app': rtmp.group('app'),
|
'app': rtmp.group('app'),
|
||||||
'play_path': rtmp.group('play_path'),
|
'play_path': rtmp.group('play_path'),
|
||||||
'page_url': url,
|
'page_url': url,
|
||||||
})
|
})
|
||||||
|
else:
|
||||||
|
formats.append({
|
||||||
|
'url': video_url,
|
||||||
|
'format_id': 'http',
|
||||||
|
})
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
title = self._html_search_regex(
|
title = self._html_search_regex(
|
||||||
r'(?s)class="[^"]*col_description[^"]*">.*?<h3>(.*?)</h3>', webpage, 'title')
|
r'(?s)class="[^"]*col_description[^"]*">.*?<h3>(.*?)</h3>', webpage, 'title')
|
||||||
|
Loading…
Reference in New Issue
Block a user