Browse Source

[ok] Capture error message

Sergey M․ 10 years ago
parent
commit
1806a75415
1 changed files with 7 additions and 0 deletions
  1. 7 0
      youtube_dl/extractor/odnoklassniki.py

+ 7 - 0
youtube_dl/extractor/odnoklassniki.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 from .common import InfoExtractor
 from .common import InfoExtractor
 from ..compat import compat_urllib_parse_unquote
 from ..compat import compat_urllib_parse_unquote
 from ..utils import (
 from ..utils import (
+    ExtractorError,
     unified_strdate,
     unified_strdate,
     int_or_none,
     int_or_none,
     qualities,
     qualities,
@@ -72,6 +73,12 @@ class OdnoklassnikiIE(InfoExtractor):
         webpage = self._download_webpage(
         webpage = self._download_webpage(
             'http://ok.ru/video/%s' % video_id, video_id)
             'http://ok.ru/video/%s' % video_id, video_id)
 
 
+        error = self._search_regex(
+            r'[^>]+class="vp_video_stub_txt"[^>]*>([^<]+)<',
+            webpage, 'error', default=None)
+        if error:
+            raise ExtractorError(error, expected=True)
+
         player = self._parse_json(
         player = self._parse_json(
             unescapeHTML(self._search_regex(
             unescapeHTML(self._search_regex(
                 r'data-options=(?P<quote>["\'])(?P<player>{.+?%s.+?})(?P=quote)' % video_id,
                 r'data-options=(?P<quote>["\'])(?P<player>{.+?%s.+?})(?P=quote)' % video_id,