X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Frtvnh.py;h=4896d09d666e687010ae3cb6ebe0e2bfaec537d6;hb=a4690b3244a42a833146c406e622c96045b23df5;hp=998a3c53dc792b9cbae2d06ced79755b32d4059a;hpb=240ca32e57a027ff8cec8617c154bb7100bead1a;p=youtube-dl.git

diff --git a/youtube_dl/extractor/rtvnh.py b/youtube_dl/extractor/rtvnh.py
index 998a3c53d..4896d09d6 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,11 @@ class RTVNHIE(InfoExtractor):
                     item['file'], video_id, ext='mp4', entry_protocol='m3u8_native'))
             elif item.get('type') == '':
                 formats.append({'url': item['file']})
-        
+        self._sort_formats(formats)
+
         return {
             'id': video_id,
             'title': meta['title'].strip(),
-            'thumbnail': meta['image'],
+            'thumbnail': meta.get('image'),
             'formats': formats
         }