Merge branch 'yinyuetai-api' into develop

This commit is contained in:
Mort Yao 2015-09-04 00:19:12 +02:00
commit 7bdf8af620

View File

@ -4,15 +4,11 @@ __all__ = ['yinyuetai_download', 'yinyuetai_download_by_id']
from ..common import * from ..common import *
def yinyuetai_download_by_id(id, title = None, output_dir = '.', merge = True, info_only = False): def yinyuetai_download_by_id(vid, title=None, output_dir='.', merge=True, info_only=False):
assert title video_info = json.loads(get_html('http://www.yinyuetai.com/insite/get-video-info?json=true&videoId=%s' % vid))
html = get_html('http://www.yinyuetai.com/insite/get-video-info?flex=true&videoId=' + id) url_models = video_info['videoInfo']['coreVideoInfo']['videoUrlModels']
url_models = sorted(url_models, key=lambda i: i['qualityLevel'])
for quality in ['he\w*', 'hd\w*', 'hc\w*', '\w+']: url = url_models[-1]['videoUrl']
url = r1(r'(http://' + quality + '\.yinyuetai\.com/uploads/videos/common/\w+\.(?:flv|mp4)\?(?:sc=[a-f0-9]{16}|v=\d{12}))', html)
if url:
break
assert url
type = ext = r1(r'\.(flv|mp4)', url) type = ext = r1(r'\.(flv|mp4)', url)
_, _, size = url_info(url) _, _, size = url_info(url)
@ -20,7 +16,7 @@ def yinyuetai_download_by_id(id, title = None, output_dir = '.', merge = True, i
if not info_only: if not info_only:
download_urls([url], title, ext, size, output_dir, merge = merge) download_urls([url], title, ext, size, output_dir, merge = merge)
def yinyuetai_download(url, output_dir = '.', merge = True, info_only = False): def yinyuetai_download(url, output_dir='.', merge=True, info_only=False):
id = r1(r'http://\w+.yinyuetai.com/video/(\d+)$', url.split('?')[0]) id = r1(r'http://\w+.yinyuetai.com/video/(\d+)$', url.split('?')[0])
assert id assert id
html = get_html(url, 'utf-8') html = get_html(url, 'utf-8')