From 7347424c0ba02eb25c9f2e686dc33dd12a4f4cdd Mon Sep 17 00:00:00 2001 From: EillesWan Date: Sun, 6 Oct 2024 03:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=A6=E4=B8=8D=E8=AF=95=E8=AF=95?= =?UTF-8?q?=E6=80=8E=E4=B9=88=E9=80=9D=E4=B8=96=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py | 5 ++++- src/resources/vanilla_resource/templates/js/status.js | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py b/src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py index 8795f8a..6ea0f2a 100644 --- a/src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py +++ b/src/nonebot_plugins/trimo_plugin_msctconverter/msctexec.py @@ -9,6 +9,7 @@ import asyncio from io import StringIO from pathlib import Path from typing import Annotated, Any, Union +from builtins import ellipsis # from nonebot import require @@ -653,7 +654,7 @@ async def _( if arg in result.options[arg].args.keys() else result.options[arg].args ) - if (_vlu := result.options[arg].value) is None + if ((_vlu := result.options[arg].value) is None or isinstance(_vlu, ellipsis) ) else _vlu ) # await musicreater_convert.finish( @@ -661,6 +662,8 @@ async def _( # ) nonebot.logger.info(_args) + + if ((not superuser_permission) and (usr_id not in filesaves.keys())) or ( superuser_permission and ( diff --git a/src/resources/vanilla_resource/templates/js/status.js b/src/resources/vanilla_resource/templates/js/status.js index f6df8fe..4344c7a 100644 --- a/src/resources/vanilla_resource/templates/js/status.js +++ b/src/resources/vanilla_resource/templates/js/status.js @@ -100,7 +100,8 @@ function createBarChart(title, percent, name) { diskDiv.setAttribute("class", "disk-info"); diskDiv.style.marginBottom = "20px"; diskDiv.innerHTML = ` -
${title}
+
${name}
+
${title}
`; updateDiskNameWidth(diskDiv);