MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-28 06:26:50 +01:00
Code Issues Releases Wiki Activity

[viki] Skip travis test

Browse Source 
Also provide a better error message for geoblocked videos.
This commit is contained in:
Philipp Hagemeister 2013-11-24 15:28:33 +01:00
parent b7553b2554
commit 6d88bc37a3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/viki.py
View File

@ -1,6 +1,7 @@
import re import re
from ..utils import ( from ..utils import (
ExtractorError,
unified_strdate, unified_strdate,
) )
from .subtitles import SubtitlesInfoExtractor from .subtitles import SubtitlesInfoExtractor
@ -20,7 +21,8 @@ class VikiIE(SubtitlesInfoExtractor):
u'description': u'md5:c4b17b9626dd4b143dcc4d855ba3474e', u'description': u'md5:c4b17b9626dd4b143dcc4d855ba3474e',
u'upload_date': u'20131121', u'upload_date': u'20131121',
u'age_limit': 13, u'age_limit': 13,
} },
u'skip': u'Blocked in the US',
} }
def _real_extract(self, url): def _real_extract(self, url):
@ -53,6 +55,10 @@ class VikiIE(SubtitlesInfoExtractor):
info_url = 'http://www.viki.com/player5_fragment/%s?action=show&controller=videos' % video_id info_url = 'http://www.viki.com/player5_fragment/%s?action=show&controller=videos' % video_id
info_webpage = self._download_webpage( info_webpage = self._download_webpage(
info_url, video_id, note=u'Downloading info page') info_url, video_id, note=u'Downloading info page')
if re.match(r'\s*<div\s+class="video-error', info_webpage):
raise ExtractorError(
u'Video %s is blocked from your location.' % video_id,
expected=True)
video_url = self._html_search_regex( video_url = self._html_search_regex(
r'<source[^>]+src="([^"]+)"', info_webpage, u'video URL') r'<source[^>]+src="([^"]+)"', info_webpage, u'video URL')