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

Update bilibili.py

Browse Source
This commit is contained in:
ZhangXinYang 2016-08-29 15:55:46 +08:00 committed by GitHub
parent 419bf5314f
commit 815b5f2fa6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/bilibili.py
View File

@ -1,11 +1,11 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import urllib2
import calendar import calendar
import datetime import datetime
import re import re
import json
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import ( from ..compat import (
@ -87,8 +87,8 @@ class BiliBiliIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
api = 'http://www.bilibili.com/m/html5?aid=%s&page=1' % video_id api = 'http://www.bilibili.com/m/html5?aid=%s&page=1' % video_id
info = json.loads(self._download_webpage(api,video_id)) info = self._download_json(api,video_id)
url = info['src'] urlh = info['src']
params = compat_parse_qs(self._search_regex( params = compat_parse_qs(self._search_regex(
[r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)', [r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)',
@ -96,13 +96,12 @@ class BiliBiliIE(InfoExtractor):
webpage, 'player parameters')) webpage, 'player parameters'))
cid = params['cid'][0] cid = params['cid'][0]
response = urllib2.Request(url) request_headers =self. _request_webpage(urlh,video_id).headers
html = urllib2.urlopen(response) size = request_headers['Content-Length']
size = html.headers['Content-Length']
entries = [] entries = []
formats = [{ formats = [{
'url': url, 'url': urlh,
'filesize': int_or_none(size), 'filesize': int_or_none(size),
}] }]