Merge remote-tracking branch 'Rudloff/canalc2'

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index fa53d9af9944c52c9c869e081fa669818c7ad874..eeeb3db502eb9ddca980fbb690864557df8163d4 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -8,6 +8,7 @@ from .breakcom import BreakIE
 from .brightcove import BrightcoveIE
 from .c56 import C56IE
 from .canalplus import CanalplusIE
+from .canalc2 import Canalc2IE
 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE
 from .condenast import CondeNastIE

diff --git a/youtube_dl/extractor/canalc2.py b/youtube_dl/extractor/canalc2.py
new file mode 100644 (file)
index 0000000..215abf5
--- /dev/null
+++ b/youtube_dl/extractor/canalc2.py
@@ -0,0 +1,35 @@
+# 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'
+
+    _TEST = {
+        u'url': u'http://www.canalc2.tv/video.asp?idVideo=12163&voir=oui',
+        u'file': u'12163.mp4',
+        u'md5': u'c00fa80517373764ff5c0b5eb5a58780',
+        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)
+        webpage = self._download_webpage(url, video_id)
+        file_name = re.search(r"so\.addVariable\('file','(.*?)'\);",
+            webpage).group(1)
+        
+        video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file_name
+
+        title = self._html_search_regex(r'class="evenement8">(.*?)</a>',
+            webpage, u'title')
+        
+        return {'id': video_id,
+                'ext' : 'mp4',
+                'url' : video_url,
+                'title' : title
+                }