From f8abe906749688f9a67628a161ba09c8842cbe44 Mon Sep 17 00:00:00 2001
From: Rock Chin <1010553892@qq.com>
Date: Sun, 5 Mar 2023 12:09:44 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=AE=8C=E5=96=84=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py              |  2 +-
 pkg/utils/updater.py | 65 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/main.py b/main.py
index e52a1ce1..379cbfbc 100644
--- a/main.py
+++ b/main.py
@@ -270,7 +270,7 @@ def main(first_time_init=False):
     import pkg.utils.updater
     try:
         if pkg.utils.updater.is_new_version_available():
-            pkg.utils.context.get_qqbot_manager().notify_admin("新版本可用，请发送 !update 进行自动更新")
+            pkg.utils.context.get_qqbot_manager().notify_admin("新版本可用，请发送 !update 进行自动更新\n更新日志:\n{}".format("\n".join(pkg.utils.updater.get_rls_notes())))
         else:
             logging.info("当前已是最新版本")
 
diff --git a/pkg/utils/updater.py b/pkg/utils/updater.py
index 9d41d093..4c74bc9d 100644
--- a/pkg/utils/updater.py
+++ b/pkg/utils/updater.py
@@ -33,19 +33,33 @@ def pull_latest(repo_path: str) -> bool:
     return True
 
 
-def update_all() -> bool:
-    """检查更新并下载源码"""
-    current_tag = "v0.1.0"
-    if os.path.exists("current_tag"):
-        with open("current_tag", "r") as f:
-            current_tag = f.read()
-
+def get_release_list() -> list:
+    """获取发行列表"""
     rls_list_resp = requests.get(
         url="https://api.github.com/repos/RockChinQ/QChatGPT/releases"
     )
 
     rls_list = rls_list_resp.json()
 
+    return rls_list
+
+
+def get_current_tag() -> str:
+    """获取当前tag"""
+    current_tag = "v0.1.0"
+    if os.path.exists("current_tag"):
+        with open("current_tag", "r") as f:
+            current_tag = f.read()
+
+    return current_tag
+
+
+def update_all() -> bool:
+    """检查更新并下载源码"""
+    current_tag = get_current_tag()
+
+    rls_list = get_release_list()
+
     latest_rls = {}
     rls_notes = []
     for rls in rls_list:
@@ -189,18 +203,41 @@ def get_current_commit_id() -> str:
 
 def is_new_version_available() -> bool:
     """检查是否有新版本"""
-    check_dulwich_closure()
+    # 从github获取release列表
+    rls_list = get_release_list()
+    if rls_list is None:
+        return False
 
-    from dulwich import porcelain
+    # 获取当前版本
+    current_tag = get_current_tag()
 
-    repo = porcelain.open_repo('.')
-    fetch_res = porcelain.ls_remote(porcelain.get_remote_repo(repo, "origin")[1])
+    # 检查是否有新版本
+    for rls in rls_list:
+        if rls['tag_name'] == current_tag:
+            return False
+        else:
+            return True
 
-    current_commit_id = get_current_commit_id()
 
-    latest_commit_id = str(fetch_res[b'HEAD'])[2:-1]
+def get_rls_notes() -> list:
+    """获取更新日志"""
+    # 从github获取release列表
+    rls_list = get_release_list()
+    if rls_list is None:
+        return None
 
-    return current_commit_id != latest_commit_id
+    # 获取当前版本
+    current_tag = get_current_tag()
+
+    # 检查是否有新版本
+    rls_notes = []
+    for rls in rls_list:
+        if rls['tag_name'] == current_tag:
+            break
+
+        rls_notes.append(rls['name'])
+
+    return rls_notes
 
 
 if __name__ == "__main__":