diff options
| author | Jaime Marquínez Ferrándiz <[email protected]> | 2013-11-04 22:20:22 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <[email protected]> | 2013-11-04 22:26:19 +0100 |
| commit | 19b0668251583d5c7dbc55696746539979b2ba11 (patch) | |
| tree | ce7d9a497d6d4b9607599c0b403ab44643bc4cfc | |
| parent | e7e6b54d8a02f7f76bd56e35bcd87a8723f71642 (diff) | |
| download | youtube-dl-19b0668251583d5c7dbc55696746539979b2ba11.tar.gz youtube-dl-19b0668251583d5c7dbc55696746539979b2ba11.zip | |
[canal2c] Accept more urls (fixes #1723)
The url only needs to have the 'idVideo' field in the query, in any position.
We have to set the 'void=oui' in the webpage url, so that we get the file name.
| -rw-r--r-- | youtube_dl/extractor/canalc2.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/canalc2.py b/youtube_dl/extractor/canalc2.py index e7f4fa9fd..3d8d7f9d2 100644 --- a/youtube_dl/extractor/canalc2.py +++ b/youtube_dl/extractor/canalc2.py @@ -6,7 +6,7 @@ from .common import InfoExtractor class Canalc2IE(InfoExtractor): IE_NAME = 'canalc2.tv' - _VALID_URL = r'http://.*?\.canalc2\.tv/video\.asp\?idVideo=(\d+)&voir=oui' + _VALID_URL = r'http://.*?\.canalc2\.tv/video\.asp\?.*?idVideo=(?P<id>\d+)' _TEST = { u'url': u'http://www.canalc2.tv/video.asp?idVideo=12163&voir=oui', @@ -18,7 +18,9 @@ class Canalc2IE(InfoExtractor): } def _real_extract(self, url): - video_id = re.match(self._VALID_URL, url).group(1) + video_id = re.match(self._VALID_URL, url).group('id') + # We need to set the voir field for getting the file name + url = 'http://www.canalc2.tv/video.asp?idVideo=%s&voir=oui' % video_id webpage = self._download_webpage(url, video_id) file_name = self._search_regex( r"so\.addVariable\('file','(.*?)'\);", |