fix: 插件列表显示错误问题

2024-03-21 14:52:02 +08:00
parent 933979ceaa
commit 2711d8844b
18 changed files with 179 additions and 84 deletions
--- a/src/plugins/liteyuki_plugin_npm/init.py
+++ b/src/plugins/liteyuki_plugin_npm/init.py
@ -3,7 +3,6 @@ from .manager import *
 from .installer import *
 from .helper import *

-
 __author__ = "snowykami"
 __plugin_meta__ = PluginMetadata(
    name="轻雪插件管理",
@ -16,4 +15,7 @@ __plugin_meta__ = PluginMetadata(
    ),
    type="application",
    homepage="https://github.com/snowykami/LiteyukiBot",
+    extra={
+            "liteyuki_plugin": True,
+    }
 )
--- a/src/plugins/liteyuki_plugin_npm/common.py
+++ b/src/plugins/liteyuki_plugin_npm/common.py
@ -1,13 +1,8 @@
 from src.utils.data import Database, LiteModel
-from src.utils.data_manager import plugin_db
+from src.utils.data_manager import InstalledPlugin, plugin_db

 LNPM_COMMAND_START = "lnpm"




-class InstalledPlugin(LiteModel):
-    module_name: str
-
-
-plugin_db.auto_migrate(InstalledPlugin)
--- a/src/plugins/liteyuki_plugin_npm/installer.py
+++ b/src/plugins/liteyuki_plugin_npm/installer.py
@ -5,26 +5,24 @@ import sys
 from io import StringIO
 from typing import Optional

+import aiofiles
+import aiohttp
 import nonebot
+import pip
 from arclet.alconna import Arparma, MultiVar
 from nonebot.permission import SUPERUSER
-from nonebot.utils import run_sync
-from nonebot_plugin_alconna import on_alconna, Alconna, Args, Subcommand
-import pip
-
-import aiohttp, aiofiles
-from typing_extensions import Any
+from nonebot_plugin_alconna import Alconna, Args, Subcommand, on_alconna

 from src.utils.language import get_user_lang
 from src.utils.message import Markdown as md, send_markdown
 from src.utils.resource import get_res
 from src.utils.typing import T_Bot, T_MessageEvent
-
 from .common import *
+from src.utils.data_manager import InstalledPlugin

 npm_alc = on_alconna(
    Alconna(
-        "lnpm",
+        ["lnpm", "插件管理"],
        Subcommand(
            "update",
            alias=["u"],
@ -93,40 +91,54 @@ async def _(result: Arparma, event: T_MessageEvent, bot: T_Bot):
                btn_install = md.button(ulang.get('npm.install'), 'lnpm install %s' % plugin.module_name)
                link_page = md.link(ulang.get('npm.homepage'), plugin.homepage)

-                reply += (f"\n{btn_install} | **{plugin.name}**\n"
+                reply += (f"\n{btn_install}  **{plugin.name}**\n"
                          f"\n > **{plugin.desc}**\n"
-                          f"\n > {ulang.get('npm.author')}: {plugin.author} | {link_page}\n\n***\n")
+                          f"\n > {ulang.get('npm.author')}: {plugin.author}  {link_page}\n\n***\n")
            if len(rs) > max_show:
-                reply += f"\n{ulang.get('npm.too_many_results')}"
+                reply += f"\n{ulang.get('npm.too_many_results', HIDE_NUM=len(rs) - max_show)}"
        else:
            reply = ulang.get("npm.search_no_result")
        await send_markdown(reply, bot, event=event)

    elif result.subcommands.get("install"):
-        plugin_name: str = result.subcommands["install"].args.get("plugin_name")
-        r, log = npm_install(plugin_name)
+        plugin_module_name: str = result.subcommands["install"].args.get("plugin_name")
+        await npm_alc.send(ulang.get("npm.installing", NAME=plugin_module_name))
+        r, log = npm_install(plugin_module_name)
+        log = log.replace("\\", "/")
        if r:
-            nonebot.load_plugin(plugin_name)
-            installed_plugin = InstalledPlugin(module_name=plugin_name)
-            store_plugin = await get_store_plugin(plugin_name)
-            plugin_db.save(installed_plugin)
-            await send_markdown(
-                f"**{ulang.get('npm.install_success', NAME=store_plugin.name)}**\n\n"
-                f"```\n{log}\n```",
-                bot,
-                event=event
-            )
+            nonebot.load_plugin(plugin_module_name)  # 加载插件
+            installed_plugin = InstalledPlugin(module_name=plugin_module_name)  # 构造插件信息模型
+            store_plugin = await get_store_plugin(plugin_module_name)  # 获取商店中的插件信息
+            found_in_db_plugin = plugin_db.first(InstalledPlugin, "module_name = ?", plugin_module_name)  # 查询数据库中是否已经安装
+            if found_in_db_plugin is None:
+                plugin_db.save(installed_plugin)
+                info = ulang.get('npm.install_success', NAME=store_plugin.name).replace('_', r'\\_')  # markdown转义
+                await send_markdown(
+                    f"{info}\n\n"
+                    f"```\n{log}\n```",
+                    bot,
+                    event=event
+                )
+            else:
+                await npm_alc.finish(ulang.get('npm.plugin_already_installed', NAME=store_plugin.name))
        else:
+            info = ulang.get('npm.install_failed', NAME=plugin_module_name).replace('_', r'\\_')
            await send_markdown(
-                f"{ulang.get('npm.install_success', NAME=plugin_name)}\n\n"
+                f"{info}\n\n"
                f"```\n{log}\n```",
                bot,
                event=event
            )

    elif result.subcommands.get("remove"):
-        plugin_name: str = result.subcommands["remove"].args.get("plugin_name")
-        await npm_alc.finish(ulang.get("npm.remove_success"))
+        plugin_module_name: str = result.subcommands["remove"].args.get("plugin_name")
+        found_installed_plugin: InstalledPlugin = plugin_db.first(InstalledPlugin, "module_name = ?", plugin_module_name)
+        if found_installed_plugin:
+            plugin_db.delete(InstalledPlugin, "module_name = ?", plugin_module_name)
+            reply = f"{ulang.get('npm.remove_success', NAME=found_installed_plugin.module_name)}"
+            await npm_alc.finish(reply)
+        else:
+            await npm_alc.finish(ulang.get("npm.plugin_not_installed", NAME=plugin_module_name))


 async def npm_update() -> bool:
@ -212,19 +224,25 @@ def npm_install(plugin_module_name) -> tuple[bool, str]:
    sys.stderr = buffer

    mirrors = [
-            "https://pypi.tuna.tsinghua.edu.cn/simple",
-            "https://pypi.mirrors.cqupt.edu.cn/simple/",
-            "https://pypi.org/simple",
+            "https://pypi.mirrors.cqupt.edu.cn/simple",  # 重庆邮电大学
+            "https://pypi.tuna.tsinghua.edu.cn/simple",  # 清华大学
+            "https://pypi.liteyuki.icu/simple",  # 轻雪镜像
+            "https://pypi.org/simple",  # 官方源
    ]

    # 使用pip安装包，对每个镜像尝试一次，成功后返回值
    success = False
    for mirror in mirrors:
        try:
+            nonebot.logger.info(f"npm_install try mirror: {mirror}")
            result = pip.main(['install', plugin_module_name, "-i", mirror])
            success = result == 0
-            break
+            if success:
+                break
+            else:
+                nonebot.logger.warning(f"npm_install failed, try next mirror.")
        except Exception as e:
+
            success = False
            continue

--- a/src/plugins/liteyuki_plugin_npm/manager.py
+++ b/src/plugins/liteyuki_plugin_npm/manager.py
@ -2,12 +2,14 @@ import nonebot.plugin
 from nonebot import on_command
 from nonebot.permission import SUPERUSER

+from src.utils.data_manager import InstalledPlugin, plugin_db
 from src.utils.message import Markdown as md, send_markdown
+from src.utils.permission import GROUP_ADMIN, GROUP_OWNER
 from src.utils.typing import T_Bot, T_MessageEvent
 from src.utils.language import get_user_lang

-list_plugins = on_command("list-plugin", aliases={"列出插件", "插件列表"}, priority=0, permission=SUPERUSER)
-toggle_plugin = on_command("enable-plugin", aliases={"启用插件", "禁用插件", "disable-plugin"}, priority=0, permission=SUPERUSER)
+list_plugins = on_command("list-plugin", aliases={"列出插件", "插件列表"}, priority=0)
+toggle_plugin = on_command("enable-plugin", aliases={"启用插件", "停用插件", "disable-plugin"}, priority=0, permission=SUPERUSER)


@list_plugins.handle()
@ -16,12 +18,24 @@ async def _(event: T_MessageEvent, bot: T_Bot):
    reply = f"# {lang.get('npm.loaded_plugins')} | {lang.get('npm.total', TOTAL=len(nonebot.get_loaded_plugins()))} \n***"
    for plugin in nonebot.get_loaded_plugins():
        # 检查是否有 metadata 属性
+        btn_help = md.button(lang.get('npm.help'), f'help {plugin.name}', False)
+        reply += f"\n{btn_help} "
        if plugin.metadata:
-            reply += (f"\n{md.button(lang.get('npm.help'), 'help %s' % plugin.name, False, False)} "
-                      f"**{plugin.metadata.name}**\n"
-                      f"\n > {plugin.metadata.description}\n\n***\n")
+            reply += (f"**{plugin.metadata.name}**\n"
+                      f"\n > {plugin.metadata.description}")
        else:
-            reply += (f"\n{md.button(lang.get('npm.help'), 'help %s' % plugin.name, False, False)} "
-                      f"**{plugin.name}**\n"
-                      f"\n > {lang.get('npm.no_description')}\n\n***\n")
+            reply += (f"**{plugin.name}**\n"
+                      f"\n > {lang.get('npm.no_description')}")
+        # if await GROUP_ADMIN(bot=bot, event=event) or await GROUP_OWNER(bot=bot, event=event) or await SUPERUSER(bot=bot, event=event):
+        if await GROUP_ADMIN(bot, event) or await GROUP_OWNER(bot, event) or await SUPERUSER(bot, event):
+            btn_enable = md.button(lang.get('npm.enable'), f'enable-plugin {plugin.module_name}')
+            btn_disable = md.button(lang.get('npm.disable'), f'disable-plugin {plugin.module_name}')
+            reply += f"\n > {btn_enable}    {btn_disable}"
+            if await SUPERUSER(bot, event):
+                plugin_in_database = plugin_db.first(InstalledPlugin, 'module_name = ?', plugin.module_name)
+                btn_remove = (
+                        md.button(lang.get('npm.uninstall'), f'lnpm remove {plugin.module_name}')) if plugin_in_database else lang.get(
+                    'npm.uninstall')
+                reply += f"    {btn_remove}"
+        reply += "\n\n***\n"
    await send_markdown(reply, bot, event=event)