From a4ab1af1608a114ba874d468c1dc2829c4c0df8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Sat, 6 Jul 2024 11:16:42 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=BC=BA=E5=88=B6=E6=89=93=E6=96=AD=E5=B0=8F?= =?UTF-8?q?=E7=88=B1=E8=AF=B4=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/config.py | 3 +++ xiaomusic/xiaomusic.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xiaomusic/config.py b/xiaomusic/config.py index a007f9a..c7bf4f3 100644 --- a/xiaomusic/config.py +++ b/xiaomusic/config.py @@ -120,6 +120,9 @@ class Config: user_key_word_dict: dict[str, str] = field( default_factory=default_user_key_word_dict ) + enable_force_stop: bool = ( + os.getenv("XIAOMUSIC_ENABLE_FORCE_STOP", "false").lower() == "true" + ) def append_keyword(self, keys, action): for key in keys.split(","): diff --git a/xiaomusic/xiaomusic.py b/xiaomusic/xiaomusic.py index d75b19a..3f6b365 100644 --- a/xiaomusic/xiaomusic.py +++ b/xiaomusic/xiaomusic.py @@ -344,11 +344,11 @@ class XiaoMusic: async def stop_if_xiaoai_is_playing(self, device_id): is_playing = await self.get_if_xiaoai_is_playing(device_id) - if is_playing: + if is_playing or self.config.enable_force_stop: # stop it ret = await self.mina_service.player_stop(device_id) self.log.info( - f"stop_if_xiaoai_is_playing player_stop device_id:{device_id} ret:{ret}" + f"stop_if_xiaoai_is_playing player_stop device_id:{device_id} enable_force_stop:{self.config.enable_force_stop} ret:{ret}" ) async def force_stop_one_xiaoai(self, device_id):