bump: version 0.3.3 → 0.3.4

CHANGELOG.md

@@ -1,3 +1,22 @@
+## v0.3.4 (2024-07-15)
+
+### Fix
+
+- #125 修复本地英文歌曲匹大小写字母配不到的问题
+
+## v0.3.3 (2024-07-15)
+
+### Fix
+
+- 尝试修复播放卡顿问题 see #124
+
+## v0.3.2 (2024-07-15)
+
+### Fix
+
+- #122 pip安装方式下，static目录找不到报错
+- 版本更新时更新页面缓存
+
 ## v0.3.1 (2024-07-15)
 
 ### Fix

README.md

@@ -322,7 +322,7 @@ services:
 - XIAOMUSIC_HTTPAUTH_PASSWORD 配置 web 控制台密码
 - XIAOMUSIC_CONF_PATH 用来存放配置文件的目录，记得把目录映射到主机，默认情况会把配置存放在music目录，具体见 <https://github.com/hanxi/xiaomusic/issues/74>
 - XIAOMUSIC_DISABLE_DOWNLOAD 设为 true 时关闭下载功能，见 <https://github.com/hanxi/xiaomusic/issues/82>
-- XIAOMUSIC_USE_MUSIC_API 设为 true 时使用 player_play_music 接口播放音乐，用于兼容不能播放的型号，如果发现需要设置设置选项的时候请告知我加一下设备型号，方便以后不用设置。
+- XIAOMUSIC_USE_MUSIC_API 设为 true 时使用 player_play_music 接口播放音乐，用于兼容不能播放的型号，如果发现需要设置这个选项的时候请告知我加一下设备型号，方便以后不用设置。 见 <https://github.com/hanxi/xiaomusic/issues/30>
 - XIAOMUSIC_KEYWORDS_PLAY 用来播放歌曲的口令前缀，默认是 "播放歌曲,放歌曲" ，可以用英文逗号分割配置多个
 - XIAOMUSIC_KEYWORDS_STOP 用来关机的口令，默认是 "关机,暂停,停止" ，可以用英文逗号分割配置多个。
 - XIAOMUSIC_KEYWORDS_PLAYLOCAL 用来播放本地歌曲的口令前缀，本地找不到时不会下载歌曲，默认是 "播放本地歌曲,本地播放歌曲" ，可以用英文逗号分割配置多个。

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

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

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xiaomusic"
-version = "0.3.1"
+version = "0.3.4"
 description = "Play Music with xiaomi AI speaker"
 authors = [
 {name = "涵曦", email = "im.hanxi@gmail.com"},

update-static-version.py

@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+
+import re
+from pathlib import Path
+
+
+def get_html_files(directory):
+    """
+    获取指定目录下所有HTML文件的列表。
+
+    :param directory: 搜索HTML文件的目录。
+    :return: 搜索到的HTML文件的路径列表。
+    """
+    return list(Path(directory).rglob("*.html"))
+
+
+def update_html_version(html_files, version):
+    """
+    更新HTML文件中所有以 /static/ 开头的CSS和JS文件引用的版本号。
+
+    :param html_files: 需要更新的HTML文件路径的列表。
+    :param version: 新的版本号字符串。
+    """
+    pattern = re.compile(r"(/static/[a-zA-Z0-9_.-]+)(\?version=[0-9.a-zA-Z_-]*)?")
+
+    for html_file in html_files:
+        if not html_file.exists():
+            print(f"文件 {html_file} 不存在。")
+            continue
+
+        html_content = html_file.read_text()
+
+        # 更新CSS和JS版本号
+        html_content = pattern.sub(r"\g<1>?version=" + version, html_content)
+
+        # 保存更改到HTML文件
+        html_file.write_text(html_content)
+
+        print(f"文件 {html_file} 已更新为使用新的版本号: {version}")
+
+
+# 使用案例
+if __name__ == "__main__":
+    import time
+
+    t = str(int(time.time()))
+
+    # 指定目录
+    html_directory = "xiaomusic/static"  # 修改为实际的HTML文件目录路径
+
+    # 获取HTML文件列表
+    html_files_to_update = get_html_files(html_directory)
+
+    # 执行更新
+    update_html_version(html_files_to_update, t)

xiaomusic/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.3.4"

xiaomusic/cli.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import argparse
 
 import uvicorn

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
@@ -82,27 +85,11 @@ def HttpInit(_xiaomusic):
     config = xiaomusic.config
     log = xiaomusic.log
 
-    app.mount("/static", StaticFiles(directory="xiaomusic/static"), name="static")
+    folder = os.path.dirname(__file__)
+    app.mount("/static", StaticFiles(directory=f"{folder}/static"), name="static")
     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")

xiaomusic/static/app.js

@@ -24,8 +24,13 @@ $(function(){
     localStorage.setItem('mi_did', data.mi_did);
 
     var did = localStorage.getItem('cur_did');
-    if ((did == null || did == "") && data.mi_did != null) {
-      var dids = data.mi_did.split(',');
+    var dids = [];
+    if (data.mi_did != null) {
+      dids = data.mi_did.split(',');
+    }
+    console.log('cur_did', did);
+    console.log('dids', dids);
+    if ((dids.length > 0) && (did == null || did == "" || !dids.includes(did))) {
       did = dids[0];
       localStorage.setItem('cur_did', did);
     }

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">
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721061966">
     <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
-    <script src="/static/jquery-3.7.1.min.js"></script>
+    <script src="/static/jquery-3.7.1.min.js?version=1721061966"></script>
 
     <script>
 var vConsole = new window.VConsole();

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"></script>
-    <script src="/static/app.js"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css">
+    <script src="/static/jquery-3.7.1.min.js?version=1721061966"></script>
+    <script src="/static/app.js?version=1721061966"></script>
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721061966">
 
     <!--
 <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">
+        <a href="/static/setting.html?version=1721061966">
         <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>

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">
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721061966">
     <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
 <script>

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"></script>
-    <script src="/static/setting.js"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css">
+    <script src="/static/jquery-3.7.1.min.js?version=1721061966"></script>
+    <script src="/static/setting.js?version=1721061966"></script>
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721061966">
 
     <!--
 <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" target="_blank">m3u文件转换工具</a>
+    <a href="/static/m3u.html?version=1721061966" target="_blank">m3u文件转换工具</a>
     <hr>
-    <a href="/static/debug.html" target="_blank">调试工具</a>
+    <a href="/static/debug.html?version=1721061966" target="_blank">调试工具</a>
 
     <footer>
       <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>

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
 
 
 # 歌曲排序