]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[moniker] Capture and output error message (#5541)
authorSergey M․ <dstftw@gmail.com>
Mon, 27 Apr 2015 17:44:05 +0000 (23:44 +0600)
committerSergey M․ <dstftw@gmail.com>
Mon, 27 Apr 2015 17:44:05 +0000 (23:44 +0600)
youtube_dl/extractor/moniker.py

index 5de719bdc41d2af56d6133a85b998c4ed85af726..801abe0e187631d2dd8eabbdd7dc218f6f673f5f 100644 (file)
@@ -9,6 +9,7 @@ from ..compat import (
     compat_urllib_parse,
     compat_urllib_request,
 )
+from ..utils import ExtractorError
 
 
 class MonikerIE(InfoExtractor):
@@ -40,6 +41,12 @@ class MonikerIE(InfoExtractor):
         video_id = self._match_id(url)
         orig_webpage = self._download_webpage(url, video_id)
 
+        error = self._search_regex(
+            r'class="err">([^<]+)<', orig_webpage, 'error', default=None)
+        if error:
+            raise ExtractorError(
+                '%s returned error: %s' % (self.IE_NAME, error), expected=True)
+
         fields = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', orig_webpage)
         data = dict(fields)