PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-01-24 05:55:02 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

fix bilibili video type check error

Browse Source
This commit is contained in:
jackyzy823 2015-05-26 22:59:19 +08:00
parent 9e567e7954
commit 4539fd161a
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/you_get/extractors/bilibili.py
View File

@ -79,23 +79,15 @@ def bilibili_download_by_cids(cids, title, output_dir='.', merge=True, info_only
else re.sub(r'.*\.qqvideo\.tc\.qq\.com', 'http://vsrc.store.qq.com', i) else re.sub(r'.*\.qqvideo\.tc\.qq\.com', 'http://vsrc.store.qq.com', i)
for i in parse_cid_playurl(get_content(url, headers=client))] for i in parse_cid_playurl(get_content(url, headers=client))]
if re.search(r'\.(flv|hlv)\b', urls[0]): type_ = ''
type = 'flv'
elif re.search(r'/flv/', urls[0]):
type = 'flv'
elif re.search(r'/mp4/', urls[0]):
type = 'mp4'
else:
type = 'flv'
size = 0 size = 0
for url in urls: for url in urls:
_, _, temp = url_info(url) _, type_, temp = url_info(url)
size += temp size += temp
print_info(site_info, title, type, size) print_info(site_info, title, type_, size)
if not info_only: if not info_only:
download_urls(urls, title, type, total_size=None, output_dir=output_dir, merge=merge) download_urls(urls, title, type_, total_size=None, output_dir=output_dir, merge=merge)
def bilibili_download_by_cid(id, title, output_dir='.', merge=True, info_only=False): def bilibili_download_by_cid(id, title, output_dir='.', merge=True, info_only=False):
sign_this = hashlib.md5(bytes('appkey=' + appkey + '&cid=' + id + secretkey, 'utf-8')).hexdigest() sign_this = hashlib.md5(bytes('appkey=' + appkey + '&cid=' + id + secretkey, 'utf-8')).hexdigest()
@ -105,23 +97,15 @@ def bilibili_download_by_cid(id, title, output_dir='.', merge=True, info_only=Fa
else re.sub(r'.*\.qqvideo\.tc\.qq\.com', 'http://vsrc.store.qq.com', i) else re.sub(r'.*\.qqvideo\.tc\.qq\.com', 'http://vsrc.store.qq.com', i)
for i in parse_cid_playurl(get_content(url, headers=client))] for i in parse_cid_playurl(get_content(url, headers=client))]
if re.search(r'\.(flv|hlv)\b', urls[0]): type_ = ''
type = 'flv'
elif re.search(r'/flv/', urls[0]):
type = 'flv'
elif re.search(r'/mp4/', urls[0]):
type = 'mp4'
else:
type = 'flv'
size = 0 size = 0
for url in urls: for url in urls:
_, _, temp = url_info(url) _, type_, temp = url_info(url)
size += temp or 0 size += temp or 0
print_info(site_info, title, type, size) print_info(site_info, title, type_, size)
if not info_only: if not info_only:
download_urls(urls, title, type, total_size=None, output_dir=output_dir, merge=merge) download_urls(urls, title, type_, total_size=None, output_dir=output_dir, merge=merge)
def bilibili_download(url, output_dir='.', merge=True, info_only=False): def bilibili_download(url, output_dir='.', merge=True, info_only=False):
html = get_html(url) html = get_html(url)