w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[viki] Enhance error message handling (#3774)

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-05-02 00:32:46 +08:00
parent 8e3df9dfee
commit 89966a5aea
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youtube_dl/extractor/viki.py
View file

@ -11,6 +11,7 @@ from ..utils import (
unescapeHTML, unescapeHTML,
unified_strdate, unified_strdate,
US_RATINGS, US_RATINGS,
clean_html,
) )
from .common import InfoExtractor from .common import InfoExtractor
@ -71,10 +72,15 @@ class VikiIE(InfoExtractor):
req.add_header('User-Agent', self._USER_AGENT) req.add_header('User-Agent', self._USER_AGENT)
info_webpage = self._download_webpage( info_webpage = self._download_webpage(
req, video_id, note='Downloading info page') req, video_id, note='Downloading info page')
if re.match(r'\s*<div\s+class="video-error', info_webpage): err_msg = self._html_search_regex(r'<div[^>]+class="video-error[^>]+>(.+)</div>', info_webpage, 'error message', default=None)
raise ExtractorError( if err_msg:
'Video %s is blocked from your location.' % video_id, err_msg = clean_html(err_msg)
expected=True) 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( video_url = self._html_search_regex(
r'<source[^>]+src="([^"]+)"', info_webpage, 'video URL') r'<source[^>]+src="([^"]+)"', info_webpage, 'video URL')