projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Ensure response handle is not prematurely closed before it can...
[youtube-dl]
/
youtube_dl
/
extractor
/
cwtv.py
diff --git
a/youtube_dl/extractor/cwtv.py
b/youtube_dl/extractor/cwtv.py
index 224a1fb5d4abcd49d3285a1aed7724d5de6a17e9..f9bd535f6d228b137b78e90a765f1042c0f5c925 100644
(file)
--- a/
youtube_dl/extractor/cwtv.py
+++ b/
youtube_dl/extractor/cwtv.py
@@
-3,6
+3,7
@@
from __future__ import unicode_literals
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
+ ExtractorError,
int_or_none,
parse_age_limit,
parse_iso8601,
int_or_none,
parse_age_limit,
parse_iso8601,
@@
-66,9
+67,12
@@
class CWTVIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)
-
video_
data = self._download_json(
+ data = self._download_json(
'http://images.cwtv.com/feed/mobileapp/video-meta/apiversion_8/guid_' + video_id,
'http://images.cwtv.com/feed/mobileapp/video-meta/apiversion_8/guid_' + video_id,
- video_id)['video']
+ video_id)
+ if data.get('result') != 'ok':
+ raise ExtractorError(data['msg'], expected=True)
+ video_data = data['video']
title = video_data['title']
mpx_url = video_data.get('mpx_url') or 'http://link.theplatform.com/s/cwtv/media/guid/2703454149/%s?formats=M3U' % video_id
title = video_data['title']
mpx_url = video_data.get('mpx_url') or 'http://link.theplatform.com/s/cwtv/media/guid/2703454149/%s?formats=M3U' % video_id