X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcanalplus.py;h=0202078b0cdcef31f300e1419eed6fc38fa7b424;hb=e423e0baaabe16e80af693d1f05ffc560747b3b8;hp=553eeb23059bfe09badfe8e8e51cf1e38d9e327a;hpb=b075d25bedc26a2ec8202f612f6949eb356a5ef7;p=youtube-dl

diff --git a/youtube_dl/extractor/canalplus.py b/youtube_dl/extractor/canalplus.py
index 553eeb230..0202078b0 100644
--- a/youtube_dl/extractor/canalplus.py
+++ b/youtube_dl/extractor/canalplus.py
@@ -4,16 +4,20 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..utils import unified_strdate
+from ..utils import (
+    unified_strdate,
+    url_basename,
+)
 
 
 class CanalplusIE(InfoExtractor):
-    _VALID_URL = r'https?://(www\.canalplus\.fr/.*?/(?P<path>.*)|player\.canalplus\.fr/#/(?P<id>\d+))'
+    _VALID_URL = r'https?://(?:www\.canalplus\.fr/.*?/(?P<path>.*)|player\.canalplus\.fr/#/(?P<id>[0-9]+))'
     _VIDEO_INFO_TEMPLATE = 'http://service.canal-plus.com/video/rest/getVideosLiees/cplus/%s'
     IE_NAME = 'canalplus.fr'
 
     _TEST = {
         'url': 'http://www.canalplus.fr/c-infos-documentaires/pid1830-c-zapping.html?vid=922470',
+        'md5': '3db39fb48b9685438ecf33a1078023e4',
         'info_dict': {
             'id': '922470',
             'ext': 'flv',
@@ -21,17 +25,17 @@ class CanalplusIE(InfoExtractor):
             'description': 'Le meilleur de toutes les chaînes, tous les jours.\nEmission du 26 août 2013',
             'upload_date': '20130826',
         },
-        'params': {
-            'skip_download': True,
-        },
     }
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = mobj.groupdict().get('id')
+
+        # Beware, some subclasses do not define an id group
+        display_id = url_basename(mobj.group('path'))
 
         if video_id is None:
-            webpage = self._download_webpage(url, mobj.group('path'))
+            webpage = self._download_webpage(url, display_id)
             video_id = self._search_regex(r'<canal:player videoId="(\d+)"', webpage, 'video id')
 
         info_url = self._VIDEO_INFO_TEMPLATE % video_id
@@ -55,6 +59,7 @@ class CanalplusIE(InfoExtractor):
 
         return {
             'id': video_id,
+            'display_id': display_id,
             'title': '%s - %s' % (infos.find('TITRAGE/TITRE').text,
                                   infos.find('TITRAGE/SOUS_TITRE').text),
             'upload_date': unified_strdate(infos.find('PUBLICATION/DATE').text),