From 104be1997427c67836e3eac6c858c025c184fbff Mon Sep 17 00:00:00 2001 From: EillesWan Date: Sat, 9 Nov 2024 13:41:40 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=AB=E5=8A=A0=E5=A4=A7=E8=B6=85?= =?UTF-8?q?=E7=AE=A1=E6=9D=83=E5=88=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/nonebot_plugins/liteyuki_pacman/npm.py | 4 +- .../__init__.py | 0 .../data_source.py | 0 .../debug.py | 0 .../resources/idioms_p.txt | 0 .../utils.py | 0 .../trimo_plugin_msctconverter/msctexec.py | 67 +++++++++++-------- 7 files changed, 40 insertions(+), 31 deletions(-) rename src/nonebot_plugins/{liteyuki_plugin_dockdragon => trimo_plugin_dockdragon}/__init__.py (100%) rename src/nonebot_plugins/{liteyuki_plugin_dockdragon => trimo_plugin_dockdragon}/data_source.py (100%) rename src/nonebot_plugins/{liteyuki_plugin_dockdragon => trimo_plugin_dockdragon}/debug.py (100%) rename src/nonebot_plugins/{liteyuki_plugin_dockdragon => trimo_plugin_dockdragon}/resources/idioms_p.txt (100%) rename src/nonebot_plugins/{liteyuki_plugin_dockdragon => trimo_plugin_dockdragon}/utils.py (100%) diff --git a/src/nonebot_plugins/liteyuki_pacman/npm.py b/src/nonebot_plugins/liteyuki_pacman/npm.py index 35f54a1..9dfc7fd 100644 --- a/src/nonebot_plugins/liteyuki_pacman/npm.py +++ b/src/nonebot_plugins/liteyuki_pacman/npm.py @@ -5,7 +5,7 @@ import nonebot.plugin import pip from io import StringIO from arclet.alconna import MultiVar -from nonebot import Bot, require +from nonebot import Bot, require # type: ignore from nonebot.exception import FinishedException, IgnoredException, MockApiException from nonebot.internal.adapter import Event from nonebot.internal.matcher import Matcher @@ -111,7 +111,7 @@ async def _(result: Arparma, event: T_MessageEvent, bot: T_Bot, npm: Matcher): if not os.path.exists("data/liteyuki/plugins.json"): await npm_update() # 判断会话类型 - ulang = get_user_lang(str(event.user_id)) + ulang = get_user_lang(event.get_user_id()) plugin_name = result.args.get("plugin_name") sc = result.subcommands # 获取子命令 perm_s = await SUPERUSER(bot, event) # 判断是否为超级用户 diff --git a/src/nonebot_plugins/liteyuki_plugin_dockdragon/__init__.py b/src/nonebot_plugins/trimo_plugin_dockdragon/__init__.py similarity index 100% rename from src/nonebot_plugins/liteyuki_plugin_dockdragon/__init__.py rename to src/nonebot_plugins/trimo_plugin_dockdragon/__init__.py diff --git a/src/nonebot_plugins/liteyuki_plugin_dockdragon/data_source.py b/src/nonebot_plugins/trimo_plugin_dockdragon/data_source.py similarity index 100% rename from src/nonebot_plugins/liteyuki_plugin_dockdragon/data_source.py rename to src/nonebot_plugins/trimo_plugin_dockdragon/data_source.py diff --git a/src/nonebot_plugins/liteyuki_plugin_dockdragon/debug.py b/src/nonebot_plugins/trimo_plugin_dockdragon/debug.py similarity index 100% rename from src/nonebot_plugins/liteyuki_plugin_dockdragon/debug.py rename to src/nonebot_plugins/trimo_plugin_dockdragon/debug.py diff --git a/src/nonebot_plugins/liteyuki_plugin_dockdragon/resources/idioms_p.txt b/src/nonebot_plugins/trimo_plugin_dockdragon/resources/idioms_p.txt similarity index 100% rename from src/nonebot_plugins/liteyuki_plugin_dockdragon/resources/idioms_p.txt rename to src/nonebot_plugins/trimo_plugin_dockdragon/resources/idioms_p.txt diff --git a/src/nonebot_plugins/liteyuki_plugin_dockdragon/utils.py b/src/nonebot_plugins/trimo_plugin_dockdragon/utils.py similarity index 100% rename from src/nonebot_plugins/liteyuki_plugin_dockdragon/utils.py rename to src/nonebot_plugins/trimo_plugin_dockdragon/utils.py diff --git a/src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py b/src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py index 041b31a..fe511b3 100644 --- a/src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py +++ b/src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py @@ -420,11 +420,16 @@ async def _( event: GroupUploadNoticeEvent, bot: T_Bot, ): + + common_permission = not (await SUPERUSER(bot, event)) + # global cache_limit_data file_infomation = event.model_dump()["file"] file_subtype: str = os.path.splitext(file_infomation["name"])[-1].lower() + if file_subtype in cache_limit_data.keys(): - if file_infomation["size"] > cache_limit_data[file_subtype][0]: + + if (file_infomation["size"] > cache_limit_data[file_subtype][0]) and common_permission: await notece_.finish( "文件 {} 大小过大，这不是网盘\n单个{}文件不应大于 {} 千字节".format( file_infomation["name"], @@ -434,11 +439,12 @@ async def _( at_sender=True, ) return - elif (usr_id := str(event.user_id)) in filesaves.keys(): + + if (usr_id := str(event.user_id)) in filesaves.keys(): if ( filesaves[usr_id]["totalSize"] + file_infomation["size"] > max_cache_size - ): + ) and common_permission: await notece_.send( "缓存容量已经耗尽，当前你在服务器内的占有为 {} 字节，合 {}/{} 千字节\n而服务器最多支持每个人占有 {} 兆字节（即 {} 字节）".format( filesaves[usr_id]["totalSize"], @@ -460,6 +466,9 @@ async def _( ) ) return + else: + filesaves[usr_id] = {"totalSize": 0} + savepath = database_dir / usr_id os.makedirs(savepath, exist_ok=True) @@ -471,32 +480,32 @@ async def _( ) now = zhDateTime.DateTime.now() - try: - filesaves[usr_id][file_infomation["name"]] = { - "date": [ - now.year, - now.month, - now.day, - now.hour, - now.minute, - ], - "size": file_infomation["size"], - } - filesaves[usr_id]["totalSize"] += file_infomation["size"] - except: - filesaves[usr_id] = { - file_infomation["name"]: { - "date": [ - now.year, - now.month, - now.day, - now.hour, - now.minute, - ], - "size": file_infomation["size"], - } - } - filesaves[usr_id]["totalSize"] = file_infomation["size"] + # try: + filesaves[usr_id][file_infomation["name"]] = { + "date": [ + now.year, + now.month, + now.day, + now.hour, + now.minute, + ], + "size": file_infomation["size"], + } + filesaves[usr_id]["totalSize"] += file_infomation["size"] + # except: + # filesaves[usr_id] = { + # file_infomation["name"]: { + # "date": [ + # now.year, + # now.month, + # now.day, + # now.hour, + # now.minute, + # ], + # "size": file_infomation["size"], + # } + # } + # filesaves[usr_id]["totalSize"] = file_infomation["size"] save_filesaves() await notece_.finish( "文件 {} 已经保存，此文件在{:.1f}分内有效。".format(