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

Fix for some streams on panda.tv which was in some way banned.

Browse Source 
some small fixes

fix for #1612

small fix.

another small fix.

Rewrote it to not use requests

Updated the panda.tv plugin to use api v2
This commit is contained in:
Valdemar Erk 2017-01-04 12:08:43 +01:00
parent fe2720544a
commit b8d86ae2cf
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/you_get/extractors/panda.py
View File

@ -8,22 +8,28 @@ import time
def panda_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): def panda_download(url, output_dir = '.', merge = True, info_only = False, **kwargs):
roomid = url[url.rfind('/')+1:] roomid = url[url.rfind('/')+1:]
json_request_url = 'http://www.panda.tv/api_room?roomid={}&pub_key=&_={}'.format(roomid, int(time.time())) json_request_url ="http://www.panda.tv/api_room_v2?roomid={}&__plat=pc_web&_={}".format(roomid, int(time.time()))
content = get_html(json_request_url) content = get_html(json_request_url)
errno = json.loads(content)['errno'] api_json = json.loads(content)
errmsg = json.loads(content)['errmsg']
errno = api_json["errno"]
errmsg = api_json["errmsg"]
if errno: if errno:
raise ValueError("Errno : {}, Errmsg : {}".format(errno, errmsg)) raise ValueError("Errno : {}, Errmsg : {}".format(errno, errmsg))
data = api_json["data"]
data = json.loads(content)['data'] title = data["roominfo"]["name"]
title = data.get('roominfo')['name'] room_key = data["videoinfo"]["room_key"]
room_key = data.get('videoinfo')['room_key'] plflag = data["videoinfo"]["plflag"].split("_")
plflag = data.get('videoinfo')['plflag'].split('_') status = data["videoinfo"]["status"]
status = data.get('videoinfo')['status']
if status is not "2": if status is not "2":
raise ValueError("The live stream is not online! (status:%s)" % status) raise ValueError("The live stream is not online! (status:%s)" % status)
real_url = 'http://pl{}.live.panda.tv/live_panda/{}.flv'.format(plflag[1],room_key)
data2 = json.loads(data["videoinfo"]["plflag_list"])
rid = data2["auth"]["rid"]
sign = data2["auth"]["sign"]
ts = data2["auth"]["time"]
real_url = "http://pl{}.live.panda.tv/live_panda/{}.flv?sign={}&ts={}&rid={}".format(plflag[1], room_key, sign, ts, rid)
print_info(site_info, title, 'flv', float('inf')) print_info(site_info, title, 'flv', float('inf'))
if not info_only: if not info_only:
download_urls([real_url], title, 'flv', None, output_dir, merge = merge) download_urls([real_url], title, 'flv', None, output_dir, merge = merge)