projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] fix hd720 format position
[youtube-dl]
/
youtube_dl
/
extractor
/
cartoonnetwork.py
diff --git
a/youtube_dl/extractor/cartoonnetwork.py
b/youtube_dl/extractor/cartoonnetwork.py
index 813f5364428c1049c5d765384a692a6a5ad54395..6aeebd7b34544b273b9b7a50bfd604ca42a953e5 100644
(file)
--- a/
youtube_dl/extractor/cartoonnetwork.py
+++ b/
youtube_dl/extractor/cartoonnetwork.py
@@
-28,9
+28,15
@@
class CartoonNetworkIE(TurnerBaseIE):
id_type, video_id = re.search(r"_cnglobal\.cvp(Video|Title)Id\s*=\s*'([^']+)';", webpage).groups()
query = ('id' if id_type == 'Video' else 'titleId') + '=' + video_id
return self._extract_cvp_info(
id_type, video_id = re.search(r"_cnglobal\.cvp(Video|Title)Id\s*=\s*'([^']+)';", webpage).groups()
query = ('id' if id_type == 'Video' else 'titleId') + '=' + video_id
return self._extract_cvp_info(
- 'http://www.cartoonnetwork.com/video-seo-svc/episodeservices/getCvpPlaylist?' + query, video_id, {
+ 'http://www.cartoonnetwork.com/video-seo-svc/episodeservices/getCvpPlaylist?
networkName=CN2&
' + query, video_id, {
'secure': {
'secure': {
- 'media_src': 'http://a
pple
-secure.cdn.turner.com/toon/big',
- 'tokenizer_src': 'http
://www.cartoonnetwork.com/cntv/mvpd/processors/services/token_ipadAdobe.do
',
+ 'media_src': 'http://a
ndroidhls
-secure.cdn.turner.com/toon/big',
+ 'tokenizer_src': 'http
s://token.vgtf.net/token/token_mobile
',
},
},
+ }, {
+ 'url': url,
+ 'site_name': 'CartoonNetwork',
+ 'auth_required': self._search_regex(
+ r'_cnglobal\.cvpFullOrPreviewAuth\s*=\s*(true|false);',
+ webpage, 'auth required', default='false') == 'true',
})
})