summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJason Terk <[email protected]>2014-07-22 07:56:42 -0700
committerJason Terk <[email protected]>2014-07-22 08:00:08 -0700
commit2871d489a91b6de1a5849243e4d827123dd564ef (patch)
tree0b9827c9e263a015ca42fa424288bc154117d56e
parent8904e979dfe489e37bda369a5863bceecb56d490 (diff)
downloadyoutube-dl-2871d489a91b6de1a5849243e4d827123dd564ef.tar.gz
youtube-dl-2871d489a91b6de1a5849243e4d827123dd564ef.zip
Support Alternative cbs.com URL Format
Adds support for cbs.com URLs containing "/artist" instead of "/video". E.g.: http://www.cbs.com/shows/liveonletterman/artist/221752/st-vincent/
-rw-r--r--youtube_dl/extractor/cbs.py18
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)