R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Adobe Pass thinking it's needs TV logins

Browse Source
This commit is contained in:
TheDaChicken 2018-09-04 16:12:28 -07:00 committed by GitHub
parent f0b34bccc0
commit ebf3487819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/cartoonnetwork.py
View File

@ -27,12 +27,16 @@ class CartoonNetworkIE(TurnerBaseIE):
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
video_id = self._html_search_regex(r'[^>]+.mediaId = "(.+?)"', webpage, 'video_id') video_id = self._html_search_regex(r'[^>]+.mediaId = "(.+?)"', webpage, 'video_id')
title = self._html_search_regex(r'[^>]+.episodeTitle = "(.+?)"', webpage, 'title') title = self._html_search_regex(r'[^>]+.episodeTitle = "(.+?)"', webpage, 'title')
auth_required = self._html_search_regex(r'[^>]+.authType = "(.+?)"', webpage, 'authType') auth = self._html_search_regex(r'[^>]+.authType = "(.+?)"', webpage, 'authType')
if "unauth" in auth:
auth_required = 'false'
if "auth" in auth:
auth_required = 'true'
videoType = self._html_search_regex(r'[^>]+.videoType = "(.+?)"', webpage, 'videoType') videoType = self._html_search_regex(r'[^>]+.videoType = "(.+?)"', webpage, 'videoType')
if 'short' in videoType: if 'short' in videoType:
description = '' description = ''
else: else:
description = self._html_search_regex(r'<div id="[^>]+description[^>]*>(.+?)</div>', webpage, 'description') description = self._html_search_regex(r'id="[^>]+description[^>]*>(.+?)</div>', webpage, 'description')
info = self._extract_ngtv_info( info = self._extract_ngtv_info(
video_id, video_id,
{'networkId': 'cartoonnetwork'}, {'networkId': 'cartoonnetwork'},