Merge pull request #4 from Redmomn/dev

fix: 正则非贪婪匹配

nonebot_plugin_vits_tts/config.py

@@ -1,14 +1,18 @@
 import pathlib
 
 try:
+    # pydantic v2
     from nonebot import get_plugin_config
 except ImportError:
+    # pydantic v1
     from nonebot import get_driver
 from pydantic import BaseModel
 
 try:
+    # pydantic v2
     from pydantic import field_validator
 except ImportError:
+    # pydantic v1
     from pydantic import validator as field_validator
 
 

nonebot_plugin_vits_tts/matcher.py

@@ -10,7 +10,7 @@
 from .utils.model import get_model_from_speaker, speakers
 from .vits import generate_voice
 
-vits_req = on_regex(r"^(.*)说(.*)", rule=Rule(is_tts_msg))
+vits_req = on_regex(r"^(.*?)说(.*)", rule=Rule(is_tts_msg))
 help_req = on_command("help", aliases={"帮助", "语音帮助", "语音合成帮助"})
 
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='nonebot_plugin_vits_tts',
-    version='0.1.5',
+    version='0.1.6',
     packages=find_packages(),
     install_requires=[
         'torch',
@@ -33,7 +33,7 @@
     author='Redmomn',
     author_email='[email protected]',
     description='nonebot-plugin-vits-tts',
-    long_description=open('README.md', encoding='utf*8').read(),
+    long_description=open('README.md', encoding='utf-8').read(),
     long_description_content_type='text/markdown',
     license='Apache-2.0',
     keywords=['nonebot2', 'vits', 'tts'],