Merge pull request #20 from lifegpc/dev

v1.1.6 dev

Author: lifegpc

JSONParser.py

@@ -153,203 +153,3 @@ def getset(d:dict,key:str) :
         return d[key]
     else :
         return None
-def getplinfo(d:dict) :
-    t=d['data']['info']
-    r={}
-    r['id']=t['id']
-    r['fid']=t['fid']
-    r['uid']=t['mid']
-    r['title']=t['title']
-    r['author']=t['upper']['name']
-    r['ctime']=t['ctime']
-    r['mtime']=t['mtime']
-    r['count']=t['media_count']
-    return r
-def getpli(r,f,i,d:dict):
-    uri='https://api.bilibili.com/x/v3/fav/resource/list?media_id=%s&pn=%s&ps=20&keyword=%s&order=mtime&type=%s&tid=0&jsonp=jsonp'%(f,i,d['k'],d['t'])
-    bs=True
-    while bs :
-        try :
-            re=r.get(uri)
-            bs=False
-        except :
-            print('获取收藏夹第%s页失败，正在重试……'%(i))
-    re.encoding='utf8'
-    re=re.json()
-    if re['code']!=0 :
-        print('%s %s'%(re['code'],re['message']))
-        return -1
-    return re
-def getpliv(i:list,d:dict):
-    for t in d['data']['medias']:
-        r={}
-        r['id']=t['id']
-        r['title']=t['title']
-        r['page']=t['page']
-        r['duration']=t['duration']
-        r['uid']=t['upper']['mid']
-        r['author']=t['upper']['name']
-        r['collect']=t['cnt_info']['collect']
-        r['danmuku']=t['cnt_info']['danmaku']
-        r['play']=t['cnt_info']['play']
-        r['bvid']=t['bvid']
-        r['ctime']=t['ctime']
-        r['pubtime']=t['pubtime']
-        r['ftime']=t['fav_time']
-        i.append(r)
-def getchl(d:dict)->list:
-    r=[]
-    for i in d['data']['list'] :
-        t={}
-        t['cid']=i['cid']
-        t['name']=i['name']
-        t['intro']=i['intro']
-        t['mtime']=i['mtime']
-        t['count']=i['count']
-        r.append(t)
-    return r
-def getchi(r:Session,u:int,c:int,n:int):
-    uri="https://api.bilibili.com/x/space/channel/video?mid=%s&cid=%s&pn=%s&ps=30&order=0&jsonp=jsonp"%(u,c,n)
-    bs=True
-    while bs :
-        try :
-            re=r.get(uri)
-            bs=False
-        except :
-            print('获取频道第%s页失败，正在重试……'%(n))
-    re.encoding='utf8'
-    re=re.json()
-    if re['code']!=0 :
-        print('%s %s'%(re['code'],re['message']))
-        return -1
-    return re
-def getchn(d:dict)->dict:
-    i=d['data']['list']
-    r={}
-    r['cid']=i['cid']
-    r['name']=i['name']
-    r['intro']=i['intro']
-    r['mtime']=i['mtime']
-    r['count']=i['count']
-    return r
-def getchs(l:list,d:dict):
-    for t in d['data']['list']['archives'] :
-        r={}
-        r['aid']=t['aid']
-        r['videos']=t['videos']
-        r['title']=t['title']
-        r['pubdate']=t['pubdate']
-        r['ctime']=t['ctime']
-        r['desc']=t['desc']
-        r['cid']=t['cid']
-        r['bvid']=t['bvid']
-        l.append(r)
-def getsub(d:dict,z:dict):
-    t=d['subtitles']
-    if len(t)>0 :
-        r=[]
-        for i in t:
-            e={}
-            e['lan']=i['lan']
-            e['land']=i['lan_doc']
-            e['url']="https:%s"%(i['subtitle_url'])
-            r.append(e)
-        z['sub']=r
-def getuvi(u:int,n:int,d:dict,r:Session):
-    uri="https://api.bilibili.com/x/space/arc/search?mid=%s&ps=30&tid=%s&pn=%s&keyword=%s&order=%s&jsonp=jsonp"%(u,d['t'],n,d['k'],d['o'])
-    bs=True
-    while bs:
-        try :
-            re=r.get(uri)
-            bs=False
-        except :
-            print('获取第%s页失败，正在重试……'%(n))
-    re=re.json()
-    if re['code']!=0 :
-        print('%s %s'%(re['code'],re['message']))
-        return -1
-    return re
-def getuvl(d:dict,l:list):
-    for t in d['data']['list']['vlist']:
-        r={}
-        r['aid']=t['aid']
-        r['bvid']=t['bvid']
-        r['title']=t['title']
-        r['description']=t['description']
-        r['ctime']=t['created']
-        l.append(r)
-def getup(u:int,r:Session) :
-    uri="https://api.bilibili.com/x/space/acc/info?mid=%s&jsonp=jsonp"%(u)
-    bs=True
-    while bs:
-        try :
-            re=r.get(uri)
-            bs=False
-        except :
-            print('获取uid为%s的UP主信息失败，正在重试……'%(u))
-    re=re.json()
-    if re['code']!=0 :
-        print('%s %s'%(re['code'],re['message']))
-        return -1
-    return re
-def getupi(d:dict)->dict :
-    r={}
-    q=d['data']
-    r['n']=q['name']
-    r['s']=q['sex']
-    r['l']=q['level']
-    r['sign']=q['sign']
-    r['b']=q['birthday']
-    return r
-def getsmi(d:dict)->dict :
-    "获取小视频信息"
-    r={}
-    if 'data' in d :
-        if 'item' in d['data'] :
-            x=d['data']['item']
-            r['backup_playurl']=x['backup_playurl']
-            r['description']=x['description']
-            r['id']=x['id']
-            r['height']=x['height']
-            r['reply']=x['reply']
-            r['tags']=x['tags']
-            r['upload_time']=x['upload_time']
-            r['video_playurl']=x['video_playurl']
-            r['video_time']=x['video_time']
-            r['width']=x['width']
-        if 'user' in d['data'] :
-            x=d['data']['user']
-            r['name']=x['name']
-            r['uid']=x['uid']
-    return r
-def getlr1(d:dict) -> dict :
-    "获取直播回放信息"
-    r={}
-    t=d['data']
-    r['dm']=t['dm_info']
-    t=t['live_record_info']
-    r['rid']=t['rid']
-    r['roomid']=t['room_id']
-    r['uid']=t['uid']
-    r['title']=t['title']
-    r['areaid']=t['area_id']
-    r['pareaid']=t['parent_area_id']
-    r['st']=t['start_timestamp']
-    r['et']=t['end_timestamp']
-    r['online']=t['online']
-    r['danmunum']=t['danmu_num']
-    return r
-def getlr2(d:dict,r:dict) :
-    "获得房间信息（可能与当前回放信息不同）"
-    t=d['data']
-    r['des']=t['description']
-    r['arean']=t['area_name']
-    r['parean']=t['parent_area_name']
-    r['tags']=t['tags']
-    r['hotwords']=t['hot_words']
-def getlr3(d:dict,r:dict):
-    "获得UP主信息"
-    t=d['data']
-    r['name']=t['name']
-    r['sex']=t['sex']
-    r['sign']=t['sign']