aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/charlierose.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-08-22 02:06:47 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-08-22 02:06:47 +0800
commit526656726b13f47a33c36e56821136b90d6decf1 (patch)
tree5d68e74fc661e1bc98fb9295b9b99e079216c345 /youtube_dl/extractor/charlierose.py
parentd13bfc07b79bafa0be6829a18d0d2e273e83339b (diff)
[charlierose] Simplify and improve
Diffstat (limited to 'youtube_dl/extractor/charlierose.py')
-rw-r--r--youtube_dl/extractor/charlierose.py33
1 files changed, 19 insertions, 14 deletions
diff --git a/youtube_dl/extractor/charlierose.py b/youtube_dl/extractor/charlierose.py
index ba1d1b833..817f7128f 100644
--- a/youtube_dl/extractor/charlierose.py
+++ b/youtube_dl/extractor/charlierose.py
@@ -6,20 +6,25 @@ from ..utils import remove_end
class CharlieRoseIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?charlierose\.com/video(?:s|/player)/(?P<id>\d+)'
- _TEST = {
+ _TESTS = [{
'url': 'https://charlierose.com/videos/27996',
+ 'md5': 'fda41d49e67d4ce7c2411fd2c4702e09',
'info_dict': {
'id': '27996',
'ext': 'mp4',
'title': 'Remembering Zaha Hadid',
'thumbnail': 're:^https?://.*\.jpg\?\d+',
'description': 'We revisit past conversations with Zaha Hadid, in memory of the world renowned Iraqi architect.',
+ 'subtitles': {
+ 'en': [{
+ 'ext': 'vtt',
+ }],
+ },
},
- 'params': {
- # m3u8 download
- 'skip_download': True,
- }
- }
+ }, {
+ 'url': 'https://charlierose.com/videos/27996',
+ 'only_matching': True,
+ }]
_PLAYER_BASE = 'https://charlierose.com/video/player/%s'
@@ -29,17 +34,17 @@ class CharlieRoseIE(InfoExtractor):
title = remove_end(self._og_search_title(webpage), ' - Charlie Rose')
- entries = self._parse_html5_media_entries(self._PLAYER_BASE % video_id, webpage, video_id)[0]
- formats = entries['formats']
+ info_dict = self._parse_html5_media_entries(
+ self._PLAYER_BASE % video_id, webpage, video_id)[0]
- self._sort_formats(formats)
- self._remove_duplicate_formats(formats)
+ self._sort_formats(info_dict['formats'])
+ self._remove_duplicate_formats(info_dict['formats'])
- return {
+ info_dict.update({
'id': video_id,
'title': title,
- 'formats': formats,
'thumbnail': self._og_search_thumbnail(webpage),
'description': self._og_search_description(webpage),
- 'subtitles': entries.get('subtitles'),
- }
+ })
+
+ return info_dict