X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcanalc2.py;h=3d8d7f9d2dee4713b467e47ab79bbb55edccf147;hb=2b35c9ef742bf261078ea10c6c0bba848db1a0df;hp=215abf5378fcff960798be10b14c23c593c6073f;hpb=aa5a63a5b54fe26654eb91005025d91237b39c64;p=youtube-dl

diff --git a/youtube_dl/extractor/canalc2.py b/youtube_dl/extractor/canalc2.py
index 215abf537..3d8d7f9d2 100644
--- a/youtube_dl/extractor/canalc2.py
+++ b/youtube_dl/extractor/canalc2.py
@@ -1,35 +1,37 @@
 # coding: utf-8
-"""Extractor for canalc2.tv"""
 import re
 
 from .common import InfoExtractor
 
+
 class Canalc2IE(InfoExtractor):
-    """Extractor for canalc2.tv"""
-    _VALID_URL = r'http://.*?\.canalc2\.tv/video\.asp\?idVideo=(\d+)&voir=oui'
+    IE_NAME = 'canalc2.tv'
+    _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',
         u'file': u'12163.mp4',
-        u'md5': u'c00fa80517373764ff5c0b5eb5a58780',
+        u'md5': u'060158428b650f896c542dfbb3d6487f',
         u'info_dict': {
             u'title': u'Terrasses du Numérique'
         }
     }
 
     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 = re.search(r"so\.addVariable\('file','(.*?)'\);",
-            webpage).group(1)
-        
+        file_name = self._search_regex(
+            r"so\.addVariable\('file','(.*?)'\);",
+            webpage, 'file name')
         video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file_name
 
-        title = self._html_search_regex(r'class="evenement8">(.*?)</a>',
-            webpage, u'title')
+        title = self._html_search_regex(
+            r'class="evenement8">(.*?)</a>', webpage, u'title')
         
         return {'id': video_id,
-                'ext' : 'mp4',
-                'url' : video_url,
-                'title' : title
+                'ext': 'mp4',
+                'url': video_url,
+                'title': title,
                 }