From 89966a5aeacb70cc19b0a87a0514be824d2409af Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Sat, 2 May 2015 00:32:46 +0800 Subject: [PATCH] [viki] Enhance error message handling (#3774) --- youtube_dl/extractor/viki.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py index 957e3c01e..0fc1ceb19 100644 --- a/youtube_dl/extractor/viki.py +++ b/youtube_dl/extractor/viki.py @@ -11,6 +11,7 @@ unescapeHTML, unified_strdate, US_RATINGS, + clean_html, ) from .common import InfoExtractor @@ -71,10 +72,15 @@ def _real_extract(self, url): req.add_header('User-Agent', self._USER_AGENT) info_webpage = self._download_webpage( req, video_id, note='Downloading info page') - if re.match(r'\s*]+class="video-error[^>]+>(.+)', info_webpage, 'error message', default=None) + if err_msg: + err_msg = clean_html(err_msg) + if 'not available in your region' in err_msg: + raise ExtractorError( + 'Video %s is blocked from your location.' % video_id, + expected=True) + else: + raise ExtractorError('Viki said: ' + err_msg) video_url = self._html_search_regex( r']+src="([^"]+)"', info_webpage, 'video URL')