From 73563aecfabf6ad736543522fb191850f8b52fc7 Mon Sep 17 00:00:00 2001 From: EillesWan Date: Tue, 23 Jul 2024 03:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=85=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E5=86=85=E5=AD=98=E5=81=9C=E7=95=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trimo_plugin_msctconverter/msctexec.py | 34 +++++++++++++------ .../trimo_plugin_msctconverter/mspvexec.py | 32 ++++++++++++----- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/src/plugins/trimo_plugin_msctconverter/msctexec.py b/src/plugins/trimo_plugin_msctconverter/msctexec.py index 5c6cfe8..ba2b95e 100644 --- a/src/plugins/trimo_plugin_msctconverter/msctexec.py +++ b/src/plugins/trimo_plugin_msctconverter/msctexec.py @@ -224,7 +224,7 @@ async def _(): os.remove(database_dir / qqid / name) except: pass - + if qqid in people_convert_point: del people_convert_point[qqid] filesaves[qqid]["totalSize"] -= filesaves[qqid][name]["size"] @@ -753,15 +753,23 @@ async def _( or ( isinstance(msct_obj, tuple) and ( - isinstance(msct_obj[0], Musicreater.MidiConvert) - and msct_obj[1] - != ( - not _args["enable-mismatch-error"], - _args["play-speed"], - _args["default-tempo"], - pitched_notechart, - percussion_notechart, - volume_curve, + ( + isinstance(msct_obj[0], Musicreater.MidiConvert) + and msct_obj[1] + != ( + not _args["enable-mismatch-error"], + _args["play-speed"], + _args["default-tempo"], + pitched_notechart, + percussion_notechart, + volume_curve, + ) + ) + or ( + msct_obj[0].music_name + != os.path.splitext( + os.path.basename(usr_data_path / file_to_convert) + )[0].replace(" ", "_") ) ) ) @@ -804,6 +812,12 @@ async def _( percussion_notechart, volume_curve, ) + and ( + msct_obj[0].music_name + != os.path.splitext( + os.path.basename(usr_data_path / file_to_convert) + )[0].replace(" ", "_") + ) ): msct_obj = msct_obj[0] msct_obj.redefine_execute_format(_args["old-execute-format"]) diff --git a/src/plugins/trimo_plugin_msctconverter/mspvexec.py b/src/plugins/trimo_plugin_msctconverter/mspvexec.py index 6f9f7b3..24e5251 100644 --- a/src/plugins/trimo_plugin_msctconverter/mspvexec.py +++ b/src/plugins/trimo_plugin_msctconverter/mspvexec.py @@ -257,15 +257,23 @@ async def _( or ( isinstance(msct_obj, tuple) and ( - isinstance(msct_obj[0], Musicreater.MidiConvert) - and msct_obj[1] - != ( - not _args["enable-mismatch-error"], - _args["play-speed"], - _args["default-tempo"], - pitched_notechart, - percussion_notechart, - volume_curve, + ( + isinstance(msct_obj[0], Musicreater.MidiConvert) + and msct_obj[1] + != ( + not _args["enable-mismatch-error"], + _args["play-speed"], + _args["default-tempo"], + pitched_notechart, + percussion_notechart, + volume_curve, + ) + ) + or ( + msct_obj[0].music_name + != os.path.splitext( + os.path.basename(usr_data_path / file_to_convert) + )[0].replace(" ", "_") ) ) ) @@ -306,6 +314,12 @@ async def _( percussion_notechart, volume_curve, ) + and ( + msct_obj[0].music_name + != os.path.splitext( + os.path.basename(usr_data_path / file_to_convert) + )[0].replace(" ", "_") + ) ): nonebot.logger.info("载入已有缓存。") msct_obj = msct_obj[0]