aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-06-06 21:15:06 +0700
committerSergey M․ <dstftw@gmail.com>2014-06-06 21:15:06 +0700
commit3217377b3c1e0b0b67f85ce8ec808f6c5cf0c5ae (patch)
tree27c549e6ddaf1593706df19cc5fa502e7e8bbc30 /youtube_dl/extractor
parent24da5893fc934207990158f81a90816cdc526c1f (diff)
[xvideos] Capture and output inline error if any
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/xvideos.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/extractor/xvideos.py b/youtube_dl/extractor/xvideos.py
index 85e99e1b0..f21e0671f 100644
--- a/youtube_dl/extractor/xvideos.py
+++ b/youtube_dl/extractor/xvideos.py
@@ -5,6 +5,8 @@ import re
from .common import InfoExtractor
from ..utils import (
compat_urllib_parse,
+ ExtractorError,
+ clean_html,
)
@@ -28,6 +30,10 @@ class XVideosIE(InfoExtractor):
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
video_url = compat_urllib_parse.unquote(
self._search_regex(r'flv_url=(.+?)&', webpage, 'video URL'))