From: Sergey M. Date: Tue, 25 Feb 2014 13:29:16 +0000 (+0700) Subject: [crunchyroll] Handle error message X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=1d430674c7ad8341d2025f43f93c4f582d1f92ea;p=youtube-dl [crunchyroll] Handle error message --- diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py index 44d78fe5e..5587ade12 100644 --- a/youtube_dl/extractor/crunchyroll.py +++ b/youtube_dl/extractor/crunchyroll.py @@ -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{.+?})\]\)', 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']*>(.+?)', 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='')