diff --git a/youtube_dl/extractor/cartoonnetwork.py b/youtube_dl/extractor/cartoonnetwork.py index faf7e10a5..a1e324105 100644 --- a/youtube_dl/extractor/cartoonnetwork.py +++ b/youtube_dl/extractor/cartoonnetwork.py @@ -1,21 +1,19 @@ # coding: utf-8 from __future__ import unicode_literals -import re - from .turner import TurnerBaseIE class CartoonNetworkIE(TurnerBaseIE): _VALID_URL = r'https?://(?:www\.)?cartoonnetwork\.com/video/(?:[^/]+/)+(?P[^/?#]+)-(?:clip|episode)\.html' _TEST = { - 'url': 'http://www.cartoonnetwork.com/video/teen-titans-go/starfire-the-cat-lady-clip.html', + 'url': 'https://www.cartoonnetwork.com/video/steven-universe/garnet-gets-a-job-clip.html', 'info_dict': { - 'id': '8a250ab04ed07e6c014ef3f1e2f9016c', + 'id': '96bc363957a17bc03d16feb86b8391a321f7e670', 'ext': 'mp4', - 'title': 'Starfire the Cat Lady', - 'description': 'Robin decides to become a cat so that Starfire will finally love him.', - }, + 'title': 'Garnet Gets a Job', + 'description': 'Garnet and Steven explore the most unlikely timelines in Beach City.', + }, 'params': { # m3u8 download 'skip_download': True, @@ -25,21 +23,10 @@ class CartoonNetworkIE(TurnerBaseIE): def _real_extract(self, url): display_id = self._match_id(url) webpage = self._download_webpage(url, display_id) - for line in webpage.splitlines(): - if "_cnglobal.currentVideo.mediaId" in line: - simpleid = line.split('mediaId = "',1)[1] - video_id = simpleid.replace('";', '') - if "_cnglobal.currentVideo.episodeTitle" in line: - simpletitle = line.split('episodeTitle = "',1)[1] - title = simpletitle.replace('";', '') - if "_cnglobal.currentVideo.authType" in line: - simpleauth = line.split('authType = "',1)[1] - auth = simpleauth.replace('";', '') - if "auth" in auth: - auth_required = 'true' - if "unauth" in auth: - auth_required = '' - description = '' + video_id = self._html_search_regex(r'_cnglobal.currentVideo.mediaId = "(.+?)"', webpage, 'video_id') + title = self._html_search_regex(r'_cnglobal.currentVideo.episodeTitle = "(.+?)"', webpage, 'title') + auth_required = self._html_search_regex(r'_cnglobal.currentVideo.authType = "(.+?)"', webpage, 'authType') + description = self._html_search_regex(r'
(.+?)
', webpage, 'authType') info = self._extract_ngtv_info( video_id, {'networkId': 'cartoonnetwork'},