q792602257/XiguaLiveDanmakuHelper
Archived
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

灵活下播判断

Browse Source
This commit is contained in:
Jerry Yan 2020-01-09 09:26:04 +08:00
parent 0f71209fe8
commit 74120850a4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Common.py
View File

@ -153,7 +153,6 @@ dt_format = "%Y/%m/%d %H:%M:%S"
reloadConfig() reloadConfig()
broadcaster = "" broadcaster = ""
streamUrl = "" streamUrl = ""
isBroadcasting = False
updateTime = "" updateTime = ""
forceNotDownload = False forceNotDownload = False
@ -308,16 +307,15 @@ class downloader(XiGuaLiveApi):
playlist = None playlist = None
def updRoomInfo(self, force=False): def updRoomInfo(self, force=False):
global broadcaster, isBroadcasting, updateTime global broadcaster, updateTime
_prev_status = self.isLive _prev_status = self.isLive
doClean() doClean()
_result = super(downloader, self).updRoomInfo(force) _result = super(downloader, self).updRoomInfo(force)
updateTime = datetime.strftime(datetime.now(), dt_format) updateTime = datetime.now().strftime(dt_format)
if _prev_status != self.isLive: if _prev_status != self.isLive:
resetDelay() resetDelay()
if _result: if _result:
broadcaster = self.broadcaster broadcaster = self.broadcaster
isBroadcasting = self.isLive
if self.isLive: if self.isLive:
self.updPlayList() self.updPlayList()
else: else:
@ -397,7 +395,7 @@ def collectInfomation():
"operation": operations, "operation": operations,
"broadcast": { "broadcast": {
"broadcaster": broadcaster.__str__(), "broadcaster": broadcaster.__str__(),
"isBroadcasting": isBroadcasting, "isBroadcasting": api.isLive,
"streamUrl": streamUrl, "streamUrl": streamUrl,
"updateTime": updateTime, "updateTime": updateTime,
"delayTime": delay.strftime(dt_format) "delayTime": delay.strftime(dt_format)

2
api.py
View File

@ -176,6 +176,7 @@ class XiGuaLiveApi:
:return: :return:
""" """
if self.broadcaster is None: if self.broadcaster is None:
self.isValidUser = False
return False return False
_formatData = {"COMMON": COMMON_GET_PARAM, "TIMESTAMP": time.time() * 1000, "userId": self.broadcaster.ID} _formatData = {"COMMON": COMMON_GET_PARAM, "TIMESTAMP": time.time() * 1000, "userId": self.broadcaster.ID}
_url = USER_INFO_API.format_map(_formatData).format_map(_formatData) _url = USER_INFO_API.format_map(_formatData).format_map(_formatData)
@ -199,6 +200,7 @@ class XiGuaLiveApi:
def _getRoomInfo(self, force=False): def _getRoomInfo(self, force=False):
if self.roomID == 0: if self.roomID == 0:
self.isLive = False
return False return False
if not force or (self._updRoomAt + timedelta(minutes=2) > datetime.now()): if not force or (self._updRoomAt + timedelta(minutes=2) > datetime.now()):
return self.isLive return self.isLive