X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fbliptv.py;h=2370c24b06eb9b9547fbc822a413405b2223ae42;hb=939fe70de064130330b137da86a11c1f7a78af24;hp=4e80d829345a644158f535df8abfcb0e36d9c018;hpb=8f9b683eeb01eb60c6cf8373f0429a7f560faa1c;p=youtube-dl diff --git a/youtube_dl/extractor/bliptv.py b/youtube_dl/extractor/bliptv.py index 4e80d8293..2370c24b0 100644 --- a/youtube_dl/extractor/bliptv.py +++ b/youtube_dl/extractor/bliptv.py @@ -15,7 +15,7 @@ from ..utils import ( class BlipTVIE(SubtitlesInfoExtractor): - _VALID_URL = r'https?://(?:\w+\.)?blip\.tv/(?:(?:.+-|rss/flash/)(?P\d+)|((?:play/|api\.swf#)(?P[\da-zA-Z+]+)))' + _VALID_URL = r'https?://(?:\w+\.)?blip\.tv/(?:(?:.+-|rss/flash/)(?P\d+)|((?:play/|api\.swf#)(?P[\da-zA-Z+_]+)))' _TESTS = [ { @@ -71,11 +71,12 @@ class BlipTVIE(SubtitlesInfoExtractor): mobj = re.match(self._VALID_URL, url) lookup_id = mobj.group('lookup_id') - # See https://github.com/rg3/youtube-dl/issues/857 + # See https://github.com/rg3/youtube-dl/issues/857 and + # https://github.com/rg3/youtube-dl/issues/4197 if lookup_id: info_page = self._download_webpage( 'http://blip.tv/play/%s.x?p=1' % lookup_id, lookup_id, 'Resolving lookup id') - video_id = self._search_regex(r'data-episode-id="([0-9]+)', info_page, 'video_id') + video_id = self._search_regex(r'config\.id\s*=\s*"([0-9]+)', info_page, 'video_id') else: video_id = mobj.group('id')