改善代码兼容性

Common.py

@@ -114,7 +114,7 @@ def appendError(obj):
 
 class downloader(XiGuaLiveApi):
     files = []
-    playlist: str = None
+    playlist = None
 
     def updRoomInfo(self):
         global broadcaster, isBroadcasting, updateTime

Struct/Chat.py

@@ -4,9 +4,9 @@ from .Lottery import Lottery
 
 class Chat:
 
-    content: str =""
+    content =""
-    user:    User=None
+    user=None
-    filterString:list = ["",]
+    filterString = ["",]
     isFiltered = False
 
     def __init__(self, json=None, lottery:Lottery = None):

Struct/Gift.py

@@ -3,12 +3,12 @@ from .User import User
 
 
 class Gift:
-    ID:int = 0
+    ID = 0
-    count:int = 0
+    count = 0
-    roomID:int = 0
+    roomID = 0
-    giftList:dict = {}
+    giftList = {}
-    amount:int = 0
+    amount = 0
-    user:User = None
+    user = None
 
     def __init__(self, json=None):
         if json:

Struct/Lottery.py

@@ -5,14 +5,14 @@ from .LuckyUser import LuckyUser
 
 
 class Lottery:
-    ID: int = 0
+    ID = 0
     isActive = False
     content = ""
     isFinished = False
     luckyUsers = []
     joinedUserCount = 0
     prizeName = ""
-    finish:int = 0
+    finish = 0
 
     def __init__(self, json=None):
         if json:

Struct/MemberMsg.py

@@ -2,9 +2,9 @@ from .User import User
 
 
 class MemberMsg:
-    type:int = 0
+    type = 0
-    content:str = ""
+    content = ""
-    user:User = None
+    user = None
 
     def __init__(self, json=None):
         if json:

Struct/User.py

@@ -1,11 +1,11 @@
 class User:
-    ID:     int = 0
+    ID = 0
-    name:   str = ""
+    name = ""
-    brand:  str = ""
+    brand = ""
-    level:  int = 0
+    level = 0
-    type:   int = 0
+    type = 0
-    block: bool = False
+    block = False
-    mute:  bool = False
+    mute = False
 
     def __init__(self, json=None):
         if json:
@@ -51,4 +51,3 @@ class User:
 
     def __unicode__(self):
         return self.__str__()
-

WebMain.py

@@ -1,3 +1,5 @@
+from time import sleep
+
 from flask import Flask, jsonify, request
 import Common
 import threading
@@ -39,6 +41,18 @@ def getAllStats():
     }})
 
 
+@app.route("/stats/broadcast", methods=["GET"])
+def geBroadcastStats():
+    return jsonify({"message":"ok","code":200,"status":0,"data":{
+        "broadcast": {
+            "broadcaster": Common.broadcaster.__str__(),
+            "isBroadcasting": Common.isBroadcasting,
+            "streamUrl": Common.streamUrl,
+            "updateTime": Common.updateTime
+        }
+    }})
+
+
 @app.route("/stats/download", methods=["GET"])
 def geDownloadStats():
     return jsonify({"message":"ok","code":200,"status":0,"data":{
@@ -62,7 +76,11 @@ def getUploadStats():
 
 t = threading.Thread(target=RUN, args=(Common.config['l_u'],))
 t.setDaemon(True)
-
-if __name__ == "__main__":
 t.start()
-    app.run()
+while True:
+    if t.is_alive():
+        sleep(240)
+    else:
+        t = threading.Thread(target=RUN, args=(Common.config['l_u'],))
+        t.setDaemon(True)
+        t.start()

api.py

@@ -12,21 +12,21 @@ import time
 
 s = requests.Session()
 
-DEBUG: bool = False
+DEBUG = False
 
 
 class XiGuaLiveApi:
-    isLive: bool = False
+    isLive = False
-    isValidRoom: bool = False
+    isValidRoom = False
     _rawRoomInfo = {}
-    name: str = ""
+    name = ""
-    roomID: int = 0
+    roomID = 0
-    roomTitle: str = ""
+    roomTitle = ""
-    roomLiver: User = None
+    roomLiver = None
-    roomPopularity: int = 0
+    roomPopularity = 0
-    _cursor:str = "0"
+    _cursor = "0"
-    _updRoomCount:int = 0
+    _updRoomCount = 0
-    lottery:Lottery = None
+    lottery = None
 
     def __init__(self, name: str = "永恒de草薙"):
         self.name = name