diff --git a/youtube_dl/extractor/cartoonnetwork.py b/youtube_dl/extractor/cartoonnetwork.py index c66ec4e47..ed035b1df 100644 --- a/youtube_dl/extractor/cartoonnetwork.py +++ b/youtube_dl/extractor/cartoonnetwork.py @@ -28,30 +28,24 @@ class CartoonNetworkIE(TurnerBaseIE): video_id = self._html_search_regex(r'[^>]+.mediaId = "(.+?)"', webpage, 'video_id') title = self._html_search_regex(r'[^>]+.episodeTitle = "(.+?)"', webpage, 'title') auth = self._html_search_regex(r'[^>]+.authType = "(.+?)"', webpage, 'authType') + if "auth" in auth: + auth_required = '' + if "unauth" in auth: + auth_required = 'true' #Auth needs to be first due to Auth being in unauth. :/ videoType = self._html_search_regex(r'[^>]+.videoType = "(.+?)"', webpage, 'videoType') if 'short' in videoType: description = '' else: description = self._html_search_regex(r'id="[^>]+description[^>]*>(.+?)', webpage, 'description') - if "auth" in auth: - info = self._extract_ngtv_info( - video_id, - {'networkId': 'cartoonnetwork'}, - { + info = self._extract_ngtv_info( + video_id, + {'networkId': 'cartoonnetwork'}, + { 'url': url, 'site_name': 'CartoonNetwork', - 'auth_required': 'true', - }, - ) - if "unauth" in auth: - info = self._extract_ngtv_info( - video_id, - {'networkId': 'cartoonnetwork'}, - { - 'url': url, - 'site_name': 'CartoonNetwork', - }, - ) + 'auth_required': auth_required, + }, + ) info.update({ 'id': video_id, 'title': title,