bump: version 0.3.4 → 0.3.5

build: update static version
fix: #116 播放失败自动切下首歌
2025-12-06 14:52:50 +08:00 · 2024-07-15 17:17:26 +00:00 · 2024-07-15 17:17:26 +00:00 · 2024-07-15 17:17:08 +00:00 · 2024-07-15 16:46:06 +00:00 · 2024-07-15 16:46:06 +00:00
13 changed files with 82 additions and 47 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## v0.3.5 (2024-07-15)
+
+### Fix
+
+- #116 播放失败自动切下首歌
+
+## v0.3.4 (2024-07-15)
+
+### Fix
+
+- #125 修复本地英文歌曲匹大小写字母配不到的问题
+
+## v0.3.3 (2024-07-15)
+
+### Fix
+
+- 尝试修复播放卡顿问题 see #124
+
 ## v0.3.2 (2024-07-15)

 ### Fix
--- a/newpatch.sh
+++ b/newpatch.sh
@@ -1,5 +1,9 @@
 #!/bin/bash

+./update-static-version.py
+git add xiaomusic/static
+git commit -m 'build: update static version'
+
 cz bump --check-consistency --increment patch

 git push -u origin main --tags
--- a/newversion.sh
+++ b/newversion.sh
@@ -1,5 +1,9 @@
 #!/bin/bash

+./update-static-version.py
+git add xiaomusic/static
+git commit -m 'build: update static version'
+
 cz bump --check-consistency

 git push -u origin main --tags
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "xiaomusic"
-version = "0.3.2"
+version = "0.3.5"
 description = "Play Music with xiaomi AI speaker"
 authors = [
 {name = "涵曦", email = "im.hanxi@gmail.com"},
--- a/update-static-version.py
+++ b/update-static-version.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3

 import re
-import sys
 from pathlib import Path


@@ -42,12 +41,9 @@ def update_html_version(html_files, version):

 # 使用案例
 if __name__ == "__main__":
-    # 导入 xiaomusic 包以获取 __version__ 变量
-    try:
-        from xiaomusic import __version__ as new_version
-    except ImportError as e:
-        print("无法导入版本号：", e)
-        sys.exit(1)
+    import time
+
+    t = str(int(time.time()))

    # 指定目录
    html_directory = "xiaomusic/static"  # 修改为实际的HTML文件目录路径
@@ -56,4 +52,4 @@ if __name__ == "__main__":
    html_files_to_update = get_html_files(html_directory)

    # 执行更新
-    update_html_version(html_files_to_update, new_version)
+    update_html_version(html_files_to_update, t)
--- a/xiaomusic/init.py
+++ b/xiaomusic/init.py
@@ -1 +1 @@
-__version__ = "0.3.2"
+__version__ = "0.3.5"
--- a/xiaomusic/httpserver.py
+++ b/xiaomusic/httpserver.py
@@ -4,7 +4,6 @@ import os
 import secrets
 from contextlib import asynccontextmanager
 from dataclasses import asdict
-from pathlib import Path
 from typing import Annotated

 from fastapi import Depends, FastAPI, HTTPException, Request, status
@@ -75,6 +74,10 @@ def reset_http_server():
    else:
        app.dependency_overrides = {}

+    # 更新 music 链接
+    app.router.routes = [route for route in app.router.routes if route.path != "/music"]
+    app.mount("/music", StaticFiles(directory=config.music_path), name="music")
+

 def HttpInit(_xiaomusic):
    global xiaomusic, config, log
@@ -87,23 +90,6 @@ def HttpInit(_xiaomusic):
    reset_http_server()


-@app.get("/music/{file_path:path}")
-async def read_music_file(file_path: str):
-    base_dir = os.path.abspath(config.music_path)
-    real_path = os.path.normpath(os.path.join(base_dir, file_path))
-    log.info(f"read_music_file. file_path:{file_path} real_path:{real_path}")
-    if not real_path.startswith(base_dir):
-        raise HTTPException(
-            status_code=403, detail="Access to this file is not permitted"
-        )
-
-    file_location = Path(real_path).resolve()
-    if not file_location.exists() or not file_location.is_file():
-        raise HTTPException(status_code=404, detail="File not found")
-
-    return FileResponse(file_location)
-
-
@app.get("/")
 async def read_index():
    return FileResponse("xiaomusic/static/index.html")
--- a/xiaomusic/static/debug.html
+++ b/xiaomusic/static/debug.html
@@ -5,9 +5,9 @@
    <meta name="viewport" content="width=device-width">
    <title>Debug For XiaoMusic</title>

-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=0.3.2">
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721063846">
    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
-    <script src="/static/jquery-3.7.1.min.js?version=0.3.2"></script>
+    <script src="/static/jquery-3.7.1.min.js?version=1721063846"></script>

    <script>
 var vConsole = new window.VConsole();
--- a/xiaomusic/static/index.html
+++ b/xiaomusic/static/index.html
@@ -3,9 +3,9 @@
  <head>
    <meta name="viewport" content="width=device-width">
    <title>小爱音箱操控面板</title>
-    <script src="/static/jquery-3.7.1.min.js?version=0.3.2"></script>
-    <script src="/static/app.js?version=0.3.2"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=0.3.2">
+    <script src="/static/jquery-3.7.1.min.js?version=1721063846"></script>
+    <script src="/static/app.js?version=1721063846"></script>
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721063846">

    <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
@@ -35,7 +35,7 @@ var vConsole = new window.VConsole();
      <div style="display: flex; align-items: center;">
        <svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#8e43e7" style="height: 48px; width: 48px;"><path d="M550.826667 154.666667a47.786667 47.786667 0 0 0-19.84 4.48L298.666667 298.666667H186.453333A80 80 0 0 0 106.666667 378.453333v267.093334A80 80 0 0 0 186.453333 725.333333H298.666667l232.32 139.52a47.786667 47.786667 0 0 0 19.84 4.48A46.506667 46.506667 0 0 0 597.333333 822.826667V201.173333a46.506667 46.506667 0 0 0-46.506666-46.506666zM554.666667 822.826667c0 3.413333-3.84 3.84-3.84 3.84L320 688.853333l-9.6-6.186666H186.453333A37.12 37.12 0 0 1 149.333333 645.546667V378.453333A37.12 37.12 0 0 1 186.453333 341.333333h123.946667l10.24-6.186666 229.546667-137.6s3.84 0 3.84 3.84zM667.52 346.026667a21.333333 21.333333 0 0 0 0 30.293333 192 192 0 0 1 0 271.36 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 234.666667 234.666667 0 0 0 0-331.946666 21.333333 21.333333 0 0 0-30.293333 0z"></path><path d="M804.48 219.52a21.333333 21.333333 0 0 0-30.293333 30.293333 370.986667 370.986667 0 0 1 0 524.373334 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 414.08 414.08 0 0 0 0-584.96z"></path></svg>
        <input id="volume" type="range"></input>
-        <a href="/static/setting.html?version=0.3.2">
+        <a href="/static/setting.html?version=1721063846">
        <svg fill="#8e43e7" height="48px" width="48px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-11.88 -11.88 77.76 77.76" xml:space="preserve" stroke="#8e43e7" transform="rotate(0)matrix(1, 0, 0, 1, 0, 0)" stroke-width="0.00054"><g id="SVGRepo_bgCarrier" stroke-width="0" transform="translate(0,0), scale(1)"><rect x="-11.88" y="-11.88" width="77.76" height="77.76" rx="18.6624" fill="#addcff" strokewidth="0"></rect></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round" stroke="#CCCCCC" stroke-width="1.512"></g><g id="SVGRepo_iconCarrier"> <g> <path d="M51.22,21h-5.052c-0.812,0-1.481-0.447-1.792-1.197s-0.153-1.54,0.42-2.114l3.572-3.571 c0.525-0.525,0.814-1.224,0.814-1.966c0-0.743-0.289-1.441-0.814-1.967l-4.553-4.553c-1.05-1.05-2.881-1.052-3.933,0l-3.571,3.571 c-0.574,0.573-1.366,0.733-2.114,0.421C33.447,9.313,33,8.644,33,7.832V2.78C33,1.247,31.753,0,30.22,0H23.78 C22.247,0,21,1.247,21,2.78v5.052c0,0.812-0.447,1.481-1.197,1.792c-0.748,0.313-1.54,0.152-2.114-0.421l-3.571-3.571 c-1.052-1.052-2.883-1.05-3.933,0l-4.553,4.553c-0.525,0.525-0.814,1.224-0.814,1.967c0,0.742,0.289,1.44,0.814,1.966l3.572,3.571 c0.573,0.574,0.73,1.364,0.42,2.114S8.644,21,7.832,21H2.78C1.247,21,0,22.247,0,23.78v6.439C0,31.753,1.247,33,2.78,33h5.052 c0.812,0,1.481,0.447,1.792,1.197s0.153,1.54-0.42,2.114l-3.572,3.571c-0.525,0.525-0.814,1.224-0.814,1.966 c0,0.743,0.289,1.441,0.814,1.967l4.553,4.553c1.051,1.051,2.881,1.053,3.933,0l3.571-3.572c0.574-0.573,1.363-0.731,2.114-0.42 c0.75,0.311,1.197,0.98,1.197,1.792v5.052c0,1.533,1.247,2.78,2.78,2.78h6.439c1.533,0,2.78-1.247,2.78-2.78v-5.052 c0-0.812,0.447-1.481,1.197-1.792c0.751-0.312,1.54-0.153,2.114,0.42l3.571,3.572c1.052,1.052,2.883,1.05,3.933,0l4.553-4.553 c0.525-0.525,0.814-1.224,0.814-1.967c0-0.742-0.289-1.44-0.814-1.966l-3.572-3.571c-0.573-0.574-0.73-1.364-0.42-2.114 S45.356,33,46.168,33h5.052c1.533,0,2.78-1.247,2.78-2.78V23.78C54,22.247,52.753,21,51.22,21z M52,30.22 C52,30.65,51.65,31,51.22,31h-5.052c-1.624,0-3.019,0.932-3.64,2.432c-0.622,1.5-0.295,3.146,0.854,4.294l3.572,3.571 c0.305,0.305,0.305,0.8,0,1.104l-4.553,4.553c-0.304,0.304-0.799,0.306-1.104,0l-3.571-3.572c-1.149-1.149-2.794-1.474-4.294-0.854 c-1.5,0.621-2.432,2.016-2.432,3.64v5.052C31,51.65,30.65,52,30.22,52H23.78C23.35,52,23,51.65,23,51.22v-5.052 c0-1.624-0.932-3.019-2.432-3.64c-0.503-0.209-1.021-0.311-1.533-0.311c-1.014,0-1.997,0.4-2.761,1.164l-3.571,3.572 c-0.306,0.306-0.801,0.304-1.104,0l-4.553-4.553c-0.305-0.305-0.305-0.8,0-1.104l3.572-3.571c1.148-1.148,1.476-2.794,0.854-4.294 C10.851,31.932,9.456,31,7.832,31H2.78C2.35,31,2,30.65,2,30.22V23.78C2,23.35,2.35,23,2.78,23h5.052 c1.624,0,3.019-0.932,3.64-2.432c0.622-1.5,0.295-3.146-0.854-4.294l-3.572-3.571c-0.305-0.305-0.305-0.8,0-1.104l4.553-4.553 c0.304-0.305,0.799-0.305,1.104,0l3.571,3.571c1.147,1.147,2.792,1.476,4.294,0.854C22.068,10.851,23,9.456,23,7.832V2.78 C23,2.35,23.35,2,23.78,2h6.439C30.65,2,31,2.35,31,2.78v5.052c0,1.624,0.932,3.019,2.432,3.64 c1.502,0.622,3.146,0.294,4.294-0.854l3.571-3.571c0.306-0.305,0.801-0.305,1.104,0l4.553,4.553c0.305,0.305,0.305,0.8,0,1.104 l-3.572,3.571c-1.148,1.148-1.476,2.794-0.854,4.294c0.621,1.5,2.016,2.432,3.64,2.432h5.052C51.65,23,52,23.35,52,23.78V30.22z"></path> <path d="M27,18c-4.963,0-9,4.037-9,9s4.037,9,9,9s9-4.037,9-9S31.963,18,27,18z M27,34c-3.859,0-7-3.141-7-7s3.141-7,7-7 s7,3.141,7,7S30.859,34,27,34z"></path> </g> </g></svg>
        </a>
      </div>
--- a/xiaomusic/static/m3u.html
+++ b/xiaomusic/static/m3u.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width">
    <title>M3U to JSON Converter</title>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=0.3.2">
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721063846">
    <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
 <script>
--- a/xiaomusic/static/setting.html
+++ b/xiaomusic/static/setting.html
@@ -3,9 +3,9 @@
  <head>
    <meta name="viewport" content="width=device-width">
    <title>小爱音箱操控面板</title>
-    <script src="/static/jquery-3.7.1.min.js?version=0.3.2"></script>
-    <script src="/static/setting.js?version=0.3.2"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=0.3.2">
+    <script src="/static/jquery-3.7.1.min.js?version=1721063846"></script>
+    <script src="/static/setting.js?version=1721063846"></script>
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721063846">

    <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
@@ -147,9 +147,9 @@ var vConsole = new window.VConsole();
    <a class="button" href="/downloadlog" download="xiaomusic.txt">下载日志文件</a>
    <hr>

-    <a href="/static/m3u.html?version=0.3.2" target="_blank">m3u文件转换工具</a>
+    <a href="/static/m3u.html?version=1721063846" target="_blank">m3u文件转换工具</a>
    <hr>
-    <a href="/static/debug.html?version=0.3.2" target="_blank">调试工具</a>
+    <a href="/static/debug.html?version=1721063846" target="_blank">调试工具</a>

    <footer>
      <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
--- a/xiaomusic/utils.py
+++ b/xiaomusic/utils.py
@@ -73,12 +73,21 @@ def validate_proxy(proxy_str: str) -> bool:

 # 模糊搜索
 def fuzzyfinder(user_input, collection):
-    return difflib.get_close_matches(user_input, collection, n=10, cutoff=0.1)
+    lower_collection = {item.lower(): item for item in collection}
+    user_input = user_input.lower()
+    matches = difflib.get_close_matches(
+        user_input, lower_collection.keys(), n=10, cutoff=0.1
+    )
+    return [lower_collection[match] for match in matches]


 def find_best_match(user_input, collection, cutoff=0.6):
-    matches = difflib.get_close_matches(user_input, collection, n=1, cutoff=cutoff)
-    return matches[0] if matches else None
+    lower_collection = {item.lower(): item for item in collection}
+    user_input = user_input.lower()
+    matches = difflib.get_close_matches(
+        user_input, lower_collection.keys(), n=1, cutoff=cutoff
+    )
+    return lower_collection[matches[0]] if matches else None


 # 歌曲排序
--- a/xiaomusic/xiaomusic.py
+++ b/xiaomusic/xiaomusic.py
@@ -821,6 +821,7 @@ class XiaoMusicDevice:
        self._playing = False
        # 关机定时器
        self._stop_timer = None
+        self._last_cmd = None
        self.update_playlist()

    # 初始化播放列表
@@ -832,6 +833,10 @@ class XiaoMusicDevice:

    # 播放歌曲
    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 self.check_play_next():
                await self.play_next()
@@ -855,6 +860,9 @@ class XiaoMusicDevice:

    # 下一首
    async def play_next(self):
+        return await self._play_next()
+
+    async def _play_next(self):
        self.log.info("开始播放下一首")
        name = self.cur_music
        if (
@@ -867,10 +875,11 @@ class XiaoMusicDevice:
        if name == "":
            await self.do_tts("本地没有歌曲")
            return
-        await self.play(name)
+        await self._play(name)

    # 播放本地歌曲
    async def playlocal(self, name):
+        self._last_cmd = "playlocal"
        if name == "":
            if self.check_play_next():
                await self.play_next()
@@ -894,7 +903,14 @@ class XiaoMusicDevice:
        sec, url = await self.xiaomusic.get_music_sec_url(name)
        await self.group_force_stop_xiaoai()
        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("已经开始播放了")

        # 取消组内所有的下一首歌曲的定时器
@@ -998,7 +1014,7 @@ class XiaoMusicDevice:
        if self.isplaying() and not self.isdownloading():
            # 继续播放歌曲
            self.log.info("现在继续播放歌曲")
-            await self.play()
+            await self._play()
        else:
            self.log.info(
                f"不会继续播放歌曲. isplaying:{self.isplaying()} isdownloading:{self.isdownloading()}"
@@ -1141,12 +1157,14 @@ class XiaoMusicDevice:
        await self.do_tts(tts)

    async def play_music_list(self, list_name, music_name):
+        self._last_cmd = "play_music_list"
        self._cur_play_list = list_name
        self._play_list = self.xiaomusic.music_list[list_name]
        self.log.info(f"开始播放列表{list_name}")
-        await self.play(music_name)
+        await self._play(music_name)

    async def stop(self, arg1=""):
+        self._last_cmd = "stop"
        self._playing = False
        if arg1 != "notts":
            await self.do_tts(self.config.stop_tts_msg)
Author	SHA1	Message	Date
涵曦	186e9c1417	bump: version 0.3.4 → 0.3.5	2024-07-15 17:17:26 +00:00
涵曦	7498016d61	build: update static version	2024-07-15 17:17:26 +00:00
涵曦	7114ea2e6e	fix: #116 播放失败自动切下首歌	2024-07-15 17:17:08 +00:00
涵曦	e8ca1f8678	bump: version 0.3.3 → 0.3.4	2024-07-15 16:46:06 +00:00
涵曦	2275bc2600	build: update static version	2024-07-15 16:46:06 +00:00
涵曦	45a94f4bfe	fix: #125 修复本地英文歌曲匹大小写字母配不到的问题	2024-07-15 16:45:27 +00:00
涵曦	5cb2c84715	build: update code	2024-07-15 15:40:16 +00:00
涵曦	a3bf8d8aaa	build: 静态文件版本自动更新脚本修改	2024-07-15 15:37:45 +00:00
涵曦	0a88b7be26	build: update static version	2024-07-15 15:24:26 +00:00
涵曦	05da3e8fc4	bump: version 0.3.2 → 0.3.3	2024-07-15 15:19:40 +00:00
涵曦	560ea1aeca	fix: 尝试修复播放卡顿问题 see #124	2024-07-15 15:16:38 +00:00
涵曦	5ef1f2d940	ci: 发版本自动更新静态文件版本号	2024-07-15 14:53:25 +00:00