diff options
Diffstat (limited to 'youtube_dl/extractor/cbs.py')
| -rw-r--r-- | youtube_dl/extractor/cbs.py | 42 | 
1 files changed, 24 insertions, 18 deletions
diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py index 44d23aef6..822f9a7be 100644 --- a/youtube_dl/extractor/cbs.py +++ b/youtube_dl/extractor/cbs.py @@ -1,35 +1,41 @@ +from __future__ import unicode_literals +  import re  from .common import InfoExtractor  class CBSIE(InfoExtractor): -    _VALID_URL = r'https?://(?:www\.)?cbs\.com/shows/[^/]+/(video|artist)/(?P<id>[^/]+)/.*' +    _VALID_URL = r'https?://(?:www\.)?cbs\.com/shows/[^/]+/(?:video|artist)/(?P<id>[^/]+)/.*'      _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': { -            u'title': u'Connect Chat feat. Garth Brooks', -            u'description': u'Connect with country music singer Garth Brooks, as he chats with fans on Wednesday November 27, 2013. Be sure to tune in to Garth Brooks: Live from Las Vegas, Friday November 29, at 9/8c on CBS!', -            u'duration': 1495, +        'url': 'http://www.cbs.com/shows/garth-brooks/video/_u7W953k6la293J7EPTd9oHkSPs6Xn6_/connect-chat-feat-garth-brooks/', +        'info_dict': { +            'id': '4JUVEwq3wUT7', +            'ext': 'flv', +            'title': 'Connect Chat feat. Garth Brooks', +            'description': 'Connect with country music singer Garth Brooks, as he chats with fans on Wednesday November 27, 2013. Be sure to tune in to Garth Brooks: Live from Las Vegas, Friday November 29, at 9/8c on CBS!', +            'duration': 1495,          }, -        u'params': { +        'params': {              # rtmp download -            u'skip_download': True, +            'skip_download': True,          }, +        '_skip': 'Blocked outside the US',      }, { -        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, +        'url': 'http://www.cbs.com/shows/liveonletterman/artist/221752/st-vincent/', +        'info_dict': { +            'id': 'P9gjWjelt6iP', +            'ext': 'flv', +            'title': 'Live on Letterman - St. Vincent', +            'description': 'Live On Letterman: St. Vincent in concert from New York\'s Ed Sullivan Theater on Tuesday, July 16, 2014.', +            'duration': 3221,          }, -        u'params': { +        'params': {              # rtmp download -            u'skip_download': True, +            'skip_download': True,          }, +        '_skip': 'Blocked outside the US',      }]      def _real_extract(self, url): @@ -38,5 +44,5 @@ class CBSIE(InfoExtractor):          webpage = self._download_webpage(url, video_id)          real_id = self._search_regex(              r"video\.settings\.pid\s*=\s*'([^']+)';", -            webpage, u'real video ID') +            webpage, 'real video ID')          return self.url_result(u'theplatform:%s' % real_id)  | 
