diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-01-14 06:17:03 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-01-14 06:18:38 +0700 |
| commit | adf063dad1792f0c9c680d13ccd984b4ad60ac29 (patch) | |
| tree | bfdc54dab38fb3a68dccc31feae966a8b25835f0 /youtube_dl/extractor/comedycentral.py | |
| parent | 5e8eebb6009ac3e9f7dfc803d8561174d207c1a2 (diff) | |
| download | youtube-dl-adf063dad1792f0c9c680d13ccd984b4ad60ac29.tar.gz youtube-dl-adf063dad1792f0c9c680d13ccd984b4ad60ac29.tar.xz youtube-dl-adf063dad1792f0c9c680d13ccd984b4ad60ac29.zip | |
[mtv,cc,cmt,spike] Improve and refactor
- Eliminate _transform_rtmp_url * Generalize triforce mgid extraction + [cmt] Add support for full-episodes (closes #11623)
Diffstat (limited to 'youtube_dl/extractor/comedycentral.py')
| -rw-r--r-- | youtube_dl/extractor/comedycentral.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index 816e0bfb6..4cac29415 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -48,17 +48,8 @@ class ComedyCentralFullEpisodesIE(MTVServicesInfoExtractor): def _real_extract(self, url): playlist_id = self._match_id(url) webpage = self._download_webpage(url, playlist_id) - - feed_json = self._search_regex(r'var triforceManifestFeed\s*=\s*(\{.+?\});\n', webpage, 'triforce feeed') - feed = self._parse_json(feed_json, playlist_id) - zones = feed['manifest']['zones'] - - video_zone = zones['t2_lc_promo1'] - feed = self._download_json(video_zone['feed'], playlist_id) - mgid = feed['result']['data']['id'] - + mgid = self._extract_triforce_mgid(webpage, data_zone='t2_lc_promo1') videos_info = self._get_videos_info(mgid) - return videos_info @@ -94,12 +85,6 @@ class ToshIE(MTVServicesInfoExtractor): 'only_matching': True, }] - @classmethod - def _transform_rtmp_url(cls, rtmp_video_url): - new_urls = super(ToshIE, cls)._transform_rtmp_url(rtmp_video_url) - new_urls['rtmp'] = rtmp_video_url.replace('viacomccstrm', 'viacommtvstrm') - return new_urls - class ComedyCentralTVIE(MTVServicesInfoExtractor): _VALID_URL = r'https?://(?:www\.)?comedycentral\.tv/(?:staffeln|shows)/(?P<id>[^/?#&]+)' |