youtube-dl

commit 4a76b73c6c797ec7c63432680b38198ba5ef5b9f
parent e295618f9e1c1fc404d9baa4ccef961d3eb3ea88
Author: Yen Chi Hsuan <yan12125@gmail.com>
Date:   Sat,  1 Oct 2016 16:20:12 +0800

Merge pull request #10817 from TRox1972/clubic_match_id

[clubic] Rely on _match_id and _parse_json
Diffstat:
M
youtube_dl/extractor/clubic.py
 | 
11
+++--------

1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/youtube_dl/extractor/clubic.py b/youtube_dl/extractor/clubic.py
@@ -1,9 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import json
-import re
-
 from .common import InfoExtractor
 from ..utils import (
     clean_html,
@@ -30,16 +27,14 @@ class ClubicIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)
 
         player_url = 'http://player.m6web.fr/v1/player/clubic/%s.html' % video_id
         player_page = self._download_webpage(player_url, video_id)
 
-        config_json = self._search_regex(
+        config = self._parse_json(self._search_regex(
             r'(?m)M6\.Player\.config\s*=\s*(\{.+?\});$', player_page,
-            'configuration')
-        config = json.loads(config_json)
+            'configuration'), video_id)
 
         video_info = config['videoInfo']
         sources = config['sources']