From 64f5ef1afd96bcb5d0267a31f37ee4f878f71c8f Mon Sep 17 00:00:00 2001
From: Isaaczhr <isaaczhr@mail.ustc.edu.cn>
Date: Tue, 18 Feb 2025 18:07:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?add:=20=E5=BC=80=E5=8F=91=E8=80=85=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E6=A8=A1=E5=BC=8F=20fix:=20=E6=9B=B4=E6=96=B0=20NapCa?=
 =?UTF-8?q?t=20=E6=97=B6=E4=BD=BF=E7=94=A8=E5=87=BD=E6=95=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=20improve:=20=E6=A3=80=E6=9F=A5=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BB=A3=E7=A0=81=E6=8F=90=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ncatbot/core/client.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ncatbot/core/client.py b/ncatbot/core/client.py
index 19bda90..ca3ed08 100644
--- a/ncatbot/core/client.py
+++ b/ncatbot/core/client.py
@@ -24,7 +24,7 @@
     OFFICIAL_REQUEST_EVENT,
 )
 from ncatbot.utils.logger import get_log
-from ncatbot.utils.napcat_helper import download_napcat, download_napcat_linux
+from ncatbot.utils.napcat_helper import download_napcat
 
 _log = get_log()
 
@@ -106,11 +106,24 @@ async def run_async(self):
         await self.plugin_sys.load_plugin(self.api)
         await websocket_server.ws_connect()
 
-    def run(self, reload=False):
-        if reload:
+    def run(self, reload=False, debug=False):
+        """
+        启动 Bot 客户端
+
+        Args:
+            reload: 是否同时启动 NapCat , 默认为 False
+            debug: 是否开启调试模式, 默认为 False, 用户不应该修改此参数
+
+        Returns:
+            None
+        """
+        if not debug:
+            # 检查版本和安装方式
             version_ok = check_version()
             if not version_ok:
                 exit(0)
+
+        if reload:
             try:
                 asyncio.run(self.run_async())
             except KeyboardInterrupt:
@@ -148,7 +161,7 @@ def run(self, reload=False):
             github_version = get_version(get_proxy_url())
             if version != github_version:
                 _log.info(f"发现新版本: {github_version}")
-                if not download_napcat_linux("update"):
+                if not download_napcat("update"):
                     _log.info(f"跳过 napcat {version} 更新")
             else:
                 _log.info("当前 napcat 已是最新版本")
@@ -260,10 +273,7 @@ def run(self, reload=False):
                 exit(0)
 
         _log.info("连接 napcat websocket 服务器成功!")
-        version_ok = check_version()
 
-        if not version_ok:
-            exit(0)
         try:
             asyncio.run(self.run_async())
         except KeyboardInterrupt:

From 5caab8a34798f9bc46f02ef7279c204f1feb5115 Mon Sep 17 00:00:00 2001
From: Isaaczhr <isaaczhr@mail.ustc.edu.cn>
Date: Tue, 18 Feb 2025 18:12:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=91=E4=B8=AA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ncatbot/core/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ncatbot/core/client.py b/ncatbot/core/client.py
index ca3ed08..1aeddb0 100644
--- a/ncatbot/core/client.py
+++ b/ncatbot/core/client.py
@@ -161,7 +161,7 @@ def run(self, reload=False, debug=False):
             github_version = get_version(get_proxy_url())
             if version != github_version:
                 _log.info(f"发现新版本: {github_version}")
-                if not download_napcat("update"):
+                if not download_napcat("update", base_path):
                     _log.info(f"跳过 napcat {version} 更新")
             else:
                 _log.info("当前 napcat 已是最新版本")