diff --git a/WinMain.py b/WinMain.py index c5a7011..294e088 100644 --- a/WinMain.py +++ b/WinMain.py @@ -185,10 +185,14 @@ if __name__ == "__main__": else: name = readInput("请输入主播用户名,默认为", name, 3) api = WinMain(name) - print("进入", api.roomLiver, "的直播间") - if not api.isValidRoom: - input("房间不存在") + while not api.isValidRoom: + set_cmd_text_color(FOREGROUND_RED) + print("未找到对应房间或未开播,等待1分钟后重试") + resetColor() + time.sleep(60) + api.updRoomInfo() sys.exit() + print("进入", api.roomLiver, "的直播间") os.system("title {}".format(api.getTitle())) print("=" * 30) while True: diff --git a/liveDownloader.py b/liveDownloader.py index 43c45a7..e827bdc 100644 --- a/liveDownloader.py +++ b/liveDownloader.py @@ -107,14 +107,16 @@ def upload(date=datetime.strftime(datetime.now(), "%Y_%m_%d")): b = Bilibili() b.login(Common.config["b_u"], Common.config["b_p"]) +et = threading.Thread(target=encode, args=()) +et.setDaemon(True) +et.start() + def run(): global isEncode, isDownload - et = threading.Thread(target=encode, args=()) - et.setDaemon(True) - et.start() + Common.refreshDownloader() if not Common.api.isValidRoom: - Common.appendError("[{}]房间不存在".format(Common.config["l_u"])) + Common.appendError("[{}]房间未找到".format(Common.config["l_u"])) return d = None t = threading.Thread(target=download)