Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

重构插件管理器的数据源解析逻辑

Browse Source 
- 将插件ID和模块名的检查逻辑移至单独的私有方法 _resolve_plugin_key
- 简化了 get_info 和 update_plugin 方法中的逻辑
- 提高了代码的可读性和可维护性
This commit is contained in:
molanp 2024-10-02 15:39:41 +08:00
parent 2bcaa6f12e
commit 397c786b85
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
zhenxun/builtin_plugins/plugin_store/data_source.py
View File

@ -283,17 +283,10 @@ class ShopManage:
str: 返回消息 str: 返回消息
""" """
data: dict[str, StorePluginInfo] = await cls.get_data() data: dict[str, StorePluginInfo] = await cls.get_data()
if isinstance(plugin_id, int) and (plugin_id < 0 or plugin_id >= len(data)): try:
return "插件ID不存在..." plugin_key = await cls._resolve_plugin_key(plugin_id)
elif isinstance(plugin_id, str) and plugin_id not in [ except ValueError as e:
v.module for k, v in data.items() return str(e)
]:
return "插件Module不存在..."
plugin_key = (
list(data.keys())[plugin_id]
if isinstance(plugin_id, int)
else {v.module: k for k, v in data.items()}[plugin_id]
)
plugin_info = data[plugin_key] plugin_info = data[plugin_key]
path = BASE_PATH path = BASE_PATH
if plugin_info.github_url: if plugin_info.github_url:
@ -366,17 +359,10 @@ class ShopManage:
str: 返回消息 str: 返回消息
""" """
data: dict[str, StorePluginInfo] = await cls.get_data() data: dict[str, StorePluginInfo] = await cls.get_data()
if isinstance(plugin_id, int) and (plugin_id < 0 or plugin_id >= len(data)): try:
return "插件ID不存在..." plugin_key = await cls._resolve_plugin_key(plugin_id)
elif isinstance(plugin_id, str) and plugin_id not in [ except ValueError as e:
v.module for k, v in data.items() return str(e)
]:
return "插件Module不存在..."
plugin_key = (
list(data.keys())[plugin_id]
if isinstance(plugin_id, int)
else {v.module: k for k, v in data.items()}[plugin_id]
)
logger.info(f"尝试更新插件 {plugin_key}", "插件管理") logger.info(f"尝试更新插件 {plugin_key}", "插件管理")
plugin_info = data[plugin_key] plugin_info = data[plugin_key]
plugin_list = await cls.get_loaded_plugins("module", "version") plugin_list = await cls.get_loaded_plugins("module", "version")
@ -439,3 +425,14 @@ class ShopManage:
return "已更新插件 {}\n共计{}个插件! 重启后生效".format( return "已更新插件 {}\n共计{}个插件! 重启后生效".format(
"\n- ".join(update_list), len(update_list) "\n- ".join(update_list), len(update_list)
) )
@classmethod
async def _resolve_plugin_key(cls, plugin_id: int | str) -> str:
data: dict[str, StorePluginInfo] = await cls.get_data()
if isinstance(plugin_id, int):
if plugin_id < 0 or plugin_id >= len(data):
raise ValueError("插件ID不存在...")
return list(data.keys())[plugin_id]
elif isinstance(plugin_id, str):
if plugin_id not in [v.module for k, v in data.items()]:
raise ValueError("插件Module不存在...")
return {v.module: k for k, v in data.items()}[plugin_id]