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

Fix Acfun, add uu to Letvcloud, update key(fix #530, #495,#525, #528)

Browse Source
This commit is contained in:
cnbeining 2015-05-27 22:29:49 -04:00
parent 97f86cb96c
commit 5ebb2e05fe
2 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
src/you_get/extractors/acfun.py
View File

@ -21,37 +21,37 @@ def get_srt_lock_json(id):
url = 'http://comment.acfun.tv/%s_lock.json' % id url = 'http://comment.acfun.tv/%s_lock.json' % id
return get_html(url) return get_html(url)
# def acfun_download_by_vid(vid, title=None, output_dir='.', merge=True, info_only=False): def acfun_download_by_vid(vid, title=None, output_dir='.', merge=True, info_only=False):
# info = json.loads(get_html('http://www.acfun.tv/video/getVideo.aspx?id=' + vid)) info = json.loads(get_html('http://www.acfun.tv/video/getVideo.aspx?id=' + vid))
# sourceType = info['sourceType'] sourceType = info['sourceType']
# sourceId = info['sourceId'] sourceId = info['sourceId']
# # danmakuId = info['danmakuId'] # danmakuId = info['danmakuId']
# if sourceType == 'sina': if sourceType == 'sina':
# sina_download_by_vid(sourceId, title, output_dir=output_dir, merge=merge, info_only=info_only) sina_download_by_vid(sourceId, title, output_dir=output_dir, merge=merge, info_only=info_only)
# elif sourceType == 'youku': elif sourceType == 'youku':
# youku_download_by_vid(sourceId, title=title, output_dir=output_dir, merge=merge, info_only=info_only) youku_download_by_vid(sourceId, title=title, output_dir=output_dir, merge=merge, info_only=info_only)
# elif sourceType == 'tudou': elif sourceType == 'tudou':
# tudou_download_by_iid(sourceId, title, output_dir=output_dir, merge=merge, info_only=info_only) tudou_download_by_iid(sourceId, title, output_dir=output_dir, merge=merge, info_only=info_only)
# elif sourceType == 'qq': elif sourceType == 'qq':
# qq_download_by_id(sourceId, title, output_dir=output_dir, merge=merge, info_only=info_only) qq_download_by_id(sourceId, title, output_dir=output_dir, merge=merge, info_only=info_only)
# elif sourceType == 'letv': elif sourceType == 'letv':
# letvcloud_download_by_vu(sourceId, title, output_dir=output_dir, merge=merge, info_only=info_only) letvcloud_download_by_vu(sourceId, '2d8c027396', title, output_dir=output_dir, merge=merge, info_only=info_only)
# else: else:
# raise NotImplementedError(sourceType) raise NotImplementedError(sourceType)
# if not info_only: if not info_only:
# title = get_filename(title) title = get_filename(title)
# try: try:
# print('Downloading %s ...\n' % (title + '.cmt.json')) print('Downloading %s ...\n' % (title + '.cmt.json'))
# cmt = get_srt_json(vid) cmt = get_srt_json(vid)
# with open(os.path.join(output_dir, title + '.cmt.json'), 'w') as x: with open(os.path.join(output_dir, title + '.cmt.json'), 'w') as x:
# x.write(cmt) x.write(cmt)
# # print('Downloading %s ...\n' % (title + '.cmt_lock.json')) # print('Downloading %s ...\n' % (title + '.cmt_lock.json'))
# # cmt = get_srt_lock_json(danmakuId) # cmt = get_srt_lock_json(danmakuId)
# # with open(os.path.join(output_dir, title + '.cmt_lock.json'), 'w') as x: # with open(os.path.join(output_dir, title + '.cmt_lock.json'), 'w') as x:
# # x.write(cmt) # x.write(cmt)
# except: except:
# pass pass
@ -62,52 +62,52 @@ def get_srt_lock_json(id):
# Sometimes may find C80 but size smaller than C30 # Sometimes may find C80 but size smaller than C30
def acfun_download_by_vid(vid, title=None, output_dir='.', merge=True, info_only=False ,**kwargs): #def acfun_download_by_vid(vid, title=None, output_dir='.', merge=True, info_only=False ,**kwargs):
#api example http://jiexi.acfun.info/index.php?vid=1122870 ###api example http://jiexi.acfun.info/index.php?vid=1122870
info = json.loads(get_content("http://jiexi.acfun.info/index.php?vid={}".format(vid))) #info = json.loads(get_content("http://jiexi.acfun.info/index.php?vid={}".format(vid)))
assert info["code"] == 200 #assert info["code"] == 200
assert info["success"] == True #assert info["success"] == True
support_types = sorted(info["result"].keys(),key= lambda i: int(i[1:])) #support_types = sorted(info["result"].keys(),key= lambda i: int(i[1:]))
stream_id = None #stream_id = None
if "stream_id" in kwargs and kwargs["stream_id"] in support_types: #if "stream_id" in kwargs and kwargs["stream_id"] in support_types:
stream_id = kwargs["stream_id"] #stream_id = kwargs["stream_id"]
else: #else:
print("Current Video Supports:") #print("Current Video Supports:")
for i in support_types: #for i in support_types:
if info["result"][i]["totalbytes"] != 0: #if info["result"][i]["totalbytes"] != 0:
print("\t--format",i,"<URL>:",info["result"][i]["quality"],"size:","%.2f"% (info["result"][i]["totalbytes"] / 1024.0 /1024.0),"MB") #print("\t--format",i,"<URL>:",info["result"][i]["quality"],"size:","%.2f"% (info["result"][i]["totalbytes"] / 1024.0 /1024.0),"MB")
else: #else:
print("\t--format",i,"<URL>:",info["result"][i]["quality"]) #print("\t--format",i,"<URL>:",info["result"][i]["quality"])
#because C80 is not the best ##because C80 is not the best
if "C80" not in support_types: #if "C80" not in support_types:
stream_id = support_types[-1] #stream_id = support_types[-1]
else: #else:
stream_id = support_types[-2] #stream_id = support_types[-2]
urls = [None] * len(info["result"][stream_id]["files"]) #urls = [None] * len(info["result"][stream_id]["files"])
for i in info["result"][stream_id]["files"]: #for i in info["result"][stream_id]["files"]:
urls[i["no"]] = i["url"] #urls[i["no"]] = i["url"]
ext = info["result"][stream_id]["files"][0]["type"] #ext = info["result"][stream_id]["files"][0]["type"]
size = 0 #size = 0
for i in urls: #for i in urls:
_, _, tmp =url_info(i) #_, _, tmp =url_info(i)
size +=tmp #size +=tmp
print_info(site_info, title, ext, size) #print_info(site_info, title, ext, size)
print("Format: ",stream_id) #print("Format: ",stream_id)
print() #print()
if not info_only: #if not info_only:
download_urls(urls, title, ext, size, output_dir = output_dir, merge = merge) #download_urls(urls, title, ext, size, output_dir = output_dir, merge = merge)
title = get_filename(title) #title = get_filename(title)
try: #try:
print('Downloading %s ...\n' % (title + '.cmt.json')) #print('Downloading %s ...\n' % (title + '.cmt.json'))
cmt = get_srt_json(vid) #cmt = get_srt_json(vid)
with open(os.path.join(output_dir, title + '.cmt.json'), 'w') as x: #with open(os.path.join(output_dir, title + '.cmt.json'), 'w') as x:
x.write(cmt) #x.write(cmt)
except: #except:
pass #pass
def acfun_download(url, output_dir = '.', merge = True, info_only = False ,**kwargs): def acfun_download(url, output_dir = '.', merge = True, info_only = False ,**kwargs):
assert re.match(r'http://[^\.]+.acfun.[^\.]+/\D/\D\D(\d+)', url) assert re.match(r'http://[^\.]+.acfun.[^\.]+/\D/\D\D(\d+)', url)

20
src/you_get/extractors/letv.py
View File

@ -97,16 +97,20 @@ def letv_download_by_vid(vid,title, output_dir='.', merge=True, info_only=False,
if not info_only: if not info_only:
download_urls(urls, title, ext, size, output_dir=output_dir, merge=merge) download_urls(urls, title, ext, size, output_dir=output_dir, merge=merge)
def letvcloud_download_by_vu(vu, title=None, output_dir='.', merge=True, info_only=False): def letvcloud_download_by_vu(vu, uu, title=None, output_dir='.', merge=True, info_only=False):
str2Hash = 'cfflashformatjsonran0.7214574650861323uu2d8c027396ver2.1vu' + vu + 'bie^#@(%27eib58' #ran = float('0.' + str(random.randint(0, 9999999999999999))) # For ver 2.1
#str2Hash = 'cfflashformatjsonran{ran}uu{uu}ver2.2vu{vu}bie^#@(%27eib58'.format(vu = vu, uu = uu, ran = ran) #Magic!/ In ver 2.1
argumet_dict ={'cf' : 'flash', 'format': 'json', 'ran': str(int(time.time())), 'uu': str(uu),'ver': '2.2', 'vu': str(vu), }
sign_key = '2f9d6924b33a165a6d8b5d3d42f4f987' #ALL YOUR BASE ARE BELONG TO US
str2Hash = ''.join([i + argumet_dict[i] for i in sorted(argumet_dict)]) + sign_key
sign = hashlib.md5(str2Hash.encode('utf-8')).hexdigest() sign = hashlib.md5(str2Hash.encode('utf-8')).hexdigest()
request_info = urllib.request.Request('http://api.letvcloud.com/gpc.php?&sign='+sign+'&cf=flash&vu='+vu+'&ver=2.1&ran=0.7214574650861323&qr=2&format=json&uu=2d8c027396') request_info = urllib.request.Request('http://api.letvcloud.com/gpc.php?' + '&'.join([i + '=' + argumet_dict[i] for i in argumet_dict]) + '&sign={sign}'.format(sign = sign))
response = urllib.request.urlopen(request_info) response = urllib.request.urlopen(request_info)
data = response.read() data = response.read()
info = json.loads(data.decode('utf-8')) info = json.loads(data.decode('utf-8'))
type_available = [] type_available = []
for i in info['data']['video_info']['media']: for video_type in info['data']['video_info']['media']:
type_available.append({'video_url': info['data']['video_info']['media'][i]['play_url']['main_url'], 'video_quality': int(info['data']['video_info']['media'][i]['play_url']['vtype'])}) type_available.append({'video_url': info['data']['video_info']['media'][video_type]['play_url']['main_url'], 'video_quality': int(info['data']['video_info']['media'][video_type]['play_url']['vtype'])})
urls = [base64.b64decode(sorted(type_available, key = lambda x:x['video_quality'])[-1]['video_url']).decode("utf-8")] urls = [base64.b64decode(sorted(type_available, key = lambda x:x['video_quality'])[-1]['video_url']).decode("utf-8")]
size = urls_size(urls) size = urls_size(urls)
ext = 'mp4' ext = 'mp4'
@ -118,10 +122,14 @@ def letvcloud_download(url, output_dir='.', merge=True, info_only=False):
for i in url.split('&'): for i in url.split('&'):
if 'vu=' in i: if 'vu=' in i:
vu = i[3:] vu = i[3:]
if 'uu=' in i:
uu = i[3:]
if len(vu) == 0: if len(vu) == 0:
raise ValueError('Cannot get vu!') raise ValueError('Cannot get vu!')
if len(uu) == 0:
raise ValueError('Cannot get uu!')
title = "LETV-%s" % vu title = "LETV-%s" % vu
letvcloud_download_by_vu(vu, title=title, output_dir=output_dir, merge=merge, info_only=info_only) letvcloud_download_by_vu(vu, uu, title=title, output_dir=output_dir, merge=merge, info_only=info_only)
def letv_download(url, output_dir='.', merge=True, info_only=False ,**kwargs): def letv_download(url, output_dir='.', merge=True, info_only=False ,**kwargs):
if re.match(r'http://yuntv.letv.com/', url): if re.match(r'http://yuntv.letv.com/', url):