浏览代码

[xvideos] Capture and output inline error if any

Sergey M․ 11 年之前
父节点
当前提交
3217377b3c
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      youtube_dl/extractor/xvideos.py

+ 6 - 0
youtube_dl/extractor/xvideos.py

@@ -5,6 +5,8 @@ import re
 from .common import InfoExtractor
 from .common import InfoExtractor
 from ..utils import (
 from ..utils import (
     compat_urllib_parse,
     compat_urllib_parse,
+    ExtractorError,
+    clean_html,
 )
 )
 
 
 
 
@@ -28,6 +30,10 @@ class XVideosIE(InfoExtractor):
 
 
         self.report_extraction(video_id)
         self.report_extraction(video_id)
 
 
+        mobj = re.search(r'<h1 class="inlineError">(.+?)</h1>', webpage)
+        if mobj:
+            raise ExtractorError('%s said: %s' % (self.IE_NAME, clean_html(mobj.group(1))), expected=True)
+
         # Extract video URL
         # Extract video URL
         video_url = compat_urllib_parse.unquote(
         video_url = compat_urllib_parse.unquote(
             self._search_regex(r'flv_url=(.+?)&', webpage, 'video URL'))
             self._search_regex(r'flv_url=(.+?)&', webpage, 'video URL'))