From: Remita Amine Date: Thu, 20 Apr 2017 04:16:41 +0000 (+0100) Subject: [amp] extract error message(closes #12795) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8abc7dca39236462c0652932df23862acda92d51;p=youtube-dl [amp] extract error message(closes #12795) --- diff --git a/youtube_dl/extractor/amp.py b/youtube_dl/extractor/amp.py index e8e40126b..98f8e69cd 100644 --- a/youtube_dl/extractor/amp.py +++ b/youtube_dl/extractor/amp.py @@ -7,15 +7,19 @@ from ..utils import ( parse_iso8601, mimetype2ext, determine_ext, + ExtractorError, ) class AMPIE(InfoExtractor): # parse Akamai Adaptive Media Player feed def _extract_feed_info(self, url): - item = self._download_json( + feed = self._download_json( url, None, 'Downloading Akamai AMP feed', - 'Unable to download Akamai AMP feed')['channel']['item'] + 'Unable to download Akamai AMP feed') + item = feed.get('channel', {}).get('item') + if not item: + raise ExtractorError('%s said: %s' % (self.IE_NAME, feed['error'])) video_id = item['guid']