Merge branch 'charlierose' of https://github.com/TRox1972/youtube-dl into TRox1972-charlierose

This commit is contained in:
Yen Chi Hsuan 2016-08-22 00:48:35 +08:00
commit d13bfc07b7
No known key found for this signature in database
GPG Key ID: 3FDDD575826C5C30
2 changed files with 46 additions and 0 deletions

View File

@ -0,0 +1,45 @@
from __future__ import unicode_literals
from .common import InfoExtractor
from ..utils import remove_end
class CharlieRoseIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?charlierose\.com/video(?:s|/player)/(?P<id>\d+)'
_TEST = {
'url': 'https://charlierose.com/videos/27996',
'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.',
},
'params': {
# m3u8 download
'skip_download': True,
}
}
_PLAYER_BASE = 'https://charlierose.com/video/player/%s'
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(self._PLAYER_BASE % video_id, video_id)
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']
self._sort_formats(formats)
self._remove_duplicate_formats(formats)
return {
'id': video_id,
'title': title,
'formats': formats,
'thumbnail': self._og_search_thumbnail(webpage),
'description': self._og_search_description(webpage),
'subtitles': entries.get('subtitles'),
}

View File

@ -134,6 +134,7 @@
from .cda import CDAIE
from .ceskatelevize import CeskaTelevizeIE
from .channel9 import Channel9IE
from .charlierose import CharlieRoseIE
from .chaturbate import ChaturbateIE
from .chilloutzone import ChilloutzoneIE
from .chirbit import (