bump: version 0.1.95 → 0.1.96

由于Windows路径中使用反斜杠（\）作为目录分隔符，而在URL编码中反斜杠被视为特殊字符所导致windows下拼接得到的url不符合预期
示例
filename：music\outside.mp3
预期：
url: /music/outside.mp3
实际：
url：/music%5Coutside.mp3

需要一个办法来处理windows下的\\路径分隔符,我给出了一种简单的解法,作者可以考虑看看怎么处理会完全一点

.pre-commit-config.yaml

@@ -0,0 +1,8 @@
+repos:
+- hooks:
+  - id: commitizen
+  - id: commitizen-branch
+    stages:
+    - push
+  repo: https://github.com/commitizen-tools/commitizen
+  rev: v3.27.0

CHANGELOG.md

@@ -0,0 +1,349 @@
+## v0.1.96 (2024-07-06)
+
+### Feat
+
+- 使用commitizen管理版本号
+- 页面版本号链接到CHANGELOG页面
+- 规范版本管理
+
+## v0.1.95 (2024-07-06)
+
+## v0.1.94 (2024-07-06)
+
+### Feat
+
+- 优化多设备接口执行效果，尽量做到同时执行
+
+### Fix
+
+- 新增参数配置强制打断小爱说话
+- 修复多设备获取对话记录的问题
+- 修复windows下路径分隔符被视为转移符导致音箱无法播放音乐的问题
+- 修复播放链接报错
+- 修复配置页面默认配置被置空的问题
+
+## v0.1.93 (2024-07-05)
+
+### Feat
+
+- 访问账号密码默认为空
+- 支持下载的目录与本地音乐目录分开 see #98
+- 新增m4a文件格式支持
+- 设置页面支持配置多设备
+- 默认用空的后台账号和密码
+- 支持多个设备同时播放 see #65
+- 新增自定义口令功能 #105
+
+### Fix
+
+- 修复设置页面没成功初始化设置问题
+- 修复镜像缺少文件问题
+- 尝试解决插件路径问题
+- 设置页面日志路径写错了
+- 修复口令导致异常关闭的问题
+
+## v0.1.92 (2024-07-04)
+
+### Feat
+
+- 启动参数新增 --port 配置监听端口
+- 外网访问端口可独立配置
+- 优化设置页面，新增更多配置项
+- 首次保存设置后不需要重启容器
+
+### Fix
+
+- 日志文件配置的环境变量写错了
+
+## v0.1.91 (2024-07-03)
+
+### Fix
+
+- 尝试解决触屏版不能播放的问题
+
+## v0.1.90 (2024-07-02)
+
+### Feat
+
+- 优化触屏版播放页面显示歌曲
+
+## v0.1.89 (2024-07-02)
+
+### Feat
+
+- 尝试解决触屏版无法播放的问题
+
+### Fix
+
+- 播放歌曲写成固定的了
+- 播放歌曲时被其他指令打断后没有继续播放
+
+## v0.1.88 (2024-07-02)
+
+### Feat
+
+- 日志里不要输出敏感信息
+- 优化下载 ffmpeg 脚本，尝试解决 armv7 环境问题
+- 优化日志输出信息
+- 尝试解决触屏版无法播放的问题
+
+### Fix
+
+- 是否下载中判断错误导致播放无法自动重新开始播放
+- 升级yt-dlp到2024.07.01
+- 修复部分型号关机失败的问题
+
+## v0.1.87 (2024-07-01)
+
+### Fix
+
+- 修复XIAOMUSIC_USE_MUSIC_API=true时播放不了的问题
+
+## v0.1.86 (2024-07-01)
+
+### Feat
+
+- 优化 ffmpeg 安装脚本
+- 新增调试工具用来调试 player_play_music 接口
+- 升级依赖库 MiService
+
+### Fix
+
+- 尝试修复 armv7 的 ffmpeg 问题
+- 尝试修复关机失败的问题
+- 修复口令不能播放的问题
+
+## v0.1.85 (2024-06-30)
+
+### Feat
+
+- 版本号链接到github的release页面，方便查看版本更新日志
+
+### Fix
+
+- 修复电台删除后没有从电台列表中删除的问题
+
+## v0.1.84 (2024-06-30)
+
+### Feat
+
+- config.json 支持更多配置选项
+- 新增 XIAOMUSIC_STOP_TTS_MSG 配置关机提示音
+
+## v0.1.83 (2024-06-30)
+
+## v0.1.82 (2024-06-30)
+
+### Feat
+
+- 优化指令匹配规则
+
+## v0.1.81 (2024-06-30)
+
+## v0.1.80 (2024-06-30)
+
+### Fix
+
+- #91 修复下载歌曲报错
+
+## v0.1.79 (2024-06-29)
+
+## v0.1.77 (2024-06-29)
+
+### Fix
+
+- #52 支持配置模糊匹配本地歌曲
+
+## v0.1.76 (2024-06-28)
+
+## v0.1.75 (2024-06-28)
+
+## v0.1.74 (2024-06-28)
+
+## v0.1.73 (2024-06-28)
+
+## v0.1.72 (2024-06-28)
+
+## v0.1.71 (2024-06-28)
+
+### Fix
+
+- #83
+
+## v0.1.70 (2024-06-27)
+
+## v0.1.69 (2024-06-26)
+
+## v0.1.67 (2024-06-26)
+
+## v0.1.66 (2024-06-26)
+
+## v0.1.65 (2024-06-26)
+
+## v0.1.64 (2024-06-26)
+
+## v0.1.62 (2024-06-25)
+
+## v0.1.61 (2024-06-25)
+
+## v0.1.60 (2024-06-25)
+
+## v0.1.58 (2024-06-25)
+
+### Fix
+
+- 登陆失败不阻塞启动
+
+## v0.1.57 (2024-06-24)
+
+## v0.1.56 (2024-06-24)
+
+## v0.1.55 (2024-06-23)
+
+### Fix
+
+- #47 支持配置基础的BaseAuth登录
+
+## v0.1.54 (2024-06-23)
+
+### Fix
+
+- #76 新增XIAOMUSIC_MUSIC_PATH_DEPTH配置生成播放列表的目录深度，默认10
+- #74 配置目录可以和下载目录分开配置, 新增XIAOMUSIC_CONF_PATH用来设置配置目录，不配置时使用下载目录
+
+## v0.1.53 (2024-06-23)
+
+## v0.1.52 (2024-06-21)
+
+## v0.1.51 (2024-06-20)
+
+## v0.1.49 (2024-06-20)
+
+## v0.1.48 (2024-06-16)
+
+## v0.1.47 (2024-06-16)
+
+## v0.1.46 (2024-06-15)
+
+## v0.1.45 (2024-06-15)
+
+## v0.1.44 (2024-06-14)
+
+## v0.1.43 (2024-06-14)
+
+## v0.1.41 (2024-06-14)
+
+## v0.1.40 (2024-06-12)
+
+## v0.1.39 (2024-06-12)
+
+## v0.1.38 (2024-06-12)
+
+### Fix
+
+- #70 下一首歌曲不存在时从播放列表中删除并继续找下一首
+
+## v0.1.37 (2024-06-04)
+
+## v0.1.36 (2024-05-30)
+
+## v0.1.35 (2024-05-30)
+
+### Fix
+
+- #67 没配置did时也允许启动 http 服务
+
+## v0.1.34 (2024-05-19)
+
+## v0.1.33 (2024-05-19)
+
+### Fix
+
+- #50 新增配置页面
+- #62
+
+## v0.1.32 (2024-05-17)
+
+## v0.1.31 (2024-05-16)
+
+## v0.1.30 (2024-05-16)
+
+### Fix
+
+- 控制台显示版本号 #59
+
+## v0.1.29 (2024-05-16)
+
+### Fix
+
+- #57 #55
+
+## v0.1.28 (2024-05-16)
+
+## v0.1.27 (2024-05-16)
+
+## v0.1.26 (2024-05-08)
+
+## v0.1.25 (2024-05-06)
+
+## v0.1.24 (2024-04-30)
+
+## v0.1.23 (2024-04-30)
+
+## v0.1.22 (2024-04-30)
+
+## v0.1.21 (2024-04-08)
+
+## v0.1.20 (2024-04-08)
+
+## v0.1.19 (2024-04-04)
+
+## v0.1.18 (2024-02-24)
+
+## v0.1.16 (2024-02-24)
+
+## v0.1.15 (2024-02-03)
+
+## v0.1.14 (2024-02-03)
+
+## v0.1.13 (2024-02-02)
+
+## v0.1.12 (2024-01-30)
+
+### Fix
+
+- set volume failed
+
+## v0.1.11 (2024-01-29)
+
+## v0.1.10 (2024-01-29)
+
+## v0.1.9 (2024-01-28)
+
+### Fix
+
+- arg1 漏修改
+
+## v0.1.8 (2024-01-28)
+
+### Fix
+
+- http server listen host
+
+## v0.1.7 (2024-01-28)
+
+## v0.1.6 (2024-01-28)
+
+## v0.1.5 (2024-01-27)
+
+## v0.1.4 (2024-01-27)
+
+### Fix
+
+- error when play next
+
+## v0.1.3 (2023-10-15)
+
+## v0.1.2 (2023-10-15)
+
+## v0.1.1 (2023-10-14)

newversion.sh

@@ -1,37 +1,5 @@
 #!/bin/bash
 
-set -e
+cz bump --check-consistency --increment patch
 
-version_file=./pyproject.toml
-init_file=./xiaomusic/__init__.py
-# 获取当前版本号
-current_version=$(grep -oE "version = \"[0-9]+\.[0-9]+\.[0-9]+\"" $version_file | cut -d'"' -f2)
-echo "当前版本号: "$current_version
-
-# 将版本号分割成三部分
-major=$(echo $current_version | cut -d'.' -f1)
-minor=$(echo $current_version | cut -d'.' -f2)
-patch=$(echo $current_version | cut -d'.' -f3)
-
-echo "major: $major"
-echo "minor: $minor"
-echo "patch: $patch"
-
-# 将补丁号加1
-patch=$((patch + 1))
-
-# 生成新版本号
-new_version="$major.$minor.$patch"
-
-# 将新版本号写入文件
-sed -i "s/version.*/version = \"$new_version\"/g" $version_file
-sed -i "s/__version__.*/__version__ = \"$new_version\"/g" $init_file
-
-echo "新版本号：$new_version"
-
-git diff
-git add $version_file
-git add $init_file
-git commit -m "new version v$new_version"
-git tag v$new_version
-git push -u origin main --tags
+#git push -u origin main --tags

pdm.lock

@@ -2,10 +2,10 @@
 # It is not intended for manual editing.
 
 [metadata]
-groups = ["default", "lint"]
+groups = ["default", "lint", "dev"]
 strategy = ["cross_platform"]
 lock_version = "4.4.1"
-content_hash = "sha256:ac53cf6421de7aded8475907adc40a716a3e5c6429c614b93e5cfbddea36d048"
+content_hash = "sha256:3631f504ea2c9e450ff20fe555e2ec0143bc315c22ff257e17a992d1e6d3c39d"
 
 [[package]]
 name = "aiohttp"
@@ -82,6 +82,16 @@ files = [
     {file = "aiosignal-1.3.1.tar.gz", hash = "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc"},
 ]
 
+[[package]]
+name = "argcomplete"
+version = "3.3.0"
+requires_python = ">=3.8"
+summary = "Bash tab completion for argparse"
+files = [
+    {file = "argcomplete-3.3.0-py3-none-any.whl", hash = "sha256:c168c3723482c031df3c207d4ba8fa702717ccb9fc0bfe4117166c1f537b4a54"},
+    {file = "argcomplete-3.3.0.tar.gz", hash = "sha256:fd03ff4a5b9e6580569d34b273f741e85cd9e072f3feeeee3eba4891c70eda62"},
+]
+
 [[package]]
 name = "asgiref"
 version = "3.7.2"
@@ -339,6 +349,39 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
+[[package]]
+name = "commitizen"
+version = "3.27.0"
+requires_python = ">=3.8"
+summary = "Python commitizen client tool"
+dependencies = [
+    "argcomplete<3.4,>=1.12.1",
+    "charset-normalizer<4,>=2.1.0",
+    "colorama<0.5.0,>=0.4.1",
+    "decli<0.7.0,>=0.6.0",
+    "importlib-metadata<8,>=4.13",
+    "jinja2>=2.10.3",
+    "packaging>=19",
+    "pyyaml>=3.08",
+    "questionary<3.0,>=2.0",
+    "termcolor<3,>=1.1",
+    "tomlkit<1.0.0,>=0.5.3",
+]
+files = [
+    {file = "commitizen-3.27.0-py3-none-any.whl", hash = "sha256:11948fa563d5ad5464baf09eaacff3cf8cbade1ca029ed9c4978f2227f033130"},
+    {file = "commitizen-3.27.0.tar.gz", hash = "sha256:5874d0c7e8e1be3b75b1b0a2269cffe3dd5c843b860d84b0bdbb9ea86e3474b8"},
+]
+
+[[package]]
+name = "decli"
+version = "0.6.2"
+requires_python = ">=3.7"
+summary = "Minimal, easy-to-use, declarative cli tool"
+files = [
+    {file = "decli-0.6.2-py3-none-any.whl", hash = "sha256:2fc84106ce9a8f523ed501ca543bdb7e416c064917c12a59ebdc7f311a97b7ed"},
+    {file = "decli-0.6.2.tar.gz", hash = "sha256:36f71eb55fd0093895efb4f416ec32b7f6e00147dda448e3365cf73ceab42d6f"},
+]
+
 [[package]]
 name = "flask"
 version = "3.0.3"
@@ -432,6 +475,19 @@ files = [
     {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
 ]
 
+[[package]]
+name = "importlib-metadata"
+version = "7.2.1"
+requires_python = ">=3.8"
+summary = "Read metadata from Python packages"
+dependencies = [
+    "zipp>=0.5",
+]
+files = [
+    {file = "importlib_metadata-7.2.1-py3-none-any.whl", hash = "sha256:ffef94b0b66046dd8ea2d619b701fe978d9264d38f3998bc4c27ec3b146a87c8"},
+    {file = "importlib_metadata-7.2.1.tar.gz", hash = "sha256:509ecb2ab77071db5137c655e24ceb3eee66e7bbc6574165d0d114d9fc4bbe68"},
+]
+
 [[package]]
 name = "itsdangerous"
 version = "2.1.2"
@@ -581,6 +637,29 @@ files = [
     {file = "mutagen-1.47.0.tar.gz", hash = "sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99"},
 ]
 
+[[package]]
+name = "packaging"
+version = "24.1"
+requires_python = ">=3.8"
+summary = "Core utilities for Python packages"
+files = [
+    {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"},
+    {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"},
+]
+
+[[package]]
+name = "prompt-toolkit"
+version = "3.0.36"
+requires_python = ">=3.6.2"
+summary = "Library for building powerful interactive command lines in Python"
+dependencies = [
+    "wcwidth",
+]
+files = [
+    {file = "prompt_toolkit-3.0.36-py3-none-any.whl", hash = "sha256:aa64ad242a462c5ff0363a7b9cfe696c20d55d9fc60c11fd8e632d064804d305"},
+    {file = "prompt_toolkit-3.0.36.tar.gz", hash = "sha256:3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63"},
+]
+
 [[package]]
 name = "pycparser"
 version = "2.21"
@@ -630,6 +709,51 @@ files = [
     {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"},
 ]
 
+[[package]]
+name = "pyyaml"
+version = "6.0.1"
+requires_python = ">=3.6"
+summary = "YAML parser and emitter for Python"
+files = [
+    {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"},
+    {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"},
+    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"},
+    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"},
+    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"},
+    {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"},
+    {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"},
+    {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"},
+    {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"},
+    {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"},
+    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"},
+    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"},
+    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"},
+    {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"},
+    {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"},
+    {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
+    {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
+    {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
+    {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
+    {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
+    {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"},
+    {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"},
+]
+
+[[package]]
+name = "questionary"
+version = "2.0.1"
+requires_python = ">=3.8"
+summary = "Python library to build pretty command line user prompts ⭐️"
+dependencies = [
+    "prompt-toolkit<=3.0.36,>=2.0",
+]
+files = [
+    {file = "questionary-2.0.1-py3-none-any.whl", hash = "sha256:8ab9a01d0b91b68444dff7f6652c1e754105533f083cbe27597c8110ecc230a2"},
+    {file = "questionary-2.0.1.tar.gz", hash = "sha256:bcce898bf3dbb446ff62830c86c5c6fb9a22a54146f0f5597d3da43b10d8fc8b"},
+]
+
 [[package]]
 name = "requests"
 version = "2.32.3"
@@ -686,6 +810,26 @@ files = [
     {file = "ruff-0.5.0.tar.gz", hash = "sha256:eb641b5873492cf9bd45bc9c5ae5320648218e04386a5f0c264ad6ccce8226a1"},
 ]
 
+[[package]]
+name = "termcolor"
+version = "2.4.0"
+requires_python = ">=3.8"
+summary = "ANSI color formatting for output in terminal"
+files = [
+    {file = "termcolor-2.4.0-py3-none-any.whl", hash = "sha256:9297c0df9c99445c2412e832e882a7884038a25617c60cea2ad69488d4040d63"},
+    {file = "termcolor-2.4.0.tar.gz", hash = "sha256:aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a"},
+]
+
+[[package]]
+name = "tomlkit"
+version = "0.12.5"
+requires_python = ">=3.7"
+summary = "Style preserving TOML library"
+files = [
+    {file = "tomlkit-0.12.5-py3-none-any.whl", hash = "sha256:af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f"},
+    {file = "tomlkit-0.12.5.tar.gz", hash = "sha256:eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c"},
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.9.0"
@@ -716,6 +860,15 @@ files = [
     {file = "waitress-3.0.0.tar.gz", hash = "sha256:005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1"},
 ]
 
+[[package]]
+name = "wcwidth"
+version = "0.2.13"
+summary = "Measures the displayed width of unicode strings in a terminal"
+files = [
+    {file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"},
+    {file = "wcwidth-0.2.13.tar.gz", hash = "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"},
+]
+
 [[package]]
 name = "websockets"
 version = "12.0"
@@ -849,3 +1002,13 @@ files = [
     {file = "yt_dlp-2024.7.1.232715.dev0-py3-none-any.whl", hash = "sha256:e9ab443353da0c8f01587b031fb84b2cc42eae82aeaa03a9ce5ed6edc301b503"},
     {file = "yt_dlp-2024.7.1.232715.dev0.tar.gz", hash = "sha256:4f1ab25318c9156cca0b7308bdd2aeb3e7f01e8d9fb83916b4719010038170c8"},
 ]
+
+[[package]]
+name = "zipp"
+version = "3.19.2"
+requires_python = ">=3.8"
+summary = "Backport of pathlib-compatible object wrapper for zip files"
+files = [
+    {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"},
+    {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"},
+]

pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "xiaomusic"
-version = "0.1.93"
+version = "0.1.96"
 description = "Play Music with xiaomi AI speaker"
 authors = [
-    {name = "涵曦", email = "im.hanxi@gmail.com"},
+{name = "涵曦", email = "im.hanxi@gmail.com"},
 ]
 dependencies = [
     "aiohttp>=3.8.6",
@@ -33,19 +33,22 @@ build-backend = "pdm.backend"
 lint = [
     "ruff>=0.4.8",
 ]
+dev = [
+    "commitizen>=3.27.0",
+]
 [tool.ruff]
 lint.select = [
-        "B", # flake8-bugbear
-        "C4", # flake8-comprehensions
-        "E", # pycodestyle - Error
-        "F", # Pyflakes
-        "I", # isort
-        "W", # pycodestyle - Warning
-        "UP", # pyupgrade
+    "B", # flake8-bugbear
+    "C4", # flake8-comprehensions
+    "E", # pycodestyle - Error
+    "F", # Pyflakes
+    "I", # isort
+    "W", # pycodestyle - Warning
+    "UP", # pyupgrade
 ]
 lint.ignore = [
-        "E501", # line-too-long
-        "W191", # tab-indentation
+    "E501", # line-too-long
+    "W191", # tab-indentation
 ]
 include = ["**/*.py", "**/*.pyi", "**/pyproject.toml"]
 
@@ -55,3 +58,14 @@ convention = "google"
 [tool.pdm.scripts]
 lint = "ruff check ."
 fmt = "ruff format ."
+
+[tool.commitizen]
+name = "cz_conventional_commits"
+tag_format = "v$version"
+version_scheme = "pep440"
+version_provider = "pep621"
+update_changelog_on_bump = true
+major_version_zero = true
+version_files = [
+    "xiaomusic/__init__.py",
+]

xiaomusic/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.93"
+__version__ = "0.1.96"

xiaomusic/config.py

@@ -120,6 +120,9 @@ class Config:
     user_key_word_dict: dict[str, str] = field(
         default_factory=default_user_key_word_dict
     )
+    enable_force_stop: bool = (
+        os.getenv("XIAOMUSIC_ENABLE_FORCE_STOP", "false").lower() == "true"
+    )
 
     def append_keyword(self, keys, action):
         for key in keys.split(","):

xiaomusic/static/index.html

@@ -9,7 +9,7 @@
   </head>
   <body>
     <h2>小爱音箱操控面板
-      (<a  id="version" href="https://github.com/hanxi/xiaomusic/releases">
+      (<a  id="version" href="https://github.com/hanxi/xiaomusic/blob/main/CHANGELOG.md">
         版本未知
       </a>)
     </h2>

xiaomusic/static/setting.html

@@ -17,7 +17,7 @@ var vConsole = new window.VConsole();
   </head>
   <body>
     <h2>小爱音箱设置面板
-      (<a  id="version" href="https://github.com/hanxi/xiaomusic/releases">
+      (<a  id="version" href="https://github.com/hanxi/xiaomusic/blob/main/CHANGELOG.md">
         版本未知
       </a>)
     </h2>
@@ -50,7 +50,7 @@ var vConsole = new window.VConsole();
       <input id="music_path" type="text" value="music"></input>
 
       <label for="download_path">音乐下载目录(必须是music的子目录):</label>
-      <input id="download_path" type="text"></input>
+      <input id="download_path" type="text" value='music/download'></input>
 
       <label for="conf_path">配置文件目录:</label>
       <input id="conf_path" type="text"></input>

xiaomusic/static/setting.js

@@ -78,7 +78,7 @@ $(function(){
     for (const key in data) {
       if (data.hasOwnProperty(key)) {
         const $element = $("#" + key);
-        if ($element.length) {
+        if ($element.length && data[key] !== '') {
           if (data[key] === true) {
             $element.val('true');
           } else if (data[key] === false) {

xiaomusic/xiaomusic.py

@@ -52,7 +52,7 @@ class XiaoMusic:
         self.config = config
 
         self.mi_token_home = Path.home() / ".mi.token"
-        self.last_timestamp = int(time.time() * 1000)  # timestamp last call mi speaker
+        self.last_timestamp = {}  # timestamp last call mi speaker
         self.last_record = None
         self.cookie_jar = None
         self.mina_service = None
@@ -153,18 +153,23 @@ class XiaoMusic:
         async with ClientSession() as session:
             while True:
                 self.log.debug(
-                    "Listening new message, timestamp: %s", self.last_timestamp
+                    f"Listening new message, timestamp: {self.last_timestamp}"
                 )
                 session._cookie_jar = self.cookie_jar
+
                 # 拉取所有音箱的对话记录
-                for device_id in self.device2hardware:
-                    await self.get_latest_ask_from_xiaoai(session, device_id)
+                tasks = [
+                    self.get_latest_ask_from_xiaoai(session, device_id)
+                    for device_id in self.device2hardware
+                ]
+                await asyncio.gather(*tasks)
+
                 start = time.perf_counter()
-                self.log.debug("Polling_event, timestamp: %s", self.last_timestamp)
+                self.log.debug(f"Polling_event, timestamp: {self.last_timestamp}")
                 await self.polling_event.wait()
                 if (d := time.perf_counter() - start) < 1:
                     # sleep to avoid too many request
-                    self.log.debug("Sleep %f, timestamp: %s", d, self.last_timestamp)
+                    self.log.debug(f"Sleep {d}, timestamp: {self.last_timestamp}")
                     await asyncio.sleep(1 - d)
 
     async def init_all_data(self, session):
@@ -251,18 +256,21 @@ class XiaoMusic:
                     self.log.info("Maybe outof date trying to re init it")
                     await self.init_all_data(self.session)
             else:
-                return self._get_last_query(data)
+                return self._get_last_query(device_id, data)
 
-    def _get_last_query(self, data):
-        self.log.debug(f"_get_last_query:{data}")
+    def _get_last_query(self, device_id, data):
+        self.log.debug(f"_get_last_query device_id:{device_id} data:{data}")
         if d := data.get("data"):
             records = json.loads(d).get("records")
             if not records:
                 return
             last_record = records[0]
             timestamp = last_record.get("time")
-            if timestamp > self.last_timestamp:
-                self.last_timestamp = timestamp
+            # 首次用当前时间初始化
+            if device_id not in self.last_timestamp:
+                self.last_timestamp[device_id] = int(time.time() * 1000)
+            if timestamp > self.last_timestamp[device_id]:
+                self.last_timestamp[device_id] = timestamp
                 self.last_record = last_record
                 self.new_record_event.set()
 
@@ -289,13 +297,19 @@ class XiaoMusic:
         self.log.info(f"do_tts ok. cur_music:{self.cur_music}")
         await self.check_replay()
 
-    async def text_to_speech(self, value):
+    async def text_to_speech_one(self, device_id, value):
         try:
-            for device_id in self.device2hardware:
-                await self.mina_service.text_to_speech(device_id, value)
+            await self.mina_service.text_to_speech(device_id, value)
         except Exception as e:
             self.log.error(f"Execption {e}")
 
+    async def text_to_speech(self, value):
+        tasks = [
+            self.text_to_speech_one(device_id, value)
+            for device_id in self.device2hardware
+        ]
+        await asyncio.gather(*tasks)
+
     # 继续播放被打断的歌曲
     async def check_replay(self):
         if self.isplaying() and not self.isdownloading():
@@ -332,24 +346,29 @@ class XiaoMusic:
 
     async def stop_if_xiaoai_is_playing(self, device_id):
         is_playing = await self.get_if_xiaoai_is_playing(device_id)
-        if is_playing:
+        if is_playing or self.config.enable_force_stop:
             # stop it
             ret = await self.mina_service.player_stop(device_id)
             self.log.info(
-                f"force_stop_xiaoai player_stop device_id:{device_id} ret:{ret}"
+                f"stop_if_xiaoai_is_playing player_stop device_id:{device_id} enable_force_stop:{self.config.enable_force_stop} ret:{ret}"
             )
 
-    async def force_stop_xiaoai(self):
+    async def force_stop_one_xiaoai(self, device_id):
         try:
-            for device_id in self.device2hardware:
-                ret = await self.mina_service.player_pause(device_id)
-                self.log.info(
-                    f"force_stop_xiaoai player_pause device_id:{device_id} ret:{ret}"
-                )
-                await self.stop_if_xiaoai_is_playing(device_id)
+            ret = await self.mina_service.player_pause(device_id)
+            self.log.info(
+                f"force_stop_one_xiaoai player_pause device_id:{device_id} ret:{ret}"
+            )
+            await self.stop_if_xiaoai_is_playing(device_id)
         except Exception as e:
             self.log.error(f"Execption {e}")
 
+    async def force_stop_xiaoai(self):
+        tasks = [
+            self.force_stop_one_xiaoai(device_id) for device_id in self.device2hardware
+        ]
+        await asyncio.gather(*tasks)
+
     # 是否在下载中
     def isdownloading(self):
         if not self.download_proc:
@@ -455,7 +474,7 @@ class XiaoMusic:
             self.log.debug("get_music_url web music. name:%s, url:%s", name, url)
             return url
 
-        filename = self.get_filename(name)
+        filename = self.get_filename(name).replace("\\", "/")
         self.log.debug(
             "get_music_url local music. name:%s, filename:%s", name, filename
         )
@@ -718,23 +737,31 @@ class XiaoMusic:
 
     async def play_url(self, **kwargs):
         url = kwargs.get("arg1", "")
-        await self.all_player_play(url)
+        return await self.all_player_play(url)
 
-    async def all_player_play(self, url):
+    async def play_one_url(self, device_id, url):
         try:
-            for device_id in self.device2hardware:
-                if self.config.use_music_api:
-                    ret = await self.play_by_music_url(device_id, url)
-                    self.log.info(
-                        f"player_play play_by_music_url device_id:{device_id} ret:{ret} url:{url}"
-                    )
-                else:
-                    ret = await self.mina_service.play_by_url(device_id, url)
-                    self.log.info(
-                        f"player_play play_by_url device_id:{device_id} ret:{ret} url:{url}"
-                    )
+            if self.config.use_music_api:
+                ret = await self.play_by_music_url(device_id, url)
+                self.log.info(
+                    f"play_one_url play_by_music_url device_id:{device_id} ret:{ret} url:{url}"
+                )
+            else:
+                ret = await self.mina_service.play_by_url(device_id, url)
+                self.log.info(
+                    f"play_one_url play_by_url device_id:{device_id} ret:{ret} url:{url}"
+                )
         except Exception as e:
             self.log.error(f"Execption {e}")
+        return ret
+
+    async def all_player_play(self, url):
+        tasks = [
+            self.play_one_url(device_id, url) for device_id in self.device2hardware
+        ]
+        results = await asyncio.gather(*tasks)
+        self.log.info(f"all_player_play {url} {results}")
+        return results
 
     def find_real_music_name(self, name):
         if not self.config.enable_fuzzy_match: