]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[crunchyroll] Handle error message
authorSergey M. <dstftw@gmail.com>
Tue, 25 Feb 2014 13:29:16 +0000 (20:29 +0700)
committerSergey M. <dstftw@gmail.com>
Tue, 25 Feb 2014 13:30:17 +0000 (20:30 +0700)
youtube_dl/extractor/crunchyroll.py

index 44d78fe5e3ca508d0da7cee895f7d952ee46ac8e..5587ade1256fd090f046c1a6deed4ece8b47b6d9 100644 (file)
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 import re
+import json
 import base64
 import zlib
 
@@ -113,6 +114,12 @@ class CrunchyrollIE(InfoExtractor):
         if note_m:
             raise ExtractorError(note_m)
 
+        mobj = re.search(r'Page\.messaging_box_controller\.addItems\(\[(?P<msg>{.+?})\]\)', webpage)
+        if mobj:
+            msg = json.loads(mobj.group('msg'))
+            if msg.get('type') == 'error':
+                raise ExtractorError('crunchyroll returned error: %s' % msg['message_body'], expected=True)
+
         video_title = self._html_search_regex(r'<h1[^>]*>(.+?)</h1>', webpage, 'video_title', flags=re.DOTALL)
         video_title = re.sub(r' {2,}', ' ', video_title)
         video_description = self._html_search_regex(r'"description":"([^"]+)', webpage, 'video_description', default='')