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

[Cartoonnetwork] Allowing more support if the website changes.

Browse Source
This commit is contained in:
TheDaChicken 2018-08-27 18:17:30 -07:00 committed by GitHub
parent ccc4c02ece
commit f0b34bccc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/cartoonnetwork.py
View File

@ -1,6 +1,8 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .turner import TurnerBaseIE from .turner import TurnerBaseIE
@ -23,14 +25,14 @@ class CartoonNetworkIE(TurnerBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
display_id = self._match_id(url) display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
video_id = self._html_search_regex(r'_cnglobal.currentVideo.mediaId = "(.+?)"', webpage, 'video_id') video_id = self._html_search_regex(r'[^>]+.mediaId = "(.+?)"', webpage, 'video_id')
title = self._html_search_regex(r'_cnglobal.currentVideo.episodeTitle = "(.+?)"', webpage, 'title') title = self._html_search_regex(r'[^>]+.episodeTitle = "(.+?)"', webpage, 'title')
auth_required = self._html_search_regex(r'_cnglobal.currentVideo.authType = "(.+?)"', webpage, 'authType') auth_required = self._html_search_regex(r'[^>]+.authType = "(.+?)"', webpage, 'authType')
videoType = self._html_search_regex(r'_cnglobal.currentVideo.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="cn-videopage-ep-description-copy" itemprop="description">(.+?)</div>', webpage, 'description') description = self._html_search_regex(r'<div id="[^>]+description[^>]*>(.+?)</div>', webpage, 'description')
info = self._extract_ngtv_info( info = self._extract_ngtv_info(
video_id, video_id,
{'networkId': 'cartoonnetwork'}, {'networkId': 'cartoonnetwork'},