TriM-Organization/Musicreater
2
0
Fork 0
mirror of https://github.com/TriM-Organization/Musicreater.git synced 2025-01-31 15:31:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复了一个小兼容性bug

Browse Source
This commit is contained in:
EillesWan 2024-01-23 18:36:25 +08:00
parent edd40c078f
commit dbb3f4c83f
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Musicreater/plugin/main.py
View File

@ -19,7 +19,7 @@ Terms & Conditions: License.md in the root directory
from dataclasses import dataclass from dataclasses import dataclass
from typing import Literal, Tuple, Union from typing import Literal, Tuple, Union
from ..constants import DEFAULT_PROGRESSBAR_STYLE from ..subclass import DEFAULT_PROGRESSBAR_STYLE, ProgressBarStyle
@dataclass(init=False) @dataclass(init=False)
@ -34,8 +34,8 @@ class ConvertConfig:
speed_multiplier: float speed_multiplier: float
"""速度倍率""" """速度倍率"""
progressbar_style: Union[Tuple[str, Tuple[str, str]], Literal[None]] progressbar_style: Union[ProgressBarStyle, None]
"""进度条样式组""" """进度条样式"""
dist_path: str dist_path: str
"""输出目录""" """输出目录"""
@ -45,7 +45,8 @@ class ConvertConfig:
output_path: str, output_path: str,
volume: float = 1.0, volume: float = 1.0,
speed: float = 1.0, speed: float = 1.0,
progressbar: Union[bool, Tuple[str, Tuple[str, str]]] = True, progressbar: Union[bool, Tuple[str, Tuple[str, str]], ProgressBarStyle] = True,
ignore_progressbar_param_error: bool = False,
): ):
""" """
将已经转换好的数据内容指令载入MC可读格式 将已经转换好的数据内容指令载入MC可读格式
@ -77,10 +78,20 @@ class ConvertConfig:
# 改这一段没🐎 # 改这一段没🐎
if progressbar is True: if progressbar is True:
self.progressbar_style = DEFAULT_PROGRESSBAR_STYLE self.progressbar_style = DEFAULT_PROGRESSBAR_STYLE
"""进度条样式组""" """进度条样式"""
else: return
elif isinstance(progressbar, ProgressBarStyle):
self.progressbar_style = progressbar self.progressbar_style = progressbar
"""进度条样式组""" """进度条样式"""
else: return
self.progressbar_style = None elif isinstance(progressbar, tuple):
"""进度条样式组""" if isinstance(progressbar[0],str) and isinstance(progressbar[1], tuple):
if isinstance(progressbar[1][0], str) and isinstance(progressbar[1][1], str):
self.progressbar_style = ProgressBarStyle(progressbar[0],progressbar[1][0],progressbar[1][1])
return
if not ignore_progressbar_param_error:
raise TypeError("参数 {} 的类型 {} 与所需类型 Union[bool, Tuple[str, Tuple[str, str]], ProgressBarStyle] 不符。".format(progressbar,type(progressbar)))
self.progressbar_style = None
"""进度条样式组"""