X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Frtvnh.py;h=7c9d4b0cd6fe09d4e792df3da25c2059f9b056e6;hb=d90e40305bee84f5e3cd4927c729e1d16bbd3dc6;hp=998a3c53dc792b9cbae2d06ced79755b32d4059a;hpb=240ca32e57a027ff8cec8617c154bb7100bead1a;p=youtube-dl diff --git a/youtube_dl/extractor/rtvnh.py b/youtube_dl/extractor/rtvnh.py index 998a3c53d..7c9d4b0cd 100644 --- a/youtube_dl/extractor/rtvnh.py +++ b/youtube_dl/extractor/rtvnh.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor +from ..utils import ExtractorError class RTVNHIE(InfoExtractor): @@ -22,8 +23,14 @@ class RTVNHIE(InfoExtractor): meta = self._parse_json(self._download_webpage( 'http://www.rtvnh.nl/video/json?m=' + video_id, video_id), video_id) + + status = meta.get('status') + if status != 200: + raise ExtractorError( + '%s returned error code %d' % (self.IE_NAME, status), expected=True) + formats = self._extract_smil_formats( - 'http://www.rtvnh.nl/video/smil?m=' + video_id, video_id) + 'http://www.rtvnh.nl/video/smil?m=' + video_id, video_id, fatal=False) for item in meta['source']['fb']: if item.get('type') == 'hls': @@ -31,10 +38,10 @@ class RTVNHIE(InfoExtractor): item['file'], video_id, ext='mp4', entry_protocol='m3u8_native')) elif item.get('type') == '': formats.append({'url': item['file']}) - + return { 'id': video_id, 'title': meta['title'].strip(), - 'thumbnail': meta['image'], + 'thumbnail': meta.get('image'), 'formats': formats }