X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fdiscoverygo.py;h=2042493a8c7836ecae4efd23005101cf805116a7;hb=b92d3c5343536eb0a865afa79e3787fc384ec0ec;hp=cba709935846fe579504afa543e800f6828d814f;hpb=7273e5849b27cb7d0f4d5f40e7801cab2da85ae3;p=youtube-dl diff --git a/youtube_dl/extractor/discoverygo.py b/youtube_dl/extractor/discoverygo.py index cba709935..2042493a8 100644 --- a/youtube_dl/extractor/discoverygo.py +++ b/youtube_dl/extractor/discoverygo.py @@ -6,7 +6,7 @@ from ..utils import ( extract_attributes, int_or_none, parse_age_limit, - unescapeHTML, + ExtractorError, ) @@ -48,12 +48,19 @@ class DiscoveryGoIE(InfoExtractor): webpage, 'video container')) video = self._parse_json( - unescapeHTML(container.get('data-video') or container.get('data-json')), + container.get('data-video') or container.get('data-json'), display_id) title = video['name'] - stream = video['stream'] + stream = video.get('stream') + if not stream: + if video.get('authenticated') is True: + raise ExtractorError( + 'This video is only available via cable service provider subscription that' + ' is not currently supported. You may want to use --cookies.', expected=True) + else: + raise ExtractorError('Unable to find stream') STREAM_URL_SUFFIX = 'streamUrl' formats = [] for stream_kind in ('', 'hds'):