TriM-Organization/LiteyukiBot-TriM
2
0
Fork 0
mirror of https://github.com/TriM-Organization/LiteyukiBot-TriM.git synced 2024-11-11 01:27:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

😅修复了内存停留的问题

Browse Source
This commit is contained in:
EillesWan 2024-07-23 03:41:42 +08:00
parent 8188b85501
commit 73563aecfa
2 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/trimo_plugin_msctconverter/msctexec.py
View File

@ -753,15 +753,23 @@ async def _(
or ( or (
isinstance(msct_obj, tuple) isinstance(msct_obj, tuple)
and ( and (
isinstance(msct_obj[0], Musicreater.MidiConvert) (
and msct_obj[1] isinstance(msct_obj[0], Musicreater.MidiConvert)
!= ( and msct_obj[1]
not _args["enable-mismatch-error"], != (
_args["play-speed"], not _args["enable-mismatch-error"],
_args["default-tempo"], _args["play-speed"],
pitched_notechart, _args["default-tempo"],
percussion_notechart, pitched_notechart,
volume_curve, 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, percussion_notechart,
volume_curve, 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 = msct_obj[0]
msct_obj.redefine_execute_format(_args["old-execute-format"]) msct_obj.redefine_execute_format(_args["old-execute-format"])

32
src/plugins/trimo_plugin_msctconverter/mspvexec.py
View File

@ -257,15 +257,23 @@ async def _(
or ( or (
isinstance(msct_obj, tuple) isinstance(msct_obj, tuple)
and ( and (
isinstance(msct_obj[0], Musicreater.MidiConvert) (
and msct_obj[1] isinstance(msct_obj[0], Musicreater.MidiConvert)
!= ( and msct_obj[1]
not _args["enable-mismatch-error"], != (
_args["play-speed"], not _args["enable-mismatch-error"],
_args["default-tempo"], _args["play-speed"],
pitched_notechart, _args["default-tempo"],
percussion_notechart, pitched_notechart,
volume_curve, 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, percussion_notechart,
volume_curve, 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("载入已有缓存。") nonebot.logger.info("载入已有缓存。")
msct_obj = msct_obj[0] msct_obj = msct_obj[0]