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

启动时生成一次播放列表，修复下一首越界判断问题

Browse Source
This commit is contained in:
涵曦 2024-02-24 12:58:01 +08:00
parent 54b4417069
commit 7a32917b63
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xiaomusic/xiaomusic.py
View File

@ -79,6 +79,9 @@ class XiaoMusic:
self.log.addHandler(RichHandler()) self.log.addHandler(RichHandler())
self.log.debug(config) self.log.debug(config)
# 启动时重新生成一次播放列表
self.gen_all_music_list()
async def poll_latest_ask(self): async def poll_latest_ask(self):
async with ClientSession() as session: async with ClientSession() as session:
session._cookie_jar = self.cookie_jar session._cookie_jar = self.cookie_jar
@ -324,6 +327,8 @@ class XiaoMusic:
# 本地是否存在歌曲 # 本地是否存在歌曲
def get_filename(self, name): def get_filename(self, name):
if name not in self._all_music:
return ""
filename = self._all_music[name] filename = self._all_music[name]
self.log.debug("try get_filename. filename:%s", filename) self.log.debug("try get_filename. filename:%s", filename)
if os.path.exists(filename): if os.path.exists(filename):
@ -374,10 +379,6 @@ class XiaoMusic:
# 获取下一首 # 获取下一首
def get_next_music(self): def get_next_music(self):
play_list_len = len(self._play_list) play_list_len = len(self._play_list)
if play_list_len == 0:
# 尝试重新生成一次播放列表
self.gen_all_music_list()
play_list_len = len(self._play_list)
if play_list_len == 0: if play_list_len == 0:
self.log.warning(f"没有随机到歌曲") self.log.warning(f"没有随机到歌曲")
return "" return ""
@ -388,7 +389,7 @@ class XiaoMusic:
except ValueError: except ValueError:
pass pass
next_index = index + 1 next_index = index + 1
if next_index > play_list_len: if next_index >= play_list_len:
next_index = 0 next_index = 0
filename = self._play_list[next_index] filename = self._play_list[next_index]
return filename return filename