projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[fusion] fix extraction(closes #17775)(closes #21269)
[youtube-dl]
/
youtube_dl
/
extractor
/
charlierose.py
diff --git
a/youtube_dl/extractor/charlierose.py
b/youtube_dl/extractor/charlierose.py
index 817f7128fad9c50a0bddf1de94190b1c647f6443..42c9af263e994d89edece2d29aac8949d577c69f 100644
(file)
--- a/
youtube_dl/extractor/charlierose.py
+++ b/
youtube_dl/extractor/charlierose.py
@@
-5,7
+5,7
@@
from ..utils import remove_end
class CharlieRoseIE(InfoExtractor):
class CharlieRoseIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?charlierose\.com/
video
(?:s|/player)/(?P<id>\d+)'
+ _VALID_URL = r'https?://(?:www\.)?charlierose\.com/
(?:video|episode)
(?:s|/player)/(?P<id>\d+)'
_TESTS = [{
'url': 'https://charlierose.com/videos/27996',
'md5': 'fda41d49e67d4ce7c2411fd2c4702e09',
_TESTS = [{
'url': 'https://charlierose.com/videos/27996',
'md5': 'fda41d49e67d4ce7c2411fd2c4702e09',
@@
-13,7
+13,7
@@
class CharlieRoseIE(InfoExtractor):
'id': '27996',
'ext': 'mp4',
'title': 'Remembering Zaha Hadid',
'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': [{
'description': 'We revisit past conversations with Zaha Hadid, in memory of the world renowned Iraqi architect.',
'subtitles': {
'en': [{
@@
-24,6
+24,9
@@
class CharlieRoseIE(InfoExtractor):
}, {
'url': 'https://charlierose.com/videos/27996',
'only_matching': 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'
}]
_PLAYER_BASE = 'https://charlierose.com/video/player/%s'
@@
-35,7
+38,8
@@
class CharlieRoseIE(InfoExtractor):
title = remove_end(self._og_search_title(webpage), ' - Charlie Rose')
info_dict = self._parse_html5_media_entries(
title = remove_end(self._og_search_title(webpage), ' - Charlie Rose')
info_dict = self._parse_html5_media_entries(
- self._PLAYER_BASE % video_id, webpage, video_id)[0]
+ self._PLAYER_BASE % video_id, webpage, video_id,
+ m3u8_entry_protocol='m3u8_native')[0]
self._sort_formats(info_dict['formats'])
self._remove_duplicate_formats(info_dict['formats'])
self._sort_formats(info_dict['formats'])
self._remove_duplicate_formats(info_dict['formats'])