ar0c/xiaomusic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 播放歌曲时被其他指令打断后没有继续播放

Browse Source
This commit is contained in:
涵曦 2024-07-02 13:25:38 +00:00
parent cdab5fc92d
commit 7f4e51be08
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xiaomusic/xiaomusic.py
View File

@ -301,6 +301,10 @@ class XiaoMusic:
sec = min(8, int(len(value) / 3)) sec = min(8, int(len(value) / 3))
await asyncio.sleep(sec) await asyncio.sleep(sec)
self.log.info(f"do_tts ok. cur_music:{self.cur_music}") self.log.info(f"do_tts ok. cur_music:{self.cur_music}")
await self.check_replay()
# 继续播放被打断的歌曲
async def check_replay(self):
if self.isplaying() and not self.isdownloading(): if self.isplaying() and not self.isdownloading():
# 继续播放歌曲 # 继续播放歌曲
self.log.info("现在继续播放歌曲") self.log.info("现在继续播放歌曲")
@ -634,6 +638,7 @@ class XiaoMusic:
opvalue, oparg = self.match_cmd(query, ctrl_panel) opvalue, oparg = self.match_cmd(query, ctrl_panel)
if not opvalue: if not opvalue:
await asyncio.sleep(1) await asyncio.sleep(1)
await self.check_replay()
continue continue
try: try:
@ -688,9 +693,7 @@ class XiaoMusic:
continue continue
self.log.info(f"匹配到指令. opkey:{opkey} opvalue:{opvalue} oparg:{oparg}") self.log.info(f"匹配到指令. opkey:{opkey} opvalue:{opvalue} oparg:{oparg}")
return (opvalue, oparg) return (opvalue, oparg)
if self.isplaying(): self.log.info(f"未匹配到指令 {query} {ctrl_panel}")
self.log.info("未匹配到指令，自动停止")
return ("stop", "notts")
return (None, None) return (None, None)
# 判断是否播放下一首歌曲 # 判断是否播放下一首歌曲