2 Commits

Author SHA1 Message Date
e4fef3df33 修复:脑子不够用 判断反了 2019-02-01 19:37:03 +08:00
54fa20c4f7 紧急更新:新礼物模板 2019-02-01 19:36:42 +08:00
2 changed files with 8 additions and 7 deletions

View File

@ -6,7 +6,7 @@ class Gift:
ID:int = 0 ID:int = 0
count:int = 0 count:int = 0
roomID:int = 0 roomID:int = 0
giftList:dict = {10001: {"Name": "西瓜", "Price": 0}} giftList:dict = {}
amount:int = 0 amount:int = 0
user:User = None user:User = None
@ -33,7 +33,8 @@ class Gift:
self.update() self.update()
def update(self): def update(self):
p = requests.get("https://i.snssdk.com/videolive/gift/get_gift_list?room_id={roomID}".format(roomID = self.roomID)) p = requests.get("https://i.snssdk.com/videolive/gift/get_gift_list?room_id={roomID}"
"&version_code=730&device_platform=android".format(roomID = self.roomID))
d = p.json() d = p.json()
if "gift_info" not in d: if "gift_info" not in d:
print("错误:礼物更新失败") print("错误:礼物更新失败")

View File

@ -24,7 +24,7 @@ class downloader(XiGuaLiveApi):
def updPlayList(self): def updPlayList(self):
if self.isLive: if self.isLive:
if "stream_url" not in self._rawRoomInfo: if "stream_url" in self._rawRoomInfo:
if self.playlist is None: if self.playlist is None:
self.apiChangedError("无法获取直播链接") self.apiChangedError("无法获取直播链接")
self.playlist = False self.playlist = False
@ -79,8 +79,11 @@ class downloader(XiGuaLiveApi):
print("{} : Add Sequence {}".format(datetime.strftime(datetime.now(), "%y%m%d %H%M"), print("{} : Add Sequence {}".format(datetime.strftime(datetime.now(), "%y%m%d %H%M"),
len(self.files))) len(self.files)))
q.put(i) q.put(i)
else:
print("PlayList {}".format(self.playlist))
self.genNewName() self.genNewName()
def genNewName(self): def genNewName(self):
if len(self.files) > 800: if len(self.files) > 800:
q.put(True) q.put(True)
@ -169,10 +172,7 @@ if __name__ == "__main__":
ut = threading.Thread(target=upload, args=(d,)) ut = threading.Thread(target=upload, args=(d,))
ut.setDaemon(True) ut.setDaemon(True)
ut.start() ut.start()
try: api.preDownload()
api.preDownload()
except:
pass
time.sleep(3) time.sleep(3)
else: else:
if d is not None: if d is not None: