From e0f323fdeb08e0bb117e0bbaaa379b145f8c8a92 Mon Sep 17 00:00:00 2001
From: molanp <104612722+molanp@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:49:55 +0800
Subject: [PATCH 1/9] =?UTF-8?q?feat(plugin=5Fstore):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8F=92=E4=BB=B6=E5=8A=9F=E8=83=BD=E5=8F=8A?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AEURL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加了一个新的搜索命令，允许用户根据插件名称或作者搜索插件。此外，更新了插件配置的URL列表，以使用新的API端点。还修复了requirements.txt处理中的日志记录问题，并对插件安装和删除流程进行了微调。
---
 .../builtin_plugins/plugin_store/__init__.py  | 47 ++++++++--
 .../builtin_plugins/plugin_store/config.py    | 14 +--
 .../plugin_store/data_source.py               | 86 ++++++++++++++-----
 3 files changed, 110 insertions(+), 37 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/__init__.py b/zhenxun/builtin_plugins/plugin_store/__init__.py
index abf3049a..afa9dd5f 100644
--- a/zhenxun/builtin_plugins/plugin_store/__init__.py
+++ b/zhenxun/builtin_plugins/plugin_store/__init__.py
@@ -1,12 +1,13 @@
-from nonebot.permission import SUPERUSER
-from nonebot.plugin import PluginMetadata
-from nonebot_plugin_alconna import Alconna, Args, Subcommand, on_alconna
-from nonebot_plugin_session import EventSession
+from nonebot.permission import SUPERUSER # type: ignore
+from nonebot.plugin import PluginMetadata # type: ignore
+from nonebot_plugin_alconna import Alconna, Args, Subcommand, on_alconna # type: ignore
+from nonebot_plugin_session import EventSession # type: ignore
+from nonebot.exception import FinishedException  # type: ignore
 
-from zhenxun.configs.utils import PluginExtraData
-from zhenxun.services.log import logger
-from zhenxun.utils.enum import PluginType
-from zhenxun.utils.message import MessageUtils
+from zhenxun.configs.utils import PluginExtraData  # type: ignore
+from zhenxun.services.log import logger # type: ignore
+from zhenxun.utils.enum import PluginType # type: ignore
+from zhenxun.utils.message import MessageUtils # type: ignore
 
 from .data_source import ShopManage
 
@@ -17,6 +18,7 @@ __plugin_meta__ = PluginMetadata(
     插件商店        : 查看当前的插件商店
     添加插件 id     : 添加插件
     移除插件 id     : 移除插件
+    搜索插件 name or author     : 搜索插件
     """.strip(),
     extra=PluginExtraData(
         author="HibiKier",
@@ -30,13 +32,13 @@ _matcher = on_alconna(
         "插件商店",
         Subcommand("add", Args["plugin_id", int]),
         Subcommand("remove", Args["plugin_id", int]),
+        Subcommand("search", Args["plugin_name_or_author", str]),
     ),
     permission=SUPERUSER,
     priority=1,
     block=True,
 )
 
-
 _matcher.shortcut(
     r"添加插件",
     command="插件商店",
@@ -51,6 +53,13 @@ _matcher.shortcut(
     prefix=True,
 )
 
+_matcher.shortcut(
+    r"搜索插件",
+    command="插件商店",
+    arguments=["search", "{%0}"],
+    prefix=True,
+)
+
 
 @_matcher.assign("$main")
 async def _(session: EventSession):
@@ -58,6 +67,8 @@ async def _(session: EventSession):
         result = await ShopManage.get_plugins_info()
         logger.info("查看插件列表", "插件商店", session=session)
         await MessageUtils.build_message(result).finish()
+    except FinishedException:
+        pass
     except Exception as e:
         logger.error(f"查看插件列表失败 e: {e}", "插件商店", session=session, e=e)
 
@@ -66,6 +77,8 @@ async def _(session: EventSession):
 async def _(session: EventSession, plugin_id: int):
     try:
         result = await ShopManage.add_plugin(plugin_id)
+    except FinishedException:
+        pass
     except Exception as e:
         logger.error(f"添加插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
@@ -79,6 +92,8 @@ async def _(session: EventSession, plugin_id: int):
 async def _(session: EventSession, plugin_id: int):
     try:
         result = await ShopManage.remove_plugin(plugin_id)
+    except FinishedException:
+        pass
     except Exception as e:
         logger.error(f"移除插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
@@ -86,3 +101,17 @@ async def _(session: EventSession, plugin_id: int):
         ).finish()
     logger.info(f"移除插件 Id: {plugin_id}", "插件商店", session=session)
     await MessageUtils.build_message(result).finish()
+
+@_matcher.assign("search")
+async def _(session: EventSession, plugin_name_or_author: str):
+    try:
+        result = await ShopManage.search_plugin(plugin_name_or_author)
+    except FinishedException:
+        pass
+    except Exception as e:
+        logger.error(f"搜索插件 name: {plugin_name_or_author}失败", "插件商店", session=session, e=e)
+        await MessageUtils.build_message(
+            f"搜索插件 name: {plugin_name_or_author} 失败 e: {e}"
+        ).finish()
+    logger.info(f"搜索插件 name: {plugin_name_or_author}", "插件商店", session=session)
+    await MessageUtils.build_message(result).finish()
diff --git a/zhenxun/builtin_plugins/plugin_store/config.py b/zhenxun/builtin_plugins/plugin_store/config.py
index 056c1e83..c2866da5 100644
--- a/zhenxun/builtin_plugins/plugin_store/config.py
+++ b/zhenxun/builtin_plugins/plugin_store/config.py
@@ -4,12 +4,12 @@ BASE_PATH = Path() / "zhenxun"
 BASE_PATH.mkdir(parents=True, exist_ok=True)
 
 
-CONFIG_URL = (
-    "https://cdn.jsdelivr.net/gh/HibiKier/zhenxun_bot_plugins/plugins.json"
-)
+CONFIG_URL_LIST = [
+    ("https://cdn.jsdelivr.net/gh/HibiKier/zhenxun_bot_plugins/plugins.json",
+     "https://api.github.com/repos/HibiKier/zhenxun_bot_plugins/contents/{}?ref=main")
+]
 """插件信息文件"""
 
-DOWNLOAD_URL = (
-    "https://api.github.com/repos/HibiKier/zhenxun_bot_plugins/contents/{}?ref=main"
-)
-"""插件下载地址"""
+CONFIG_URL = CONFIG_URL_LIST[0][0]
+
+DOWNLOAD_URL = CONFIG_URL_LIST[0][1]
diff --git a/zhenxun/builtin_plugins/plugin_store/data_source.py b/zhenxun/builtin_plugins/plugin_store/data_source.py
index c868998f..b39ade7d 100644
--- a/zhenxun/builtin_plugins/plugin_store/data_source.py
+++ b/zhenxun/builtin_plugins/plugin_store/data_source.py
@@ -1,14 +1,13 @@
 import shutil
 from pathlib import Path
 import subprocess
-import os
 
 import nonebot
 import ujson as json
 
-from zhenxun.services.log import logger
-from zhenxun.utils.http_utils import AsyncHttpx
-from zhenxun.utils.image_utils import BuildImage, ImageTemplate, RowStyle
+from zhenxun.services.log import logger  # type: ignore
+from zhenxun.utils.http_utils import AsyncHttpx  # type: ignore
+from zhenxun.utils.image_utils import BuildImage, ImageTemplate, RowStyle  # type: ignore
 
 from .config import BASE_PATH, CONFIG_URL, DOWNLOAD_URL
 
@@ -87,16 +86,20 @@ async def download_file(url: str):
 
 def install_requirement(plugin_path: Path):
     requirement_path = plugin_path / "requirement.txt"
-    
+
     if not requirement_path.exists():
-        logger.debug(f"No requirement.txt found for plugin: {plugin_path.name}", "插件管理")
+        logger.debug(
+            f"No requirement.txt found for plugin: {plugin_path.name}", "插件管理")
         return
-    
+
     try:
-        result = subprocess.run(["pip", "install", "-r", str(requirement_path)], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-        logger.debug(f"Successfully installed dependencies for plugin: {plugin_path.name}. Output:\n{result.stdout}", "插件管理")
+        result = subprocess.run(["pip", "install", "-r", str(requirement_path)],
+                                check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        logger.debug(
+            f"Successfully installed dependencies for plugin: {plugin_path.name}. Output:\n{result.stdout}", "插件管理")
     except subprocess.CalledProcessError as e:
-        logger.error(f"Failed to install dependencies for plugin: {plugin_path.name}. Error:\n{e.stderr}")
+        logger.error(
+            f"Failed to install dependencies for plugin: {plugin_path.name}. Error:\n{e.stderr}")
 
 
 class ShopManage:
@@ -137,18 +140,19 @@ class ShopManage:
         for k in data.copy():
             if data[k]["plugin_type"]:
                 data[k]["plugin_type"] = cls.type2name[data[k]["plugin_type"]]
-        suc_plugin = [p.name for p in nonebot.get_loaded_plugins()]
+        suc_plugin = [p.name for p in nonebot.get_loaded_plugins()  # type: ignore
+                      ]
         data_list = [
             [
-                "已安装" if v[1]["module"] in suc_plugin else "",
-                i,
-                v[0],
-                v[1]["description"],
-                v[1]["author"],
-                v[1]["version"],
-                v[1]["plugin_type"],
+                "已安装" if plugin_info[1]["module"] in suc_plugin else "",
+                id,
+                plugin_info[0],
+                plugin_info[1]["description"],
+                plugin_info[1]["author"],
+                plugin_info[1]["version"],
+                plugin_info[1]["plugin_type"],
             ]
-            for i, v in enumerate(data.items())
+            for id, plugin_info in enumerate(data.items())
         ]
         return await ImageTemplate.table_page(
             "插件列表",
@@ -187,11 +191,11 @@ class ShopManage:
             return "插件下载地址构建失败..."
         logger.debug(f"尝试下载插件 URL: {url_path}", "插件管理")
         await download_file(DOWNLOAD_URL.format(url_path))
-        
+
         # 安装依赖
         plugin_path = BASE_PATH / "/".join(module_path_split)
         install_requirement(plugin_path)
-        
+
         return f"插件 {plugin_key} 安装成功!"
 
     @classmethod
@@ -214,3 +218,43 @@ class ShopManage:
         else:
             path.unlink()
         return f"插件 {plugin_key} 移除成功!"
+    
+    @classmethod
+    async def search_plugin(cls, plugin_name_or_author: str) -> BuildImage | str:
+        data: dict = await cls.__get_data()
+        column_name = ["-", "ID", "名称", "简介", "作者", "版本", "类型"]
+        for k in data.copy():
+            if data[k]["plugin_type"]:
+                data[k]["plugin_type"] = cls.type2name[data[k]["plugin_type"]]
+
+        suc_plugin = [p.name for p in nonebot.get_loaded_plugins()]  # type: ignore
+        filtered_data = [
+            (id, plugin_info)
+            for id, plugin_info in enumerate(data.items())
+            if plugin_name_or_author.lower() in plugin_info[0].lower() or 
+            plugin_name_or_author.lower() in plugin_info[1]["author"].lower()
+        ]
+
+        data_list = [
+            [
+                "已安装" if plugin_info[1]["module"] in suc_plugin else "",
+                id,
+                plugin_info[0],
+                plugin_info[1]["description"],
+                plugin_info[1]["author"],
+                plugin_info[1]["version"],
+                plugin_info[1]["plugin_type"],
+            ]
+            for id, plugin_info in filtered_data
+        ]
+        
+        if len(data_list) == 0:
+            return "未找到插件..."
+
+        return await ImageTemplate.table_page(
+            "插件列表",
+            f"通过安装/卸载插件 ID 来管理插件",
+            column_name,
+            data_list,
+            text_style=row_style,
+        )
\ No newline at end of file

From 638efd9e07ca4b6b5e2d9d110f5bcfd58666ffac Mon Sep 17 00:00:00 2001
From: molanp <104612722+molanp@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:07:06 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat(plugin=5Fstore):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=92=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加了更新插件的功能，现在可以通过插件商店更新已安装的插件。此更新包括了插件版本的检查和更新逻辑，
优化了插件管理的便捷性。
---
 .../builtin_plugins/plugin_store/__init__.py  | 28 ++++++++
 .../plugin_store/data_source.py               | 71 ++++++++++++++++---
 2 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/__init__.py b/zhenxun/builtin_plugins/plugin_store/__init__.py
index afa9dd5f..9c0678e4 100644
--- a/zhenxun/builtin_plugins/plugin_store/__init__.py
+++ b/zhenxun/builtin_plugins/plugin_store/__init__.py
@@ -19,6 +19,7 @@ __plugin_meta__ = PluginMetadata(
     添加插件 id     : 添加插件
     移除插件 id     : 移除插件
     搜索插件 name or author     : 搜索插件
+    更新插件 id     : 更新插件
     """.strip(),
     extra=PluginExtraData(
         author="HibiKier",
@@ -33,6 +34,7 @@ _matcher = on_alconna(
         Subcommand("add", Args["plugin_id", int]),
         Subcommand("remove", Args["plugin_id", int]),
         Subcommand("search", Args["plugin_name_or_author", str]),
+        Subcommand("update", Args["plugin_id", int]),
     ),
     permission=SUPERUSER,
     priority=1,
@@ -60,6 +62,12 @@ _matcher.shortcut(
     prefix=True,
 )
 
+_matcher.shortcut(
+    r"更新插件",
+    command="插件商店",
+    arguments=["update", "{%0}"],
+    prefix=True,
+)
 
 @_matcher.assign("$main")
 async def _(session: EventSession):
@@ -76,6 +84,9 @@ async def _(session: EventSession):
 @_matcher.assign("add")
 async def _(session: EventSession, plugin_id: int):
     try:
+        await MessageUtils.build_message(
+            f"正在添加插件 Id: {plugin_id}"
+        ).send()
         result = await ShopManage.add_plugin(plugin_id)
     except FinishedException:
         pass
@@ -115,3 +126,20 @@ async def _(session: EventSession, plugin_name_or_author: str):
         ).finish()
     logger.info(f"搜索插件 name: {plugin_name_or_author}", "插件商店", session=session)
     await MessageUtils.build_message(result).finish()
+
+@_matcher.assign("update")
+async def _(session: EventSession, plugin_id: int):
+    try:
+        await MessageUtils.build_message(
+            f"正在更新插件 Id: {plugin_id}"
+        ).send()
+        result = await ShopManage.update_plugin(plugin_id)
+    except FinishedException:
+        pass
+    except Exception as e:
+        logger.error(f"更新插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
+        await MessageUtils.build_message(
+            f"更新插件 Id: {plugin_id} 失败 e: {e}"
+        ).finish()
+    logger.info(f"更新插件 Id: {plugin_id}", "插件商店", session=session)
+    await MessageUtils.build_message(result).finish()
diff --git a/zhenxun/builtin_plugins/plugin_store/data_source.py b/zhenxun/builtin_plugins/plugin_store/data_source.py
index b39ade7d..e26fca7a 100644
--- a/zhenxun/builtin_plugins/plugin_store/data_source.py
+++ b/zhenxun/builtin_plugins/plugin_store/data_source.py
@@ -140,8 +140,12 @@ class ShopManage:
         for k in data.copy():
             if data[k]["plugin_type"]:
                 data[k]["plugin_type"] = cls.type2name[data[k]["plugin_type"]]
-        suc_plugin = [p.name for p in nonebot.get_loaded_plugins()  # type: ignore
-                      ]
+        suc_plugin = {
+            p.name: p.metadata.extra["version"]
+            for p in nonebot.get_loaded_plugins()
+            if hasattr(p, "metadata") and hasattr(p.metadata, "type") and (p.metadata.type == 'application' or p.metadata.type is None) and "version" in p.metadata.extra.keys()
+        }
+
         data_list = [
             [
                 "已安装" if plugin_info[1]["module"] in suc_plugin else "",
@@ -149,7 +153,12 @@ class ShopManage:
                 plugin_info[0],
                 plugin_info[1]["description"],
                 plugin_info[1]["author"],
-                plugin_info[1]["version"],
+                (
+                    f"{suc_plugin[plugin_info[1]['module']]} (有更新->{plugin_info[1]['version']})"
+                    if plugin_info[1]["module"] in suc_plugin
+                    and plugin_info[1]["version"] != suc_plugin[plugin_info[1]["module"]]
+                    else plugin_info[1]["version"]
+                ),
                 plugin_info[1]["plugin_type"],
             ]
             for id, plugin_info in enumerate(data.items())
@@ -226,8 +235,11 @@ class ShopManage:
         for k in data.copy():
             if data[k]["plugin_type"]:
                 data[k]["plugin_type"] = cls.type2name[data[k]["plugin_type"]]
-
-        suc_plugin = [p.name for p in nonebot.get_loaded_plugins()]  # type: ignore
+        suc_plugin = {
+            p.name: p.metadata.extra["version"]
+            for p in nonebot.get_loaded_plugins()
+            if hasattr(p, "metadata") and hasattr(p.metadata, "type") and (p.metadata.type == 'application' or p.metadata.type is None) and "version" in p.metadata.extra.keys()
+        }
         filtered_data = [
             (id, plugin_info)
             for id, plugin_info in enumerate(data.items())
@@ -242,19 +254,58 @@ class ShopManage:
                 plugin_info[0],
                 plugin_info[1]["description"],
                 plugin_info[1]["author"],
-                plugin_info[1]["version"],
+                (
+                    f"{suc_plugin[plugin_info[1]['module']]} (有更新->{plugin_info[1]['version']})"
+                    if plugin_info[1]["module"] in suc_plugin
+                    and plugin_info[1]["version"] != suc_plugin[plugin_info[1]["module"]]
+                    else plugin_info[1]["version"]
+                ),
                 plugin_info[1]["plugin_type"],
             ]
             for id, plugin_info in filtered_data
         ]
-        
         if len(data_list) == 0:
-            return "未找到插件..."
-
+            return "未找到相关插件..."
         return await ImageTemplate.table_page(
             "插件列表",
             f"通过安装/卸载插件 ID 来管理插件",
             column_name,
             data_list,
             text_style=row_style,
-        )
\ No newline at end of file
+        )
+    
+    @classmethod
+    async def update_plugin(cls, plugin_id: int) -> str:
+        data: dict = await cls.__get_data()
+        if plugin_id < 0 or plugin_id >= len(data):
+            return "插件ID不存在..."
+        plugin_key = list(data.keys())[plugin_id]
+        plugin_info = data[plugin_key]
+        module_path_split = plugin_info["module_path"].split(".")
+        url_path = None
+        path = BASE_PATH
+        if len(module_path_split) == 2:
+            """单个文件或文件夹"""
+            if plugin_info["is_dir"]:
+                url_path = "/".join(module_path_split)
+            else:
+                url_path = "/".join(module_path_split) + ".py"
+        else:
+            """嵌套文件或文件夹"""
+            for p in module_path_split[:-1]:
+                path = path / p
+            path.mkdir(parents=True, exist_ok=True)
+            if plugin_info["is_dir"]:
+                url_path = f"{'/'.join(module_path_split)}"
+            else:
+                url_path = f"{'/'.join(module_path_split)}.py"
+        if not url_path:
+            return "插件下载地址构建失败..."
+        logger.debug(f"尝试下载插件 URL: {url_path}", "插件管理")
+        await download_file(DOWNLOAD_URL.format(url_path))
+
+        # 安装依赖
+        plugin_path = BASE_PATH / "/".join(module_path_split)
+        install_requirement(plugin_path)
+
+        return f"插件 {plugin_key} 更新成功!"
\ No newline at end of file

From 447c558957f5bff30cf507c071dacf4e1128d765 Mon Sep 17 00:00:00 2001
From: molanp <104612722+molanp@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:09:04 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix(=5F=5Finit=5F=5F.py):=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=20`type:=20ignore?=
 =?UTF-8?q?`=20=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../builtin_plugins/plugin_store/__init__.py   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/__init__.py b/zhenxun/builtin_plugins/plugin_store/__init__.py
index 9c0678e4..86c8f24b 100644
--- a/zhenxun/builtin_plugins/plugin_store/__init__.py
+++ b/zhenxun/builtin_plugins/plugin_store/__init__.py
@@ -1,13 +1,13 @@
-from nonebot.permission import SUPERUSER # type: ignore
-from nonebot.plugin import PluginMetadata # type: ignore
-from nonebot_plugin_alconna import Alconna, Args, Subcommand, on_alconna # type: ignore
-from nonebot_plugin_session import EventSession # type: ignore
-from nonebot.exception import FinishedException  # type: ignore
+from nonebot.permission import SUPERUSER
+from nonebot.plugin import PluginMetadata
+from nonebot_plugin_alconna import Alconna, Args, Subcommand, on_alconna
+from nonebot_plugin_session import EventSession
+from nonebot.exception import FinishedException 
 
-from zhenxun.configs.utils import PluginExtraData  # type: ignore
-from zhenxun.services.log import logger # type: ignore
-from zhenxun.utils.enum import PluginType # type: ignore
-from zhenxun.utils.message import MessageUtils # type: ignore
+from zhenxun.configs.utils import PluginExtraData 
+from zhenxun.services.log import logger
+from zhenxun.utils.enum import PluginType
+from zhenxun.utils.message import MessageUtils
 
 from .data_source import ShopManage
 

From 0822512c21e20912e1de3702598592bd044d74fc Mon Sep 17 00:00:00 2001
From: molanp <104612722+molanp@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:41:48 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../builtin_plugins/plugin_store/__init__.py  | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/__init__.py b/zhenxun/builtin_plugins/plugin_store/__init__.py
index 86c8f24b..4f6822eb 100644
--- a/zhenxun/builtin_plugins/plugin_store/__init__.py
+++ b/zhenxun/builtin_plugins/plugin_store/__init__.py
@@ -74,7 +74,7 @@ async def _(session: EventSession):
     try:
         result = await ShopManage.get_plugins_info()
         logger.info("查看插件列表", "插件商店", session=session)
-        await MessageUtils.build_message(result).finish()
+        await MessageUtils.build_message(result).send()
     except FinishedException:
         pass
     except Exception as e:
@@ -88,44 +88,38 @@ async def _(session: EventSession, plugin_id: int):
             f"正在添加插件 Id: {plugin_id}"
         ).send()
         result = await ShopManage.add_plugin(plugin_id)
-    except FinishedException:
-        pass
     except Exception as e:
         logger.error(f"添加插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
             f"添加插件 Id: {plugin_id} 失败 e: {e}"
-        ).finish()
+        ).send()
     logger.info(f"添加插件 Id: {plugin_id}", "插件商店", session=session)
-    await MessageUtils.build_message(result).finish()
+    await MessageUtils.build_message(result).send()
 
 
 @_matcher.assign("remove")
 async def _(session: EventSession, plugin_id: int):
     try:
         result = await ShopManage.remove_plugin(plugin_id)
-    except FinishedException:
-        pass
     except Exception as e:
         logger.error(f"移除插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
             f"移除插件 Id: {plugin_id} 失败 e: {e}"
-        ).finish()
+        ).send()
     logger.info(f"移除插件 Id: {plugin_id}", "插件商店", session=session)
-    await MessageUtils.build_message(result).finish()
+    await MessageUtils.build_message(result).send()
 
 @_matcher.assign("search")
 async def _(session: EventSession, plugin_name_or_author: str):
     try:
         result = await ShopManage.search_plugin(plugin_name_or_author)
-    except FinishedException:
-        pass
     except Exception as e:
         logger.error(f"搜索插件 name: {plugin_name_or_author}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
             f"搜索插件 name: {plugin_name_or_author} 失败 e: {e}"
-        ).finish()
+        ).send()
     logger.info(f"搜索插件 name: {plugin_name_or_author}", "插件商店", session=session)
-    await MessageUtils.build_message(result).finish()
+    await MessageUtils.build_message(result).send()
 
 @_matcher.assign("update")
 async def _(session: EventSession, plugin_id: int):
@@ -134,12 +128,10 @@ async def _(session: EventSession, plugin_id: int):
             f"正在更新插件 Id: {plugin_id}"
         ).send()
         result = await ShopManage.update_plugin(plugin_id)
-    except FinishedException:
-        pass
     except Exception as e:
         logger.error(f"更新插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
             f"更新插件 Id: {plugin_id} 失败 e: {e}"
-        ).finish()
+        ).send()
     logger.info(f"更新插件 Id: {plugin_id}", "插件商店", session=session)
-    await MessageUtils.build_message(result).finish()
+    await MessageUtils.build_message(result).send()

From 68a71c516e2f9cbd641baab5bfa724247db73e73 Mon Sep 17 00:00:00 2001
From: molanp <104612722+molanp@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:42:30 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zhenxun/builtin_plugins/plugin_store/data_source.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/data_source.py b/zhenxun/builtin_plugins/plugin_store/data_source.py
index e26fca7a..7c440f9b 100644
--- a/zhenxun/builtin_plugins/plugin_store/data_source.py
+++ b/zhenxun/builtin_plugins/plugin_store/data_source.py
@@ -5,9 +5,9 @@ import subprocess
 import nonebot
 import ujson as json
 
-from zhenxun.services.log import logger  # type: ignore
-from zhenxun.utils.http_utils import AsyncHttpx  # type: ignore
-from zhenxun.utils.image_utils import BuildImage, ImageTemplate, RowStyle  # type: ignore
+from zhenxun.services.log import logger
+from zhenxun.utils.http_utils import AsyncHttpx
+from zhenxun.utils.image_utils import BuildImage, ImageTemplate, RowStyle
 
 from .config import BASE_PATH, CONFIG_URL, DOWNLOAD_URL
 

From a2c3f11680c008784560816f0fdd61a4f753f0c5 Mon Sep 17 00:00:00 2001
From: molanp <104612722+molanp@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:43:55 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zhenxun/builtin_plugins/plugin_store/__init__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/__init__.py b/zhenxun/builtin_plugins/plugin_store/__init__.py
index 4f6822eb..ba21feea 100644
--- a/zhenxun/builtin_plugins/plugin_store/__init__.py
+++ b/zhenxun/builtin_plugins/plugin_store/__init__.py
@@ -2,7 +2,6 @@ from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
 from nonebot_plugin_alconna import Alconna, Args, Subcommand, on_alconna
 from nonebot_plugin_session import EventSession
-from nonebot.exception import FinishedException 
 
 from zhenxun.configs.utils import PluginExtraData 
 from zhenxun.services.log import logger
@@ -75,8 +74,6 @@ async def _(session: EventSession):
         result = await ShopManage.get_plugins_info()
         logger.info("查看插件列表", "插件商店", session=session)
         await MessageUtils.build_message(result).send()
-    except FinishedException:
-        pass
     except Exception as e:
         logger.error(f"查看插件列表失败 e: {e}", "插件商店", session=session, e=e)
 

From 413808300dfdf758e9277fc06029db678cb6ec68 Mon Sep 17 00:00:00 2001
From: HibiKier <45528451+HibiKier@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:47:12 +0800
Subject: [PATCH 7/9] Update __init__.py

---
 zhenxun/builtin_plugins/plugin_store/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/__init__.py b/zhenxun/builtin_plugins/plugin_store/__init__.py
index ba21feea..d9c2cc52 100644
--- a/zhenxun/builtin_plugins/plugin_store/__init__.py
+++ b/zhenxun/builtin_plugins/plugin_store/__init__.py
@@ -76,6 +76,7 @@ async def _(session: EventSession):
         await MessageUtils.build_message(result).send()
     except Exception as e:
         logger.error(f"查看插件列表失败 e: {e}", "插件商店", session=session, e=e)
+        await MessageUtils.build_message("获取插件列表失败...").send()
 
 
 @_matcher.assign("add")
@@ -89,7 +90,7 @@ async def _(session: EventSession, plugin_id: int):
         logger.error(f"添加插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
             f"添加插件 Id: {plugin_id} 失败 e: {e}"
-        ).send()
+        ).finish()
     logger.info(f"添加插件 Id: {plugin_id}", "插件商店", session=session)
     await MessageUtils.build_message(result).send()
 
@@ -102,7 +103,7 @@ async def _(session: EventSession, plugin_id: int):
         logger.error(f"移除插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
             f"移除插件 Id: {plugin_id} 失败 e: {e}"
-        ).send()
+        ).finish()
     logger.info(f"移除插件 Id: {plugin_id}", "插件商店", session=session)
     await MessageUtils.build_message(result).send()
 
@@ -114,7 +115,7 @@ async def _(session: EventSession, plugin_name_or_author: str):
         logger.error(f"搜索插件 name: {plugin_name_or_author}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
             f"搜索插件 name: {plugin_name_or_author} 失败 e: {e}"
-        ).send()
+        ).finish()
     logger.info(f"搜索插件 name: {plugin_name_or_author}", "插件商店", session=session)
     await MessageUtils.build_message(result).send()
 
@@ -129,6 +130,6 @@ async def _(session: EventSession, plugin_id: int):
         logger.error(f"更新插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
         await MessageUtils.build_message(
             f"更新插件 Id: {plugin_id} 失败 e: {e}"
-        ).send()
+        ).finish()
     logger.info(f"更新插件 Id: {plugin_id}", "插件商店", session=session)
     await MessageUtils.build_message(result).send()

From b10b806b76baf2da9f297b4761beb9e9c2e28475 Mon Sep 17 00:00:00 2001
From: HibiKier <45528451+HibiKier@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:00:29 +0800
Subject: [PATCH 8/9] Update data_source.py

---
 .../plugin_store/data_source.py               | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/data_source.py b/zhenxun/builtin_plugins/plugin_store/data_source.py
index 7c440f9b..5555bdb5 100644
--- a/zhenxun/builtin_plugins/plugin_store/data_source.py
+++ b/zhenxun/builtin_plugins/plugin_store/data_source.py
@@ -5,6 +5,7 @@ import subprocess
 import nonebot
 import ujson as json
 
+from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.services.log import logger
 from zhenxun.utils.http_utils import AsyncHttpx
 from zhenxun.utils.image_utils import BuildImage, ImageTemplate, RowStyle
@@ -88,18 +89,15 @@ def install_requirement(plugin_path: Path):
     requirement_path = plugin_path / "requirement.txt"
 
     if not requirement_path.exists():
-        logger.debug(
-            f"No requirement.txt found for plugin: {plugin_path.name}", "插件管理")
+        logger.debug(f"No requirement.txt found for plugin: {plugin_path.name}", "插件管理")
         return
 
     try:
         result = subprocess.run(["pip", "install", "-r", str(requirement_path)],
                                 check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-        logger.debug(
-            f"Successfully installed dependencies for plugin: {plugin_path.name}. Output:\n{result.stdout}", "插件管理")
+        logger.debug(f"Successfully installed dependencies for plugin: {plugin_path.name}. Output:\n{result.stdout}", "插件管理")
     except subprocess.CalledProcessError as e:
-        logger.error(
-            f"Failed to install dependencies for plugin: {plugin_path.name}. Error:\n{e.stderr}")
+        logger.error(f"Failed to install dependencies for plugin: {plugin_path.name}. Error:\n{e.stderr}")
 
 
 class ShopManage:
@@ -140,11 +138,8 @@ class ShopManage:
         for k in data.copy():
             if data[k]["plugin_type"]:
                 data[k]["plugin_type"] = cls.type2name[data[k]["plugin_type"]]
-        suc_plugin = {
-            p.name: p.metadata.extra["version"]
-            for p in nonebot.get_loaded_plugins()
-            if hasattr(p, "metadata") and hasattr(p.metadata, "type") and (p.metadata.type == 'application' or p.metadata.type is None) and "version" in p.metadata.extra.keys()
-        }
+        plugin_list = await PluginInfo.filter(load_status=True).values_list("module", "version")
+        suc_plugin = {p[0]: p[1] for p in plugin_list if p[1]}
 
         data_list = [
             [
@@ -235,11 +230,8 @@ class ShopManage:
         for k in data.copy():
             if data[k]["plugin_type"]:
                 data[k]["plugin_type"] = cls.type2name[data[k]["plugin_type"]]
-        suc_plugin = {
-            p.name: p.metadata.extra["version"]
-            for p in nonebot.get_loaded_plugins()
-            if hasattr(p, "metadata") and hasattr(p.metadata, "type") and (p.metadata.type == 'application' or p.metadata.type is None) and "version" in p.metadata.extra.keys()
-        }
+        plugin_list = await PluginInfo.filter(load_status=True).values_list("module", "version")
+        suc_plugin = {p[0]: p[1] for p in plugin_list if p[1]}
         filtered_data = [
             (id, plugin_info)
             for id, plugin_info in enumerate(data.items())
@@ -264,7 +256,7 @@ class ShopManage:
             ]
             for id, plugin_info in filtered_data
         ]
-        if len(data_list) == 0:
+        if not data_list:
             return "未找到相关插件..."
         return await ImageTemplate.table_page(
             "插件列表",
@@ -308,4 +300,4 @@ class ShopManage:
         plugin_path = BASE_PATH / "/".join(module_path_split)
         install_requirement(plugin_path)
 
-        return f"插件 {plugin_key} 更新成功!"
\ No newline at end of file
+        return f"插件 {plugin_key} 更新成功!"

From c089395597b9303e0a395ac695a6d0bc3c4ca31a Mon Sep 17 00:00:00 2001
From: HibiKier <45528451+HibiKier@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:04:24 +0800
Subject: [PATCH 9/9] Update config.py

---
 zhenxun/builtin_plugins/plugin_store/config.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/zhenxun/builtin_plugins/plugin_store/config.py b/zhenxun/builtin_plugins/plugin_store/config.py
index c2866da5..867b383c 100644
--- a/zhenxun/builtin_plugins/plugin_store/config.py
+++ b/zhenxun/builtin_plugins/plugin_store/config.py
@@ -4,12 +4,10 @@ BASE_PATH = Path() / "zhenxun"
 BASE_PATH.mkdir(parents=True, exist_ok=True)
 
 
-CONFIG_URL_LIST = [
-    ("https://cdn.jsdelivr.net/gh/HibiKier/zhenxun_bot_plugins/plugins.json",
-     "https://api.github.com/repos/HibiKier/zhenxun_bot_plugins/contents/{}?ref=main")
-]
+CONFIG_URL = "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins/plugins.json"
 """插件信息文件"""
 
-CONFIG_URL = CONFIG_URL_LIST[0][0]
-
-DOWNLOAD_URL = CONFIG_URL_LIST[0][1]
+DOWNLOAD_URL = (
+    "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/contents/{}?ref=main"
+)
+"""插件下载地址"""