X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcharlierose.py;h=42c9af263e994d89edece2d29aac8949d577c69f;hb=HEAD;hp=ba1d1b8338f377204e6cde0e50051cda2e385b8c;hpb=d13bfc07b79bafa0be6829a18d0d2e273e83339b;p=youtube-dl

diff --git a/youtube_dl/extractor/charlierose.py b/youtube_dl/extractor/charlierose.py
index ba1d1b833..42c9af263 100644
--- a/youtube_dl/extractor/charlierose.py
+++ b/youtube_dl/extractor/charlierose.py
@@ -5,21 +5,29 @@ from ..utils import remove_end
 
 
 class CharlieRoseIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?charlierose\.com/video(?:s|/player)/(?P<id>\d+)'
-    _TEST = {
+    _VALID_URL = r'https?://(?:www\.)?charlierose\.com/(?:video|episode)(?:s|/player)/(?P<id>\d+)'
+    _TESTS = [{
         'url': 'https://charlierose.com/videos/27996',
+        'md5': 'fda41d49e67d4ce7c2411fd2c4702e09',
         'info_dict': {
             'id': '27996',
             'ext': 'mp4',
             'title': 'Remembering Zaha Hadid',
-            'thumbnail': 're:^https?://.*\.jpg\?\d+',
+            'thumbnail': r'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,
+    }, {
+        'url': 'https://charlierose.com/episodes/30887?autoplay=true',
+        'only_matching': True,
+    }]
 
     _PLAYER_BASE = 'https://charlierose.com/video/player/%s'
 
@@ -29,17 +37,18 @@ 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,
+            m3u8_entry_protocol='m3u8_native')[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