From 69e53569cafce5210411e8f1b171af914a9d3a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Mon, 8 Apr 2024 07:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A9=BA=E5=80=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/xiaomusic.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/xiaomusic/xiaomusic.py b/xiaomusic/xiaomusic.py index 25b6a22..d846f40 100644 --- a/xiaomusic/xiaomusic.py +++ b/xiaomusic/xiaomusic.py @@ -299,7 +299,7 @@ class XiaoMusic: return True # 下载歌曲 - async def download(self, search_key,name): + async def download(self, search_key, name): if self.download_proc: try: self.download_proc.kill() @@ -484,18 +484,17 @@ class XiaoMusic: # 播放歌曲 async def play(self, **kwargs): - search_key,name = kwargs["arg1"].split('|') - #空值填充: - search_key = search_key if search_key else name - name = name if name else search_key + parts = kwargs["arg1"].split("|") + search_key = parts[0] + name = parts[1] if len(parts) > 1 else search_key if search_key == "" and name == "": await self.play_next() - return + return filename = self.get_filename(name) if len(filename) <= 0: - await self.download(search_key,name) - self.log.info("正在下载中 %s", search_key+":"+name) + await self.download(search_key, name) + self.log.info("正在下载中 %s", search_key + ":" + name) await self.download_proc.wait() # 把文件插入到播放列表里 self.add_download_music(name)