Compare commits

..
4 Commits
Author SHA1 Message Date
HibiKier 38501cebf1 Update data_source.py 2022-05-29 20:56:03 +08:00
HibiKier ee45d0217e Update __init__.py 2022-05-29 20:55:32 +08:00
HibiKier 558f362919 update v0.1.5.8 2022-05-29 20:47:18 +08:00
HibiKier fb9db2f50c fix 2022-05-29 19:57:57 +08:00
7 changed files with 24 additions and 10 deletions
+3 -2
View File
@@ -243,10 +243,11 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
## 更新 ## 更新
### 2022/5/29 \[v0.1.5.7] ### 2022/5/29 \[v0.1.5.8]
* 修复错误的resource路径会删除IMAGE_PATH等重要文件夹
* 提供了真寻适配仓库的插件 安装/卸载 操作 * 提供了真寻适配仓库的插件 安装/卸载 操作
* 暂时关闭了插件资源清空
* 通过指令安装插件时会在插件目录下生成plugin_info.json记录当前插件信息
### 2022/5/28 ### 2022/5/28
+1 -1
View File
@@ -1 +1 @@
__version__: v0.1.5.6 __version__: v0.1.5.8
@@ -40,7 +40,7 @@ def init_none_plugin_count_manager():
plugins2block_manager.save() plugins2block_manager.save()
plugins_manager.delete(module) plugins_manager.delete(module)
plugins_manager.save() plugins_manager.save()
resources_manager.remove_resource(module) # resources_manager.remove_resource(module)
none_plugin_count_manager.delete(module) none_plugin_count_manager.delete(module)
logger.info(f"{module}:{plugin_name} 插件疑似已删除,清除对应插件数据...") logger.info(f"{module}:{plugin_name} 插件疑似已删除,清除对应插件数据...")
except Exception as e: except Exception as e:
+12 -1
View File
@@ -1,6 +1,6 @@
from nonebot import on_command, on_regex from nonebot import on_command, on_regex
from .data_source import show_plugin_repo, install_plugin, uninstall_plugin from .data_source import show_plugin_repo, install_plugin, uninstall_plugin, download_json
from services.log import logger from services.log import logger
from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
from nonebot.params import CommandArg from nonebot.params import CommandArg
@@ -15,6 +15,7 @@ usage:
下载安装插件 下载安装插件
指令: 指令:
查看插件仓库 查看插件仓库
更新插件仓库
安装插件 [name/id] 安装插件 [name/id]
卸载插件 [name/id] 卸载插件 [name/id]
""".strip() """.strip()
@@ -25,6 +26,8 @@ __plugin_author__ = "HibiKier"
show_repo = on_regex("^查看插件仓库$", priority=1, block=True, permission=SUPERUSER) show_repo = on_regex("^查看插件仓库$", priority=1, block=True, permission=SUPERUSER)
update_repo = on_regex("^更新插件仓库$", priority=1, block=True, permission=SUPERUSER)
install_plugin_matcher = on_command("安装插件", priority=1, block=True, permission=SUPERUSER) install_plugin_matcher = on_command("安装插件", priority=1, block=True, permission=SUPERUSER)
uninstall_plugin_matcher = on_command("卸载插件", priority=1, block=True, permission=SUPERUSER) uninstall_plugin_matcher = on_command("卸载插件", priority=1, block=True, permission=SUPERUSER)
@@ -44,6 +47,14 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
await install_plugin_matcher.send(msg) await install_plugin_matcher.send(msg)
@update_repo.handle()
async def _(bot: Bot, event: MessageEvent):
code = await download_json()
if code == 200:
await update_repo.finish("更新插件仓库信息成功!")
await update_repo.send("更新插件仓库信息失败!")
@show_repo.handle() @show_repo.handle()
async def _(bot: Bot, event: MessageEvent): async def _(bot: Bot, event: MessageEvent):
msg = await show_plugin_repo() msg = await show_plugin_repo()
+5 -3
View File
@@ -71,6 +71,8 @@ async def install_plugin(name: str) -> str:
os.system( os.system(
f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'pyproject.toml').absolute()}" f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'pyproject.toml').absolute()}"
) )
with open(extensive_plugin_path / f'{name}' / "plugin_info.json", 'w') as f:
json.dump(data[name], f, ensure_ascii=False, indent=4)
logger.debug("移动插件文件夹完成...") logger.debug("移动插件文件夹完成...")
logger.info(f"成功安装插件 {name} 成功!\n{tmp}") logger.info(f"成功安装插件 {name} 成功!\n{tmp}")
return f"成功安装插件 {name},请重启bot!" return f"成功安装插件 {name},请重启bot!"
@@ -133,10 +135,10 @@ async def show_plugin_repo() -> Union[int, str]:
w = w if w > img.w else img.w w = w if w > img.w else img.w
h += img.h + line_height h += img.h + line_height
image_list.append(img) image_list.append(img)
A = BuildImage(w + 100, h + 100, color="#f9f6f2") A = BuildImage(w + 50, h + 50, color="#f9f6f2")
cur_h = 50 cur_h = 25
for img in image_list: for img in image_list:
await A.apaste(img, (50, cur_h)) await A.apaste(img, (25, cur_h))
cur_h += img.h + line_height cur_h += img.h + line_height
return A.pic2bs4() return A.pic2bs4()
+1 -1
View File
@@ -27,7 +27,7 @@ __plugin_author__ = "HibiKier"
__plugin_configs__ = { __plugin_configs__ = {
"UPDATE_REMIND": { "UPDATE_REMIND": {
"value": True, "value": True,
"help": "真寻是否自动检查更新", "help": "真寻是否检测版本状态",
"default": True, "default": True,
}, },
"AUTO_UPDATE_ZHENXUN": { "AUTO_UPDATE_ZHENXUN": {
@@ -36,7 +36,7 @@ __plugin_settings__ = {
"limit_superuser": False, "limit_superuser": False,
"cmd": ["发送图片"] + Config.get_config("image_management", "IMAGE_DIR_LIST"), "cmd": ["发送图片"] + Config.get_config("image_management", "IMAGE_DIR_LIST"),
} }
__plugin_resources__ = {"pa": IMAGE_PATH} __plugin_resources__ = {"pa": IMAGE_PATH / "pa"}
Config.add_plugin_config( Config.add_plugin_config(
"_task", "_task",