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

fix: #116 播放失败自动切下首歌

Browse Source
This commit is contained in:
涵曦 2024-07-15 17:17:08 +00:00
parent e8ca1f8678
commit 7114ea2e6e
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xiaomusic/xiaomusic.py
View File

@ -821,6 +821,7 @@ class XiaoMusicDevice:
self._playing = False self._playing = False
# 关机定时器 # 关机定时器
self._stop_timer = None self._stop_timer = None
self._last_cmd = None
self.update_playlist() self.update_playlist()
# 初始化播放列表 # 初始化播放列表
@ -832,6 +833,10 @@ class XiaoMusicDevice:
# 播放歌曲 # 播放歌曲
async def play(self, name="", search_key=""): async def play(self, name="", search_key=""):
self._last_cmd = "play"
return await self._play(name=name, search_key=search_key)
async def _play(self, name="", search_key=""):
if search_key == "" and name == "": if search_key == "" and name == "":
if self.check_play_next(): if self.check_play_next():
await self.play_next() await self.play_next()
@ -855,6 +860,9 @@ class XiaoMusicDevice:
# 下一首 # 下一首
async def play_next(self): async def play_next(self):
return await self._play_next()
async def _play_next(self):
self.log.info("开始播放下一首") self.log.info("开始播放下一首")
name = self.cur_music name = self.cur_music
if ( if (
@ -867,10 +875,11 @@ class XiaoMusicDevice:
if name == "": if name == "":
await self.do_tts("本地没有歌曲") await self.do_tts("本地没有歌曲")
return return
await self.play(name) await self._play(name)
# 播放本地歌曲 # 播放本地歌曲
async def playlocal(self, name): async def playlocal(self, name):
self._last_cmd = "playlocal"
if name == "": if name == "":
if self.check_play_next(): if self.check_play_next():
await self.play_next() await self.play_next()
@ -894,7 +903,14 @@ class XiaoMusicDevice:
sec, url = await self.xiaomusic.get_music_sec_url(name) sec, url = await self.xiaomusic.get_music_sec_url(name)
await self.group_force_stop_xiaoai() await self.group_force_stop_xiaoai()
self.log.info(f"播放 {url}") self.log.info(f"播放 {url}")
await self.group_player_play(url) results = await self.group_player_play(url)
if all(ele is None for ele in results):
self.log.info(f"播放 {name} 失败")
await asyncio.sleep(1)
if self.isplaying() and self._last_cmd != "stop":
await self._play_next()
return
self.log.info("已经开始播放了") self.log.info("已经开始播放了")
# 取消组内所有的下一首歌曲的定时器 # 取消组内所有的下一首歌曲的定时器
@ -998,7 +1014,7 @@ class XiaoMusicDevice:
if self.isplaying() and not self.isdownloading(): if self.isplaying() and not self.isdownloading():
# 继续播放歌曲 # 继续播放歌曲
self.log.info("现在继续播放歌曲") self.log.info("现在继续播放歌曲")
await self.play() await self._play()
else: else:
self.log.info( self.log.info(
f"不会继续播放歌曲. isplaying:{self.isplaying()} isdownloading:{self.isdownloading()}" f"不会继续播放歌曲. isplaying:{self.isplaying()} isdownloading:{self.isdownloading()}"
@ -1141,12 +1157,14 @@ class XiaoMusicDevice:
await self.do_tts(tts) await self.do_tts(tts)
async def play_music_list(self, list_name, music_name): async def play_music_list(self, list_name, music_name):
self._last_cmd = "play_music_list"
self._cur_play_list = list_name self._cur_play_list = list_name
self._play_list = self.xiaomusic.music_list[list_name] self._play_list = self.xiaomusic.music_list[list_name]
self.log.info(f"开始播放列表{list_name}") self.log.info(f"开始播放列表{list_name}")
await self.play(music_name) await self._play(music_name)
async def stop(self, arg1=""): async def stop(self, arg1=""):
self._last_cmd = "stop"
self._playing = False self._playing = False
if arg1 != "notts": if arg1 != "notts":
await self.do_tts(self.config.stop_tts_msg) await self.do_tts(self.config.stop_tts_msg)