浏览代码

[5min] Raise an error if the 'success' field is False

For example for georestricted videos.
Jaime Marquínez Ferrándiz 11 年之前
父节点
当前提交
57b8d84cd9
共有 1 个文件被更改,包括 11 次插入2 次删除
  1. 11 2
      youtube_dl/extractor/fivemin.py

+ 11 - 2
youtube_dl/extractor/fivemin.py

@@ -6,6 +6,7 @@ from .common import InfoExtractor
 from ..utils import (
 from ..utils import (
     compat_str,
     compat_str,
     compat_urllib_parse,
     compat_urllib_parse,
+    ExtractorError,
 )
 )
 
 
 
 
@@ -58,9 +59,17 @@ class FiveMinIE(InfoExtractor):
             'isPlayerSeed': 'true',
             'isPlayerSeed': 'true',
             'url': embed_url,
             'url': embed_url,
         })
         })
-        info = self._download_json(
+        response = self._download_json(
             'https://syn.5min.com/handlers/SenseHandler.ashx?' + query,
             'https://syn.5min.com/handlers/SenseHandler.ashx?' + query,
-            video_id)['binding'][0]
+            video_id)
+        if not response['success']:
+            err_msg = response['errorMessage']
+            if err_msg == 'ErrorVideoUserNotGeo':
+                msg = 'Video not available from your location'
+            else:
+                msg = 'Aol said: %s' % err_msg
+            raise ExtractorError(msg, expected=True, video_id=video_id)
+        info = response['binding'][0]
 
 
         second_id = compat_str(int(video_id[:-2]) + 1)
         second_id = compat_str(int(video_id[:-2]) + 1)
         formats = []
         formats = []