From d05125095919191aa7ea8065e6a6d00153b50867 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 31 Dec 2019 15:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/api.py b/api.py index 4d15c87..8b6cbfe 100644 --- a/api.py +++ b/api.py @@ -30,16 +30,10 @@ COMMON_HEADERS = { class XiGuaLiveApi: - isLive = False - isValidRoom = False - _rawRoomInfo = {} - name = "" - roomID = 0 - roomLiver = None - roomPopularity = 0 - _cursor = "0" - lottery = None - s = requests.session() + isValidRoom: bool + isLive: bool + roomLiver: User or None + roomID: int def __init__(self, name=None): """ @@ -54,6 +48,14 @@ class XiGuaLiveApi: self.name = name.name else: self.name = str(name) + self.isLive = False + self.isValidRoom = False + self._rawRoomInfo = {} + self.roomID = 0 + self.roomLiver = None + self.roomPopularity = 0 + self._cursor = "0" + self.s = requests.session() self.s.headers.update(COMMON_HEADERS) self._updRoomAt = datetime.now() self.updRoomInfo(True) @@ -145,7 +147,7 @@ class XiGuaLiveApi: if not force and self._updRoomAt > (datetime.now() - timedelta(minutes=3)): return self.isLive self._updRoomAt = datetime.now() - if self.isLive: + if self.isValidRoom: return self._updateUserOnly() else: return self._forceSearchUser()