R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[BlipTVIE] Fix extraction of embedded videos

Browse Source
This commit is contained in:
rzhxeo 2013-12-17 22:28:06 +01:00
parent bf5700e2cf
commit 539447f621
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/bliptv.py
View File

@ -54,18 +54,12 @@ class BlipTVIE(InfoExtractor):
raise ExtractorError(u'Invalid URL: %s' % url) raise ExtractorError(u'Invalid URL: %s' % url)
# See https://github.com/rg3/youtube-dl/issues/857 # See https://github.com/rg3/youtube-dl/issues/857
api_mobj = re.match(r'http://a\.blip\.tv/api\.swf#(?P<video_id>[\d\w]+)', url) embed_mobj = re.search(r'^(?:https?://)?(?:\w+\.)?blip.tv/(?:play/|api\.swf#)([a-zA-Z0-9]+)', url)
if api_mobj is not None: if embed_mobj:
url = 'http://blip.tv/play/g_%s' % api_mobj.group('video_id') info_url = 'http://blip.tv/play/%s.x?p=1' % embed_mobj.group(1)
urlp = compat_urllib_parse_urlparse(url) info_page = self._download_webpage(info_url, None)
if urlp.path.startswith('/play/'): video_id = self._search_regex(r'data-episode-id="(\d+)', info_page, u'video_id')
response = self._request_webpage(url, None, False) return self.url_result('http://blip.tv/a/a-'+video_id, 'BlipTV')
redirecturl = response.geturl()
rurlp = compat_urllib_parse_urlparse(redirecturl)
file_id = compat_parse_qs(rurlp.fragment)['file'][0].rpartition('/')[2]
url = 'http://blip.tv/a/a-' + file_id
return self._real_extract(url)
if '?' in url: if '?' in url:
cchar = '&' cchar = '&'