projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com-rndusr:rg3/youtube-dl into fix/str-item-assignment
[youtube-dl]
/
youtube_dl
/
extractor
/
cartoonnetwork.py
diff --git
a/youtube_dl/extractor/cartoonnetwork.py
b/youtube_dl/extractor/cartoonnetwork.py
index b3f30b1ca81667b83e5f697b19d44d89157afe98..086ec90c9bc8a606968e5f56d2bada8602ed1f35 100644
(file)
--- a/
youtube_dl/extractor/cartoonnetwork.py
+++ b/
youtube_dl/extractor/cartoonnetwork.py
@@
-30,7
+30,13
@@
class CartoonNetworkIE(TurnerBaseIE):
return self._extract_cvp_info(
'http://www.cartoonnetwork.com/video-seo-svc/episodeservices/getCvpPlaylist?networkName=CN2&' + query, video_id, {
'secure': {
return self._extract_cvp_info(
'http://www.cartoonnetwork.com/video-seo-svc/episodeservices/getCvpPlaylist?networkName=CN2&' + query, video_id, {
'secure': {
- 'media_src': 'http://a
pple
-secure.cdn.turner.com/toon/big',
+ 'media_src': 'http://a
ndroidhls
-secure.cdn.turner.com/toon/big',
'tokenizer_src': 'http://www.cartoonnetwork.com/cntv/mvpd/processors/services/token_ipadAdobe.do',
},
'tokenizer_src': 'http://www.cartoonnetwork.com/cntv/mvpd/processors/services/token_ipadAdobe.do',
},
+ }, {
+ 'url': url,
+ 'site_name': 'CartoonNetwork',
+ 'auth_required': self._search_regex(
+ r'_cnglobal\.cvpFullOrPreviewAuth\s*=\s*(true|false);',
+ webpage, 'auth required', default='false') == 'true',
})
})