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

优化不定长参数arg1的用法

Browse Source
This commit is contained in:
涵曦 2024-06-26 00:17:29 +00:00
parent 8bd32f878f
commit 743d85de32
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xiaomusic/utils.py
View File

@ -192,7 +192,9 @@ async def get_web_music_duration(url, start=0, end=500):
async with aiohttp.ClientSession(timeout=timeout) as session: async with aiohttp.ClientSession(timeout=timeout) as session:
duration = await _get_web_music_duration(session, url, start=0, end=500) duration = await _get_web_music_duration(session, url, start=0, end=500)
if duration <= 0: if duration <= 0:
duration = await _get_web_music_duration(session, url, start=0, end=1000) duration = await _get_web_music_duration(
session, url, start=0, end=1000
)
except Exception: except Exception:
pass pass
return duration return duration

10
xiaomusic/xiaomusic.py
View File

@ -624,7 +624,7 @@ class XiaoMusic:
# 播放歌曲 # 播放歌曲
async def play(self, **kwargs): async def play(self, **kwargs):
self._playing = True self._playing = True
parts = kwargs["arg1"].split("|") parts = kwargs.get("arg1", "").split("|")
search_key = parts[0] search_key = parts[0]
name = parts[1] if len(parts) > 1 else search_key name = parts[1] if len(parts) > 1 else search_key
if name == "": if name == "":
@ -709,7 +709,7 @@ class XiaoMusic:
# 播放一个播放列表 # 播放一个播放列表
async def play_music_list(self, **kwargs): async def play_music_list(self, **kwargs):
parts = kwargs["arg1"].split("|") parts = kwargs.get("arg1").split("|")
list_name = parts[0] list_name = parts[0]
if list_name not in self._music_list: if list_name not in self._music_list:
await self.do_tts(f"播放列表{list_name}不存在") await self.do_tts(f"播放列表{list_name}不存在")
@ -737,7 +737,7 @@ class XiaoMusic:
if self._stop_timer: if self._stop_timer:
self._stop_timer.cancel() self._stop_timer.cancel()
self.log.info("关机定时器已取消") self.log.info("关机定时器已取消")
minute = int(kwargs["arg1"]) minute = int(kwargs.get("arg1", 0))
async def _do_stop(): async def _do_stop():
await asyncio.sleep(minute * 60) await asyncio.sleep(minute * 60)
@ -750,7 +750,7 @@ class XiaoMusic:
self.log.info(f"{minute}分钟后将关机") self.log.info(f"{minute}分钟后将关机")
async def set_volume(self, **kwargs): async def set_volume(self, **kwargs):
value = kwargs["arg1"] value = kwargs.get("arg1", 0)
await self.do_set_volume(value) await self.do_set_volume(value)
async def get_volume(self, **kwargs): async def get_volume(self, **kwargs):
@ -841,8 +841,6 @@ class XiaoMusic:
# 获取所有设备 # 获取所有设备
async def getalldevices(self, **kwargs): async def getalldevices(self, **kwargs):
arg1 = kwargs["arg1"]
self.log.debug("getalldevices. arg1:%s", arg1)
did_list = [] did_list = []
hardware_list = [] hardware_list = []
hardware_data = await self.mina_service.device_list() hardware_data = await self.mina_service.device_list()