diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-10-01 16:20:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 16:20:12 +0800 |
| commit | 4a76b73c6c797ec7c63432680b38198ba5ef5b9f (patch) | |
| tree | 46e691ddb73c8be2cdfd4ba96214e25e74c23c78 /youtube_dl/extractor | |
| parent | e295618f9e1c1fc404d9baa4ccef961d3eb3ea88 (diff) | |
| parent | eaf9b22f94f37487d75457423a9a293dee1b1d32 (diff) | |
Merge pull request #10817 from TRox1972/clubic_match_id
[clubic] Rely on _match_id and _parse_json
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/clubic.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/youtube_dl/extractor/clubic.py b/youtube_dl/extractor/clubic.py index 2fba93543..f7ee3a8f8 100644 --- 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'] |