Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2025-02-17 01:17:54 +01:00
Code Issues Releases Wiki Activity

[cbs:playlist] flake8 for PEP 8

Browse Source
This commit is contained in:
John Hawkinson 2017-03-25 12:18:07 -04:00
parent 91654b0437
commit 9961f53795
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/extractor/cbs.py
View File

@ -24,6 +24,7 @@ class CBSBaseIE(ThePlatformFeedIE):
}] }]
} if closed_caption_e is not None and closed_caption_e.attrib.get('value') else [] } if closed_caption_e is not None and closed_caption_e.attrib.get('value') else []
class CBSShowIE(InfoExtractor): class CBSShowIE(InfoExtractor):
IE_DESC = 'CBS show playlists, including full episodes and clips' IE_DESC = 'CBS show playlists, including full episodes and clips'
IE_NAME = 'cbs.com:playlist' IE_NAME = 'cbs.com:playlist'
@ -80,23 +81,26 @@ class CBSShowIE(InfoExtractor):
# } # }
try: try:
clipdata = self._parse_json( clipdata = self._parse_json(
self._search_regex(r'element\.videoCarousel\(([^)]*)\);', webpage, self._search_regex(r'element\.videoCarousel\(([^)]*)\);',
'clip carousel'), webpage, 'carousel'),
show_name, transform_source=js_to_json) show_name, transform_source=js_to_json)
# http://www.cbs.com/carousels/videosBySection/241426/offset/0/limit/15/xs/0/ # http://www.cbs.com/carousels/videosBySection/241426/offset/0/limit/15/xs/0/
# => {id: 241426, title: "Clips", # => {id: 241426, title: "Clips",
clips_url = urljoin(url, clips_url = \
'/carousels/videosBySection/%d/offset/0/limit/15/xs/0' % clipdata['id']) urljoin(url,
'/carousels/videosBySection/%d/offset/0/limit/15/xs/0'
% clipdata['id'])
clips = self.carousel_playlist(clips_url, 'clips') clips = self.carousel_playlist(clips_url, 'clips')
except RegexNotFoundError: except RegexNotFoundError:
clips = { 'entries': [] } clips = {'entries': []}
playlist = self.carousel_playlist(episodes_url, 'episodes') playlist = self.carousel_playlist(episodes_url, 'episodes')
playlist['entries'] += clips['entries'] playlist['entries'] += clips['entries']
playlist['id'] = show['id'] playlist['id'] = show['id']
return playlist return playlist
class CBSIE(CBSBaseIE): class CBSIE(CBSBaseIE):
_VALID_URL = r'(?:cbs:|https?://(?:www\.)?(?:cbs\.com/shows/[^/]+/video|colbertlateshow\.com/(?:video|podcasts))/)(?P<id>[\w-]+)' _VALID_URL = r'(?:cbs:|https?://(?:www\.)?(?:cbs\.com/shows/[^/]+/video|colbertlateshow\.com/(?:video|podcasts))/)(?P<id>[\w-]+)'