浏览代码

[ultimedia] Capture and output unavailable video message

Sergey M․ 10 年之前
父节点
当前提交
73900846b1
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      youtube_dl/extractor/ultimedia.py

+ 5 - 0
youtube_dl/extractor/ultimedia.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     qualities,
     unified_strdate,
     clean_html,
@@ -49,6 +50,10 @@ class UltimediaIE(InfoExtractor):
         deliver_page = self._download_webpage(
             deliver_url, video_id, 'Downloading iframe page')
 
+        if '>This video is currently not available' in deliver_page:
+            raise ExtractorError(
+                'Video %s is currently not available' % video_id, expected=True)
+
         player = self._parse_json(
             self._search_regex(
                 r"jwplayer\('player(?:_temp)?'\)\.setup\(({.+?})\)\.on", deliver_page, 'player'),