diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-07-22 17:29:09 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-07-22 17:29:09 +0200 |
| commit | 6ec7538bb4d5bbd81cee949966ed1f8c18ee1fff (patch) | |
| tree | ff31ad5de8a3a2a4b1da8880703832664e70e54d | |
| parent | 1771ddd85db7acda1e4174ccd186acd40a881fbc (diff) | |
| parent | 2871d489a91b6de1a5849243e4d827123dd564ef (diff) | |
| download | youtube-dl-6ec7538bb4d5bbd81cee949966ed1f8c18ee1fff.tar.gz youtube-dl-6ec7538bb4d5bbd81cee949966ed1f8c18ee1fff.tar.xz youtube-dl-6ec7538bb4d5bbd81cee949966ed1f8c18ee1fff.zip | |
Merge remote-tracking branch 'jterk/cbs-artists'
| -rw-r--r-- | youtube_dl/extractor/cbs.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py index ac0315853..44d23aef6 100644 --- a/youtube_dl/extractor/cbs.py +++ b/youtube_dl/extractor/cbs.py @@ -4,9 +4,9 @@ from .common import InfoExtractor class CBSIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?cbs\.com/shows/[^/]+/video/(?P<id>[^/]+)/.*' + _VALID_URL = r'https?://(?:www\.)?cbs\.com/shows/[^/]+/(video|artist)/(?P<id>[^/]+)/.*' - _TEST = { + _TESTS = [{ u'url': u'http://www.cbs.com/shows/garth-brooks/video/_u7W953k6la293J7EPTd9oHkSPs6Xn6_/connect-chat-feat-garth-brooks/', u'file': u'4JUVEwq3wUT7.flv', u'info_dict': { @@ -18,7 +18,19 @@ class CBSIE(InfoExtractor): # rtmp download u'skip_download': True, }, - } + }, { + u'url': u'http://www.cbs.com/shows/liveonletterman/artist/221752/st-vincent/', + u'file': u'P9gjWjelt6iP.flv', + u'info_dict': { + u'title': u'Live on Letterman - St. Vincent', + u'description': u'Live On Letterman: St. Vincent in concert from New York\'s Ed Sullivan Theater on Tuesday, July 16, 2014.', + u'duration': 3221, + }, + u'params': { + # rtmp download + u'skip_download': True, + }, + }] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) |