Mirrors
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use proper urlparse functions and simplify a bit

This commit is contained in:
Philipp Hagemeister 2013-03-03 22:09:44 +01:00
parent f2e237adc8
commit f7b567ff84
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/InfoExtractors.py
View File

@ -2165,20 +2165,16 @@ class BlipTVIE(InfoExtractor):
self._downloader.trouble(u'ERROR: invalid URL: %s' % url) self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
return return
if '/play/' in url: urlp = compat_urllib_parse_urlparse(url)
if urlp.path.startswith('/play/'):
request = compat_urllib_request.Request(url) request = compat_urllib_request.Request(url)
response = compat_urllib_request.urlopen(request) response = compat_urllib_request.urlopen(request)
redirecturl = response.geturl() redirecturl = response.geturl()
hashindex = redirecturl.find('#') rurlp = compat_urllib_parse_urlparse(redirecturl)
if hashindex!=-1: file_id = compat_parse_qs(rurlp.fragment)['file'][0].rpartition('/')[2]
hash = redirecturl[hashindex+1:] url = 'http://blip.tv/a/a-' + file_id
params = compat_parse_qs(hash) return self._real_extract(url)
files = params['file']
for file in files:
match = re.search('/(\d+)',file)
if match:
file_id = match.group(1)
url = 'http://blip.tv/a/a-'+file_id
if '?' in url: if '?' in url:
cchar = '&' cchar = '&'