new version v0.1.84

feat: config.json 支持更多配置选项
docs: 文档更新
2025-12-06 14:52:50 +08:00 · 2024-06-30 09:44:25 +00:00 · 2024-06-30 09:43:51 +00:00 · 2024-06-30 09:43:28 +00:00 · 2024-06-30 07:32:33 +00:00 · 2024-06-30 06:38:09 +00:00
19 changed files with 605 additions and 195 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: [hanxi]
+custom: ['https://afdian.net/a/imhanxi']
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@

 使用小爱音箱播放音乐，音乐使用 yt-dlp 下载。

+<https://github.com/hanxi/xiaomusic>
+
 ## 最简配置运行

 已经支持在 web 页面配置其他参数，docker compose 配置如下：
@@ -28,10 +30,79 @@ services:
    environment:
      MI_USER: '小米账号'
      MI_PASS: '小米密码'
+      XIAOMUSIC_VERBOSE: 'true'
      XIAOMUSIC_HOSTNAME: 'docker 主机 ip'
 ```
+
+对应的 docker 启动命令如下:
+
+```yaml
+docker run -e MI_USER='小米账号' \
+    -e MI_PASS='小米密码' \
+    -e XIAOMUSIC_VERBOSE='true' \
+    -e XIAOMUSIC_HOSTNAME='docker 主机 ip' \
+    -p 8090:8090 \
+    -v ./music:/app/music \
+    hanxi/xiaomusic
+```
+
 启动成功后，在 web 页面可以配置 MI_DID, MI_HARDWARE, XIAOMUSIC_SEARCH, XIAOMUSIC_PROXY 参数。

+### ✨ 修改8090端口
+
+如果需要修改 8090 端口为其他端口，比如 5678，需要这样配，3个数字都需要是 5678 。见 <https://github.com/hanxi/xiaomusic/issues/19>
+
+```yaml
+services:
+  xiaomusic:
+    image: hanxi/xiaomusic
+    container_name: xiaomusic
+    restart: unless-stopped
+    ports:
+      - 5678:5678
+    volumes:
+      - ./music:/app/music
+    environment:
+      MI_USER: '小米账号'
+      MI_PASS: '小米密码'
+      XIAOMUSIC_VERBOSE: 'true'
+      XIAOMUSIC_HOSTNAME: 'docker 主机 ip'
+      XIAOMUSIC_PORT: 5678
+```
+
+其中 XIAOMUSIC_VERBOSE 设置为 'true' 时表示开启 debug 日志，遇到问题可以去 web 设置页面底部【下载日志文件】按钮，然后搜索一下日志文件内容确保里面没有账号密码信息后(有就删除这些敏感信息)，然后在提 issues 反馈问题时把下载的日志文件带上。
+
+## pip 方式安装运行
+
+```shell
+> pip install xiaomusic
+> xiaomusic --help
+ __  __  _                   __  __                 _
+ \ \/ / (_)   __ _    ___   |  \/  |  _   _   ___  (_)   ___
+  \  /  | |  / _` |  / _ \  | |\/| | | | | | / __| | |  / __|
+  /  \  | | | (_| | | (_) | | |  | | | |_| | \__ \ | | | (__
+ /_/\_\ |_|  \__,_|  \___/  |_|  |_|  \__,_| |___/ |_|  \___|
+          XiaoMusic v0.1.81 by: github.com/hanxi
+
+usage: xiaomusic.py [-h] [--hardware HARDWARE] [--account ACCOUNT]
+                    [--password PASSWORD] [--cookie COOKIE] [--verbose]
+                    [--config CONFIG] [--ffmpeg_location FFMPEG_LOCATION]
+
+options:
+  -h, --help            show this help message and exit
+  --hardware HARDWARE   小爱 hardware
+  --account ACCOUNT     xiaomi account
+  --password PASSWORD   xiaomi password
+  --cookie COOKIE       xiaomi cookie
+  --verbose             show info
+  --config CONFIG       config file path
+  --ffmpeg_location FFMPEG_LOCATION
+                        ffmpeg bin path
+> xiaomusic --config config.json
+```
+
+其中 `config.json` 文件可以参考 `config-example.json` 文件配置。见 <https://github.com/hanxi/xiaomusic/issues/94>
+
 ## 开发环境运行

 - 使用 install_dependencies.sh 下载依赖
@@ -66,21 +137,37 @@ pdm run xiaomusic.py

 > 隐藏玩法: 对小爱同学说播放歌曲小猪佩奇的故事，会播放小猪佩奇的故事。

-## 已测试设备
+## 已测试支持的设备

 ```txt
-"L07A": ("5-1", "5-5"),  # Redmi小爱音箱Play(l7a)
+- L06A
+- L07A
+- S12
+- S12A
+- LX5A
+- LX05
+- L16A
+- L17A
+- LX06
+- LX01
+- L05B
+- L05C
 ````
+
+型号与产品名称对照可以在这里查询 <https://home.miot-spec.com/s/xiaomi.wifispeaker>
+
+> 如果你的设备支持播放，请反馈给我添加到支持列表里，谢谢。
+
 ## 支持音乐格式

 - mp3
 - flac
+- wav
+- ape
+- ogg

-> 本地音乐会搜索 mp3 和 flac 格式的文件，下载的歌曲是 mp3 格式的。
-
-## 其他参数
-
- XIAOMUSIC_ACTIVE_CMD 环境变量，配置成'play,random_play'，在非播放状态下，只有这两个指令（播放歌曲和随机播放）可以触发，触发后，xiaomusic进入playing状态，其他指令则可以正常触发。
+> 本地音乐会搜索目录下上面格式的文件，下载的歌曲是 mp3 格式的。
+> 已知 L05B L05C 不支持 flac 格式。

 ## 在 Docker 里使用

@@ -171,6 +258,26 @@ services:
      XIAOMUSIC_HOSTNAME: '192.168.2.5'
 ```

+如果想让 setting.json 文件不存储到 music 目录，可以这样配，下面的示例会把 setting.json 文件放到容器的 /app/conf 目录且映射到本地的 ./conf 目录：
+
+```yaml
+services:
+  xiaomusic:
+    image: hanxi/xiaomusic
+    container_name: xiaomusic
+    restart: unless-stopped
+    ports:
+      - 8090:8090
+    volumes:
+      - ./music:/app/music
+      - ./conf:/app/conf
+    environment:
+      MI_USER: '小米账号'
+      MI_PASS: '小米密码'
+      XIAOMUSIC_HOSTNAME: 'docker 主机 ip'
+      XIAOMUSIC_CONF_PATH: '/app/conf'
+```
+

 ## 简易的控制面板

@@ -178,11 +285,14 @@ services:

 - ip 是 XIAOMUSIC_HOSTNAME 设置的
 - 8090 是默认端口
- 新功能
+- 支持功能
    - 显示正在播放的歌曲
    - 模糊搜索本地歌曲
+    - 播放列表
+    - 删除歌曲
    - 设置页面
-
+    - 配置网络歌单
+    - 日志文件下载

 采用新的设置页面之后，必须在启动前配置的环境变量只剩下:
 - MI_USER
@@ -197,24 +307,33 @@ services:

 ## 网络歌单功能

-可以配置一个 json 格式的歌单，支持电台和歌曲，也可以直接用别人分享的链接，具体用法见  <https://github.com/hanxi/xiaomusic/issues/78>
+可以配置一个 json 格式的歌单，支持电台和歌曲，也可以直接用别人分享的链接，同时配备了 m3u 文件格式转换工具，可以很方便的把 m3u 电台文件转换成网络歌单格式的 json 文件，具体用法见  <https://github.com/hanxi/xiaomusic/issues/78>
+
+> 欢迎有想法的朋友们制作更多的歌单转换工具。

 ## 更多其他可选配置

- XIAOMUSIC_ACTIVE_CMD 配置唤醒命令，具体见 <https://github.com/hanxi/xiaomusic/pull/43>
+- XIAOMUSIC_ACTIVE_CMD 环境变量，用于唤醒口令，配置成'play,random_play'，在非播放状态下，只有这两个指令（播放歌曲和随机播放）可以触发，触发后，xiaomusic进入playing状态，其他指令则可以正常触发。具体见 <https://github.com/hanxi/xiaomusic/pull/43>
 - XIAOMUSIC_EXCLUDE_DIRS 配置歌曲目录里需要忽略的目录
 - XIAOMUSIC_MUSIC_PATH_DEPTH 配置歌曲目录搜索深度，具体见 <https://github.com/hanxi/xiaomusic/issues/76>
 - XIAOMUSIC_DISABLE_HTTPAUTH 配置成 false 表示开启密码访问web控制台，具体见 <https://github.com/hanxi/xiaomusic/issues/47>
 - XIAOMUSIC_HTTPAUTH_USERNAME 配置 web 控制台用户
 - XIAOMUSIC_HTTPAUTH_PASSWORD 配置 web 控制台密码
 - XIAOMUSIC_CONF_PATH 用来存放配置文件的目录，记得把目录映射到主机，默认情况会把配置存放在music目录，具体见 <https://github.com/hanxi/xiaomusic/issues/74>
- XIAOMUSIC_VERBOSE 设置为 true 时开启 debug 日志，用于排查问题
+- XIAOMUSIC_DISABLE_DOWNLOAD 设为 true 时关闭下载功能，见 <https://github.com/hanxi/xiaomusic/issues/82>
+- XIAOMUSIC_USE_MUSIC_API 设为 true 时使用 player_play_music 接口播放音乐，用于兼容不能播放的型号
+- XIAOMUSIC_KEYWORDS_PLAY 用来播放歌曲的口令前缀，默认是 "播放歌曲,放歌曲" ，可以用英文逗号分割配置多个
+- XIAOMUSIC_KEYWORDS_STOP 用来关机的口令，默认是 "关机,暂停,停止" ，可以用英文逗号分割配置多个。
+- XIAOMUSIC_KEYWORDS_PLAYLOCAL 用来播放本地歌曲的口令前缀，本地找不到时不会下载歌曲，默认是 "播放本地歌曲,本地播放歌曲" ，可以用英文逗号分割配置多个。
+- XIAOMUSIC_ENABLE_FUZZY_MATCH 设为 true 时开启模糊匹配（默认），设为 false 时关闭模糊匹配，支持模糊匹配歌名和歌单名。 具体见 <https://github.com/hanxi/xiaomusic/issues/52>
+- XIAOMUSIC_FUZZY_MATCH_CUTOFF 设置模糊搜索匹配的最低相似度阈值（默认0.6，可以配0到1直接的小数），越小越模糊，越大越精准。具体见 <https://github.com/hanxi/xiaomusic/issues/52>

 ## 讨论区

 - [点击链接加入QQ频道【xiaomusic】](https://pd.qq.com/s/e2jybz0ss)
 - [点击链接加入群聊【xiaomusic】 604526973](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=13St5PLVcTxYlWTAs_iAawazjtdD1l-a&authKey=dJWEpaT2fDBDpdUUOWj%2FLt6NS1ePBfShDfz7a6seNURi05VvVnAGQzXF%2FM%2F5HgIm&noverify=0&group_code=604526973)
- https://github.com/hanxi/xiaomusic/issues
+- <https://github.com/hanxi/xiaomusic/issues>
+- [微信群二维码](https://github.com/hanxi/xiaomusic/issues/86)

 ## 感谢

@@ -232,4 +351,7 @@ services:
 [![Star History Chart](https://api.star-history.com/svg?repos=hanxi/xiaomusic&type=Date)](https://star-history.com/#hanxi/xiaomusic&Date)

 ## 赞赏
-谢谢就够了
+
+- 爱发电 <https://afdian.net/a/imhanxi>
+- 点个 Star ⭐
+- 谢谢 ❤️
--- a/config-example.json
+++ b/config-example.json
@@ -0,0 +1,32 @@
+{
+    "hardware": "L07A",
+    "account": "",
+    "password": "",
+    "mi_did": "",
+    "cookie": "",
+    "verbose": false,
+    "music_path": "music",
+    "conf_path": null,
+    "hostname": "192.168.2.5",
+    "port": 8090,
+    "proxy": null,
+    "search_prefix": "ytsearch:",
+    "ffmpeg_location": "./ffmpeg/bin",
+    "active_cmd": "play,random_play,playlocal,play_music_list,stop",
+    "exclude_dirs": "@eaDir",
+    "music_path_depth": 10,
+    "disable_httpauth": true,
+    "httpauth_username": "admin",
+    "httpauth_password": "admin",
+    "music_list_url": "",
+    "music_list_json": "",
+    "disable_download": false,
+    "use_music_api": false,
+    "log_file": "/tmp/xiaomusic.txt",
+    "fuzzy_match_cutoff": 0.6,
+    "enable_fuzzy_match": true,
+    "stop_tts_msg": "收到,再见",
+    "keywords_playlocal": "播放本地歌曲,本地播放歌曲",
+    "keywords_play": "播放歌曲,放歌曲",
+    "keywords_stop": "关机,暂停,停止,停止播放"
+}
--- a/pdm.lock
+++ b/pdm.lock
@@ -519,7 +519,7 @@ files = [

 [[package]]
 name = "miservice-fork"
-version = "2.5.0"
+version = "2.6.0"
 requires_python = ">=3.8"
 summary = "XiaoMi Cloud Service fork from https://github.com/Yonsm/MiService"
 dependencies = [
@@ -528,8 +528,8 @@ dependencies = [
    "rich",
 ]
 files = [
-    {file = "miservice_fork-2.5.0-py3-none-any.whl", hash = "sha256:97b6360ea53c34fe035ac9d94e8705f305b8fa7fc2b44a7aea182449a76cb622"},
-    {file = "miservice_fork-2.5.0.tar.gz", hash = "sha256:8ca2d370d5b32f7e330add38aa1912d734aefa7880f16cef9eac110a5a3029e2"},
+    {file = "miservice_fork-2.6.0-py3-none-any.whl", hash = "sha256:98169a77ea41a7b9392e1b1fab8cb80a4165fed8a9e882d9ada9a16dd1120347"},
+    {file = "miservice_fork-2.6.0.tar.gz", hash = "sha256:a59d337d1f7a92566aa147e96595a8d2f5bf3f7000ae5e7dd9ed451f18d6e2fd"},
 ]

 [[package]]
@@ -662,27 +662,28 @@ files = [

 [[package]]
 name = "ruff"
-version = "0.4.9"
+version = "0.5.0"
 requires_python = ">=3.7"
 summary = "An extremely fast Python linter and code formatter, written in Rust."
 files = [
-    {file = "ruff-0.4.9-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b262ed08d036ebe162123170b35703aaf9daffecb698cd367a8d585157732991"},
-    {file = "ruff-0.4.9-py3-none-macosx_11_0_arm64.whl", hash = "sha256:98ec2775fd2d856dc405635e5ee4ff177920f2141b8e2d9eb5bd6efd50e80317"},
-    {file = "ruff-0.4.9-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4555056049d46d8a381f746680db1c46e67ac3b00d714606304077682832998e"},
-    {file = "ruff-0.4.9-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e91175fbe48f8a2174c9aad70438fe9cb0a5732c4159b2a10a3565fea2d94cde"},
-    {file = "ruff-0.4.9-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e8e7b95673f22e0efd3571fb5b0cf71a5eaaa3cc8a776584f3b2cc878e46bff"},
-    {file = "ruff-0.4.9-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:2d45ddc6d82e1190ea737341326ecbc9a61447ba331b0a8962869fcada758505"},
-    {file = "ruff-0.4.9-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:78de3fdb95c4af084087628132336772b1c5044f6e710739d440fc0bccf4d321"},
-    {file = "ruff-0.4.9-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:06b60f91bfa5514bb689b500a25ba48e897d18fea14dce14b48a0c40d1635893"},
-    {file = "ruff-0.4.9-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88bffe9c6a454bf8529f9ab9091c99490578a593cc9f9822b7fc065ee0712a06"},
-    {file = "ruff-0.4.9-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:673bddb893f21ab47a8334c8e0ea7fd6598ecc8e698da75bcd12a7b9d0a3206e"},
-    {file = "ruff-0.4.9-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8c1aff58c31948cc66d0b22951aa19edb5af0a3af40c936340cd32a8b1ab7438"},
-    {file = "ruff-0.4.9-py3-none-musllinux_1_2_i686.whl", hash = "sha256:784d3ec9bd6493c3b720a0b76f741e6c2d7d44f6b2be87f5eef1ae8cc1d54c84"},
-    {file = "ruff-0.4.9-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:732dd550bfa5d85af8c3c6cbc47ba5b67c6aed8a89e2f011b908fc88f87649db"},
-    {file = "ruff-0.4.9-py3-none-win32.whl", hash = "sha256:8064590fd1a50dcf4909c268b0e7c2498253273309ad3d97e4a752bb9df4f521"},
-    {file = "ruff-0.4.9-py3-none-win_amd64.whl", hash = "sha256:e0a22c4157e53d006530c902107c7f550b9233e9706313ab57b892d7197d8e52"},
-    {file = "ruff-0.4.9-py3-none-win_arm64.whl", hash = "sha256:5d5460f789ccf4efd43f265a58538a2c24dbce15dbf560676e430375f20a8198"},
-    {file = "ruff-0.4.9.tar.gz", hash = "sha256:f1cb0828ac9533ba0135d148d214e284711ede33640465e706772645483427e3"},
+    {file = "ruff-0.5.0-py3-none-linux_armv6l.whl", hash = "sha256:ee770ea8ab38918f34e7560a597cc0a8c9a193aaa01bfbd879ef43cb06bd9c4c"},
+    {file = "ruff-0.5.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:38f3b8327b3cb43474559d435f5fa65dacf723351c159ed0dc567f7ab735d1b6"},
+    {file = "ruff-0.5.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7594f8df5404a5c5c8f64b8311169879f6cf42142da644c7e0ba3c3f14130370"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:adc7012d6ec85032bc4e9065110df205752d64010bed5f958d25dbee9ce35de3"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d505fb93b0fabef974b168d9b27c3960714d2ecda24b6ffa6a87ac432905ea38"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9dc5cfd3558f14513ed0d5b70ce531e28ea81a8a3b1b07f0f48421a3d9e7d80a"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:db3ca35265de239a1176d56a464b51557fce41095c37d6c406e658cf80bbb362"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1a321c4f68809fddd9b282fab6a8d8db796b270fff44722589a8b946925a2a8"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c4dfcd8d34b143916994b3876b63d53f56724c03f8c1a33a253b7b1e6bf2a7d"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:81e5facfc9f4a674c6a78c64d38becfbd5e4f739c31fcd9ce44c849f1fad9e4c"},
+    {file = "ruff-0.5.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:e589e27971c2a3efff3fadafb16e5aef7ff93250f0134ec4b52052b673cf988d"},
+    {file = "ruff-0.5.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d2ffbc3715a52b037bcb0f6ff524a9367f642cdc5817944f6af5479bbb2eb50e"},
+    {file = "ruff-0.5.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:cd096e23c6a4f9c819525a437fa0a99d1c67a1b6bb30948d46f33afbc53596cf"},
+    {file = "ruff-0.5.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:46e193b36f2255729ad34a49c9a997d506e58f08555366b2108783b3064a0e1e"},
+    {file = "ruff-0.5.0-py3-none-win32.whl", hash = "sha256:49141d267100f5ceff541b4e06552e98527870eafa1acc9dec9139c9ec5af64c"},
+    {file = "ruff-0.5.0-py3-none-win_amd64.whl", hash = "sha256:e9118f60091047444c1b90952736ee7b1792910cab56e9b9a9ac20af94cd0440"},
+    {file = "ruff-0.5.0-py3-none-win_arm64.whl", hash = "sha256:ed5c4df5c1fb4518abcb57725b576659542bdbe93366f4f329e8f398c4b71178"},
+    {file = "ruff-0.5.0.tar.gz", hash = "sha256:eb641b5873492cf9bd45bc9c5ae5320648218e04386a5f0c264ad6ccce8226a1"},
 ]

 [[package]]
@@ -831,7 +832,7 @@ files = [

 [[package]]
 name = "yt-dlp"
-version = "2024.6.17.232743.dev0"
+version = "2024.6.24.232830.dev0"
 requires_python = ">=3.8"
 summary = "A feature-rich command-line audio/video downloader"
 dependencies = [
@@ -845,6 +846,6 @@ dependencies = [
    "websockets>=12.0",
 ]
 files = [
-    {file = "yt_dlp-2024.6.17.232743.dev0-py3-none-any.whl", hash = "sha256:dd6e7e194b96e778691f58a0cb6b42956cf956b22f6bb1a12bdef5ab3ac0c9ad"},
-    {file = "yt_dlp-2024.6.17.232743.dev0.tar.gz", hash = "sha256:2f6f44eff755a7b051cdcd3c4375771033dbeb64d6164351022efdc67cce0c52"},
+    {file = "yt_dlp-2024.6.24.232830.dev0-py3-none-any.whl", hash = "sha256:efffecef44ce688e9ee3c02226eb1ba4ad64b37744726e9e4df5c2bd04ea93c5"},
+    {file = "yt_dlp-2024.6.24.232830.dev0.tar.gz", hash = "sha256:0e89b46958984954393692a8c41e0f6d76a773be2df381c3d3a4ff24ce89aa32"},
 ]
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "xiaomusic"
-version = "0.1.67"
+version = "0.1.84"
 description = "Play Music with xiaomi AI speaker"
 authors = [
    {name = "涵曦", email = "im.hanxi@gmail.com"},
@@ -19,6 +19,12 @@ requires-python = ">=3.10"
 readme = "README.md"
 license = {text = "MIT"}

+[project.urls]
+Homepage = "https://github.com/hanxi/xiaomusic"
+
+[project.scripts]
+xiaomusic = "xiaomusic.cli:main"
+
 [build-system]
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"
--- a/requirements.txt
+++ b/requirements.txt
@@ -305,9 +305,9 @@ MarkupSafe==2.1.4 \
 mdurl==0.1.2 \
    --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
    --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
-miservice-fork==2.5.0 \
-    --hash=sha256:8ca2d370d5b32f7e330add38aa1912d734aefa7880f16cef9eac110a5a3029e2 \
-    --hash=sha256:97b6360ea53c34fe035ac9d94e8705f305b8fa7fc2b44a7aea182449a76cb622
+miservice-fork==2.6.0 \
+    --hash=sha256:98169a77ea41a7b9392e1b1fab8cb80a4165fed8a9e882d9ada9a16dd1120347 \
+    --hash=sha256:a59d337d1f7a92566aa147e96595a8d2f5bf3f7000ae5e7dd9ed451f18d6e2fd
 multidict==6.0.4 \
    --hash=sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9 \
    --hash=sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8 \
@@ -472,6 +472,6 @@ yarl==1.9.2 \
    --hash=sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9 \
    --hash=sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3 \
    --hash=sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560
-yt-dlp==2024.6.17.232743.dev0 \
-    --hash=sha256:2f6f44eff755a7b051cdcd3c4375771033dbeb64d6164351022efdc67cce0c52 \
-    --hash=sha256:dd6e7e194b96e778691f58a0cb6b42956cf956b22f6bb1a12bdef5ab3ac0c9ad
+yt-dlp==2024.6.24.232830.dev0 \
+    --hash=sha256:0e89b46958984954393692a8c41e0f6d76a773be2df381c3d3a4ff24ce89aa32 \
+    --hash=sha256:efffecef44ce688e9ee3c02226eb1ba4ad64b37744726e9e4df5c2bd04ea93c5
--- a/xiaomusic/init.py
+++ b/xiaomusic/init.py
@@ -1 +1 @@
-__version__ = "0.1.67"
+__version__ = "0.1.84"
--- a/xiaomusic/cli.py
+++ b/xiaomusic/cli.py
@@ -1,9 +1,21 @@
 import argparse
 import asyncio

+from xiaomusic import (
+    __version__,
+)
 from xiaomusic.config import Config
 from xiaomusic.xiaomusic import XiaoMusic

+LOGO = r"""
+ __  __  _                   __  __                 _
+ \ \/ / (_)   __ _    ___   |  \/  |  _   _   ___  (_)   ___
+  \  /  | |  / _` |  / _ \  | |\/| | | | | | / __| | |  / __|
+  /  \  | | | (_| | | (_) | | |  | | | |_| | \__ \ | | | (__
+ /_/\_\ |_|  \__,_|  \___/  |_|  |_|  \__,_| |___/ |_|  \___|
+          {}
+"""
+

 def main():
    parser = argparse.ArgumentParser()
@@ -45,6 +57,8 @@ def main():
        help="ffmpeg bin path",
    )

+    print(LOGO.format(f"XiaoMusic v{__version__} by: github.com/hanxi"))
+
    options = parser.parse_args()
    config = Config.from_options(options)

--- a/xiaomusic/config.py
+++ b/xiaomusic/config.py
@@ -7,18 +7,15 @@ from dataclasses import dataclass

 from xiaomusic.utils import validate_proxy

-LATEST_ASK_API = "https://userprofile.mina.mi.com/device_profile/v2/conversation?source=dialogu&hardware={hardware}&timestamp={timestamp}&limit=2"
-COOKIE_TEMPLATE = "deviceId={device_id}; serviceToken={service_token}; userId={user_id}"
-
-KEY_WORD_DICT = {
+# 默认口令
+DEFAULT_KEY_WORD_DICT = {
    "播放歌曲": "play",
-    "放歌曲": "play",
+    "播放本地歌曲": "playlocal",
+    "关机": "stop",
    "下一首": "play_next",
    "单曲循环": "set_play_type_one",
    "全部循环": "set_play_type_all",
    "随机播放": "random_play",
-    "关机": "stop",
-    "停止播放": "stop",
    "分钟后关机": "stop_after_minute",
    "播放列表": "play_music_list",
    "刷新列表": "gen_music_list",
@@ -31,30 +28,21 @@ KEY_WORD_ARG_BEFORE_DICT = {
    "分钟后关机": True,
 }

-# 匹配优先级
-KEY_MATCH_ORDER = [
+# 口令匹配优先级
+DEFAULT_KEY_MATCH_ORDER = [
    "set_volume#",
    "get_volume#",
    "分钟后关机",
    "播放歌曲",
-    "放歌曲",
    "下一首",
    "单曲循环",
    "全部循环",
    "随机播放",
    "关机",
-    "停止播放",
    "刷新列表",
    "播放列表",
 ]

-SUPPORT_MUSIC_TYPE = [
-    ".mp3",
-    ".flac",
-    ".wav",
-    ".ape",
-]
-

@dataclass
 class Config:
@@ -73,7 +61,9 @@ class Config:
        "XIAOMUSIC_SEARCH", "ytsearch:"
    )  # "bilisearch:" or "ytsearch:"
    ffmpeg_location: str = os.getenv("XIAOMUSIC_FFMPEG_LOCATION", "./ffmpeg/bin")
-    active_cmd: str = os.getenv("XIAOMUSIC_ACTIVE_CMD", "play,random_play")
+    active_cmd: str = os.getenv(
+        "XIAOMUSIC_ACTIVE_CMD", "play,random_play,playlocal,play_music_list,stop"
+    )
    exclude_dirs: str = os.getenv("XIAOMUSIC_EXCLUDE_DIRS", "@eaDir")
    music_path_depth: int = int(os.getenv("XIAOMUSIC_MUSIC_PATH_DEPTH", "10"))
    disable_httpauth: bool = (
@@ -86,10 +76,43 @@ class Config:
    disable_download: bool = (
        os.getenv("XIAOMUSIC_DISABLE_DOWNLOAD", "false").lower() == "true"
    )
+    key_word_dict = DEFAULT_KEY_WORD_DICT.copy()
+    key_match_order = DEFAULT_KEY_MATCH_ORDER.copy()
+    use_music_api: bool = (
+        os.getenv("XIAOMUSIC_USE_MUSIC_API", "false").lower() == "true"
+    )
+    log_file: str = os.getenv("XIAOMUSIC_MUSIC_LOG_FILE", "/tmp/xiaomusic.txt")
+    # 模糊搜索匹配的最低相似度阈值
+    fuzzy_match_cutoff: float = float(os.getenv("XIAOMUSIC_FUZZY_MATCH_CUTOFF", "0.6"))
+    # 开启模糊搜索
+    enable_fuzzy_match: bool = (
+        os.getenv("XIAOMUSIC_ENABLE_FUZZY_MATCH", "true").lower() == "true"
+    )
+    stop_tts_msg: str = os.getenv("XIAOMUSIC_STOP_TTS_MSG", "收到,再见")
+
+    keywords_playlocal: str = os.getenv(
+        "XIAOMUSIC_KEYWORDS_PLAYLOCAL", "播放本地歌曲,本地播放歌曲"
+    )
+    keywords_play: str = os.getenv("XIAOMUSIC_KEYWORDS_PLAY", "播放歌曲,放歌曲")
+    keywords_stop: str = os.getenv("XIAOMUSIC_KEYWORDS_STOP", "关机,暂停,停止,停止播放")
+
+    def append_keyword(self, keys, action):
+        for key in keys.split(","):
+            self.key_word_dict[key] = action
+            if key not in self.key_match_order:
+                self.key_match_order.append(key)

    def __post_init__(self) -> None:
        if self.proxy:
            validate_proxy(self.proxy)
+        self.append_keyword(self.keywords_playlocal, "playlocal")
+        self.append_keyword(self.keywords_play, "play")
+        self.append_keyword(self.keywords_stop, "stop")
+
+        # 保存配置到 config-example.json 文件
+        # with open("config-example.json", "w") as f:
+        #    data = asdict(self)
+        #    json.dump(data, f, ensure_ascii=False, indent=4)

    @classmethod
    def from_options(cls, options: argparse.Namespace) -> Config:
--- a/xiaomusic/const.py
+++ b/xiaomusic/const.py
@@ -0,0 +1,10 @@
+SUPPORT_MUSIC_TYPE = [
+    ".mp3",
+    ".flac",
+    ".wav",
+    ".ape",
+    ".ogg",
+]
+
+LATEST_ASK_API = "https://userprofile.mina.mi.com/device_profile/v2/conversation?source=dialogu&hardware={hardware}&timestamp={timestamp}&limit=2"
+COOKIE_TEMPLATE = "deviceId={device_id}; serviceToken={service_token}; userId={user_id}"
--- a/xiaomusic/httpserver.py
+++ b/xiaomusic/httpserver.py
@@ -2,16 +2,13 @@
 import os
 from threading import Thread

-from flask import Flask, request, send_from_directory
+from flask import Flask, request, send_file, send_from_directory
 from flask_httpauth import HTTPBasicAuth
 from waitress import serve

 from xiaomusic import (
    __version__,
 )
-from xiaomusic.config import (
-    KEY_WORD_DICT,
-)
 from xiaomusic.utils import (
    downloadfile,
 )
@@ -41,7 +38,7 @@ def verify_password(username, password):
@app.route("/allcmds")
@auth.login_required
 def allcmds():
-    return KEY_WORD_DICT
+    return xiaomusic.config.key_word_dict


@app.route("/getversion", methods=["GET"])
@@ -154,10 +151,11 @@ def downloadjson():
    data = request.get_json()
    log.info(data)
    url = data["url"]
-    retmsg, content = downloadfile(url)
-    ret = "OK"
-    if retmsg != "OK":
-        log.warning(f"downloadjson failed. url:{url} ret:{ret}")
+    try:
+        ret = "OK"
+        content = downloadfile(url)
+    except Exception as e:
+        log.warning(f"downloadjson failed. url:{url} e:{e}")
        ret = "Download JSON file failed."
    return {
        "ret": ret,
@@ -165,6 +163,20 @@ def downloadjson():
    }


+@app.route("/downloadlog", methods=["GET"])
+@auth.login_required
+def downloadlog():
+    return send_file(xiaomusic.config.log_file, as_attachment=True)
+
+
+@app.route("/playurl", methods=["GET"])
+@auth.login_required
+async def playurl():
+    url = request.args.get("url")
+    log.info(f"play_url:{url}")
+    return await xiaomusic.call_main_thread_function(xiaomusic.play_url, arg1=url)
+
+
 def static_path_handler(filename):
    log.debug(filename)
    log.debug(static_path)
--- a/xiaomusic/static/app.js
+++ b/xiaomusic/static/app.js
@@ -82,6 +82,13 @@ $(function(){
    }
  });

+  $("#playurl").on("click", () => {
+    var url = $("#music-url").val();
+    $.get(`/playurl?url=${url}`, function(data, status) {
+      console.log(data);
+    });
+  });
+
  function append_op_button_name(name) {
    append_op_button(name, name);
  }
--- a/xiaomusic/static/index.html
+++ b/xiaomusic/static/index.html
@@ -43,6 +43,12 @@
    <button id="play_music_list">播放列表歌曲</button>
    <button id="del_music">删除选中歌曲</button>

+    <hr>
+    <div>
+      <input id="music-url" type="text" placeholder="链接(http://ngcdn001.cnr.cn/live/zgzs/index.m3u8)"></input>
+    </div>
+    <button id="playurl">播放链接</button>
+
    <footer>
      <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
    </footer>
--- a/xiaomusic/static/m3u.html
+++ b/xiaomusic/static/m3u.html
@@ -33,10 +33,11 @@ function convertToJSON() {
  var musicsArray = [];
  var currentName = '';
  lines.forEach(function(line) {
-    if (line.startsWith('#EXTINF:-1,')) {
-      currentName = line.substring(11).trim();
+    line = line.trim();
+    if (line.startsWith('#EXTINF:')) {
+      currentName = line.replace(/.*,/g, '');
    } else if (line.startsWith('http') && currentName !== '') {
-      musicsArray.push({"name": currentName, "type": "radio", "url": line.trim()});
+      musicsArray.push({"name": currentName, "type": "radio", "url": line});
      currentName = ''; // Reset the name for the next entry
    }
  });
--- a/xiaomusic/static/setting.html
+++ b/xiaomusic/static/setting.html
@@ -13,8 +13,8 @@
    <div class="rows">
      <label for="mi_did">MI_DID:</label>
      <select id="mi_did"></select>
-      <label for="mi_hardware">MI_HARDWARE:</label>
-      <select id="mi_hardware"></select>
+      <label for="mi_hardware">MI_HARDWARE(型号):</label>
+      <select id="mi_hardware" disabled></select>
      <label for="xiaomusic_search">XIAOMUSIC_SEARCH:</label>
      <select id="xiaomusic_search">
        <option value="ytsearch:">ytsearch:</option>
@@ -31,6 +31,7 @@
    <button onclick="location.href='/';">返回首页</button>
    <button id="get_music_list">获取歌单</button>
    <button id="save">保存</button>
+    <a class="button" href="/downloadlog" download="xiaomusic.txt">下载日志文件</a>
    <hr>

    <a href="/static/m3u.html" target="_blank">m3u文件转换工具</a>
--- a/xiaomusic/static/setting.js
+++ b/xiaomusic/static/setting.js
@@ -5,33 +5,49 @@ $(function(){
    $("#version").text(`(${data.version})`);
  });

+  const updateSelectOptions = (selectId, optionsList, selectedOption) => {
+    const select = $(selectId);
+    select.empty();
+    optionsList.forEach(option => {
+      select.append(new Option(option, option));
+    });
+    select.val(selectedOption);
+  };
+
+  let isChanging = false;
+  // 更新下拉菜单的函数
+  const updateSelect = (selectId, value) => {
+    if (!isChanging) {
+      isChanging = true;
+      $(selectId).val(value);
+      isChanging = false;
+    }
+  };
+
+  // 联动逻辑
+  const linkSelects = (sourceSelect, sourceList, targetSelect, targetList) => {
+    $(sourceSelect).change(function() {
+      if (!isChanging) {
+        const selectedValue = $(this).val();
+        const selectedIndex = sourceList.indexOf(selectedValue);
+        console.log(selectedIndex, selectedValue,sourceList,targetList)
+        if (selectedIndex !== -1) {
+          updateSelect(targetSelect, targetList[selectedIndex]);
+        }
+      }
+    });
+  };
+
+
  // 拉取现有配置
  $.get("/getsetting", function(data, status) {
    console.log(data, status);

-    var mi_did_div = $("#mi_did")
-    mi_did_div.empty();
-    $.each(data.mi_did_list, function(index, option){
-      mi_did_div.append($('<option>', {
-        value:option,
-        text:option,
-      }));
-      if (data.mi_did == option) {
-        mi_did_div.val(option);
-      }
-    });
+    updateSelectOptions("#mi_did", data.mi_did_list, data.mi_did);
+    updateSelectOptions("#mi_hardware", data.mi_hardware_list, data.mi_hardware);

-    var mi_hardware_div = $("#mi_hardware")
-    mi_hardware_div.empty();
-    $.each(data.mi_hardware_list, function(index, option){
-      mi_hardware_div.append($('<option>', {
-        value:option,
-        text:option,
-      }));
-      if (data.mi_hardware == option) {
-        mi_hardware_div.val(option);
-      }
-    });
+    // 初始化联动
+    linkSelects('#mi_did', data.mi_did_list, '#mi_hardware', data.mi_hardware_list);

    if (data.xiaomusic_search != "") {
      $("#xiaomusic_search").val(data.xiaomusic_search);
--- a/xiaomusic/static/style.css
+++ b/xiaomusic/static/style.css
@@ -1,4 +1,8 @@
-button {
+.button {
+  line-height: 50px;
+  font-size: 14px;
+}
+button, .button {
  margin: 10px;
  width: 100px;
  height: 50px;
@@ -10,7 +14,7 @@ button {
  border-radius: 10px;
  background-color: #008CBA;
 }
-button:active {
+button:active, .button:active {
  font-weight:bold;
  background-color: #007CBA;
  transform: translateY(2px);
--- a/xiaomusic/utils.py
+++ b/xiaomusic/utils.py
@@ -3,7 +3,9 @@ from __future__ import annotations

 import difflib
 import os
+import random
 import re
+import string
 import tempfile
 from collections.abc import AsyncIterator
 from http.cookies import SimpleCookie
@@ -14,6 +16,8 @@ import mutagen
 import requests
 from requests.utils import cookiejar_from_dict

+from xiaomusic.const import SUPPORT_MUSIC_TYPE
+

 ### HELP FUNCTION ###
 def parse_cookie_string(cookie_string):
@@ -68,7 +72,12 @@ def validate_proxy(proxy_str: str) -> bool:

 # 模糊搜索
 def fuzzyfinder(user_input, collection):
-    return difflib.get_close_matches(user_input, collection, 10, cutoff=0.1)
+    return difflib.get_close_matches(user_input, collection, n=10, cutoff=0.1)
+
+
+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


 # 歌曲排序
@@ -152,36 +161,22 @@ def walk_to_depth(root, depth=None, *args, **kwargs):

 def downloadfile(url):
    # 清理和验证URL
-    try:
-        # 解析URL
-        parsed_url = urlparse(url)
+    # 解析URL
+    parsed_url = urlparse(url)

-        # 基础验证：仅允许HTTP和HTTPS协议
-        if parsed_url.scheme not in ("http", "https"):
-            return (
-                f"Invalid URL scheme: {parsed_url.scheme}. Only HTTP and HTTPS are allowed.",
-                "",
-            )
+    # 基础验证：仅允许HTTP和HTTPS协议
+    if parsed_url.scheme not in ("http", "https"):
+        raise Warning(
+            f"Invalid URL scheme: {parsed_url.scheme}. Only HTTP and HTTPS are allowed."
+        )

-        # 构建目标URL
-        cleaned_url = parsed_url.geturl()
-    except Exception as e:
-        return (f"Invalid URL: {e}", "")
+    # 构建目标URL
+    cleaned_url = parsed_url.geturl()

    # 发起请求
-    try:
-        response = requests.get(cleaned_url, timeout=5)  # 增加超时以避免长时间挂起
-        response.raise_for_status()  # 如果响应不是200，引发HTTPError异常
-        return ("OK", response.text)
-    except requests.exceptions.HTTPError as errh:
-        return (f"HTTP Error: {errh}", "")
-    except requests.exceptions.ConnectionError as errc:
-        return (f"Error Connecting: {errc}", "")
-    except requests.exceptions.Timeout as errt:
-        return (f"Timeout Error: {errt}", "")
-    except requests.exceptions.RequestException as err:
-        return (f"Oops: Something Else, {err}", "")
-    return ("Unknown Error", "")
+    response = requests.get(cleaned_url, timeout=5)  # 增加超时以避免长时间挂起
+    response.raise_for_status()  # 如果响应不是200，引发HTTPError异常
+    return response.text


 async def _get_web_music_duration(session, url, start=0, end=500):
@@ -205,6 +200,20 @@ async def _get_web_music_duration(session, url, start=0, end=500):
 async def get_web_music_duration(url, start=0, end=500):
    duration = 0
    try:
+        parsed_url = urlparse(url)
+        file_path = parsed_url.path
+        _, extension = os.path.splitext(file_path)
+        if extension.lower() not in SUPPORT_MUSIC_TYPE:
+            cleaned_url = parsed_url.geturl()
+            async with aiohttp.ClientSession() as session:
+                async with session.get(
+                    cleaned_url,
+                    allow_redirects=True,
+                    headers={
+                        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36"
+                    },
+                ) as response:
+                    url = str(response.url)
        # 设置总超时时间为3秒
        timeout = aiohttp.ClientTimeout(total=3)
        async with aiohttp.ClientSession(timeout=timeout) as session:
@@ -215,7 +224,7 @@ async def get_web_music_duration(url, start=0, end=500):
                )
    except Exception:
        pass
-    return duration
+    return duration, url


 # 获取文件播放时长
@@ -227,3 +236,7 @@ def get_local_music_duration(filename):
    except Exception:
        pass
    return duration
+
+
+def get_random(length):
+    return "".join(random.sample(string.ascii_letters + string.digits, length))
--- a/xiaomusic/xiaomusic.py
+++ b/xiaomusic/xiaomusic.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import asyncio
+import copy
 import json
 import logging
 import os
@@ -9,6 +10,7 @@ import re
 import time
 import traceback
 import urllib.parse
+from logging.handlers import RotatingFileHandler
 from pathlib import Path

 from aiohttp import ClientSession, ClientTimeout
@@ -18,19 +20,21 @@ from xiaomusic import (
    __version__,
 )
 from xiaomusic.config import (
-    COOKIE_TEMPLATE,
-    KEY_MATCH_ORDER,
    KEY_WORD_ARG_BEFORE_DICT,
-    KEY_WORD_DICT,
+    Config,
+)
+from xiaomusic.const import (
+    COOKIE_TEMPLATE,
    LATEST_ASK_API,
    SUPPORT_MUSIC_TYPE,
-    Config,
 )
 from xiaomusic.httpserver import StartHTTPServer
 from xiaomusic.utils import (
    custom_sort_key,
+    find_best_match,
    fuzzyfinder,
    get_local_music_duration,
+    get_random,
    get_web_music_duration,
    parse_cookie_string,
    walk_to_depth,
@@ -90,14 +94,8 @@ class XiaoMusic:
        # 关机定时器
        self._stop_timer = None

-        # setup logger
-        logging.basicConfig(
-            format=f"%(asctime)s [{__version__}] [%(levelname)s] %(message)s",
-            datefmt="[%X]",
-        )
-        self.log = logging.getLogger("xiaomusic")
-        self.log.setLevel(logging.DEBUG if config.verbose else logging.INFO)
-        self.log.debug(config)
+        # 初始化日志
+        self.setup_logger()

        # 尝试从设置里加载配置
        self.try_init_setting()
@@ -108,7 +106,30 @@ class XiaoMusic:
        # 启动时初始化获取声音
        self.set_last_record("get_volume#")

-        self.log.info("ffmpeg_location: %s", self.ffmpeg_location)
+    def setup_logger(self):
+        logging.basicConfig(
+            format=f"%(asctime)s [{__version__}] [%(levelname)s] %(message)s",
+            datefmt="[%X]",
+        )
+
+        log_file = self.config.log_file
+        log_path = os.path.dirname(log_file)
+        if not os.path.exists(log_path):
+            os.makedirs(log_path)
+        if os.path.exists(log_file):
+            os.remove(log_file)
+        handler = RotatingFileHandler(
+            self.config.log_file, maxBytes=10 * 1024 * 1024, backupCount=1
+        )
+        self.log = logging.getLogger("xiaomusic")
+        self.log.addHandler(handler)
+        self.log.setLevel(logging.DEBUG if self.config.verbose else logging.INFO)
+        debug_config = copy.deepcopy(self.config)
+        debug_config.account = "******"
+        debug_config.password = "******"
+        debug_config.httpauth_username = "******"
+        debug_config.httpauth_password = "******"
+        self.log.info(debug_config)

    async def poll_latest_ask(self):
        async with ClientSession() as session:
@@ -269,10 +290,13 @@ class XiaoMusic:
            await self.mina_service.text_to_speech(self.device_id, value)
        except Exception as e:
            self.log.error(f"Execption {e}")
-
+        # 最大等8秒
+        sec = min(8, int(len(value) / 3))
+        await asyncio.sleep(sec)
        self.log.debug(f"do_tts. cur_music:{self.cur_music}")
        if self._playing and not self.is_downloading():
            # 继续播放歌曲
+            self.log.info("继续播放歌曲")
            await self.play()

    async def do_set_volume(self, value):
@@ -285,7 +309,10 @@ class XiaoMusic:
            self.log.error(f"Execption {e}")

    async def force_stop_xiaoai(self):
-        await self.mina_service.player_stop(self.device_id)
+        ret = await self.mina_service.player_pause(self.device_id)
+        self.log.debug(f"force_stop_xiaoai player_pause ret:{ret}")
+        # ret = await self.mina_service.player_stop(self.device_id)
+        # self.log.debug(f"force_stop_xiaoai player_stop ret:{ret}")

    # 是否在下载中
    def is_downloading(self):
@@ -360,7 +387,28 @@ class XiaoMusic:
        url = self._all_music[name]
        return url.startswith(("http://", "https://"))

-    # 获取歌曲播放地址
+    # 获取歌曲播放时长，播放地址
+    async def get_music_sec_url(self, name):
+        sec = 0
+        url = self.get_music_url(name)
+        if self.is_web_radio_music(name):
+            self.log.info("电台不会有播放时长")
+            return 0, url
+
+        if self.is_web_music(name):
+            origin_url = url
+            duration, url = await get_web_music_duration(url)
+            sec = int(duration)
+            self.log.info(f"网络歌曲 {name} : {origin_url} {url} 的时长 {sec} 秒")
+        else:
+            filename = self.get_filename(name)
+            sec = int(get_local_music_duration(filename))
+            self.log.info(f"本地歌曲 {name} : {filename} {url} 的时长 {sec} 秒")
+
+        if sec <= 0:
+            self.log.warning(f"获取歌曲时长失败 {name} {url}")
+        return sec, url
+
    def get_music_url(self, name):
        if self.is_web_music(name):
            url = self._all_music[name]
@@ -448,7 +496,7 @@ class XiaoMusic:
                    # 处理电台列表
                    if music_type == "radio":
                        self._all_radio[name] = url
-                self.log.info(one_music_list)
+                self.log.debug(one_music_list)
                # 歌曲名字相同会覆盖
                self._music_list[list_name] = one_music_list
            if self._all_radio:
@@ -497,30 +545,14 @@ class XiaoMusic:
        return name

    # 设置下一首歌曲的播放定时器
-    async def set_next_music_timeout(self):
-        name = self.cur_music
-        if self.is_web_radio_music(name):
-            self.log.info("电台不会有下一首的定时器")
+    async def set_next_music_timeout(self, sec):
+        if sec <= 0:
            return

-        if self.is_web_music(name):
-            url = self._all_music[name]
-            duration = await get_web_music_duration(url)
-            sec = int(duration)
-            self.log.info(f"网络歌曲 {name} : {url} 的时长 {sec} 秒")
-        else:
-            filename = self.get_filename(name)
-            sec = int(get_local_music_duration(filename))
-            self.log.info(f"本地歌曲 {name} : {filename} 的时长 {sec} 秒")
-
        if self._next_timer:
            self._next_timer.cancel()
            self.log.info("定时器已取消")

-        if sec <= 0:
-            self.log.warning("获取歌曲时长失败，不会开启下一首歌曲的定时器")
-            return
-
        self._timeout = sec

        async def _do_next():
@@ -531,7 +563,7 @@ class XiaoMusic:
                self.log.warning(f"执行出错 {str(e)}\n{traceback.format_exc()}")

        self._next_timer = asyncio.ensure_future(_do_next())
-        self.log.info(f"{sec}秒后将会播放下一首")
+        self.log.info(f"{sec}秒后将会播放下一首歌曲")

    async def run_forever(self):
        StartHTTPServer(self.port, self.music_path, self)
@@ -541,10 +573,11 @@ class XiaoMusic:
            task = asyncio.create_task(self.poll_latest_ask())
            assert task is not None  # to keep the reference to task, do not remove this
            filtered_keywords = [
-                keyword for keyword in KEY_MATCH_ORDER if "#" not in keyword
+                keyword for keyword in self.config.key_match_order if "#" not in keyword
            ]
            joined_keywords = "/".join(filtered_keywords)
            self.log.info(f"Running xiaomusic now, 用`{joined_keywords}`开头来控制")
+            self.log.info(self.config.key_word_dict)

            while True:
                self.polling_event.set()
@@ -563,7 +596,7 @@ class XiaoMusic:
                self.polling_event.clear()  # stop polling when processing the question
                query = new_record.get("query", "").strip()
                ctrl_panel = new_record.get("ctrl_panel", False)
-                self.log.debug("收到消息:%s 控制面板:%s", query, ctrl_panel)
+                self.log.info("收到消息:%s 控制面板:%s", query, ctrl_panel)

                # 匹配命令
                opvalue, oparg = self.match_cmd(query, ctrl_panel)
@@ -577,9 +610,27 @@ class XiaoMusic:
                except Exception as e:
                    self.log.warning(f"执行出错 {str(e)}\n{traceback.format_exc()}")

+    # 检查是否匹配到完全一样的指令
+    def check_full_match_cmd(self, query, ctrl_panel):
+        if query in self.config.key_match_order:
+            opkey = query
+            opvalue = self.config.key_word_dict.get(opkey)
+            if ctrl_panel or self._playing:
+                return opvalue
+            else:
+                if not self.active_cmd or opvalue in self.active_cmd:
+                    return opvalue
+        return None
+
    # 匹配命令
    def match_cmd(self, query, ctrl_panel):
-        for opkey in KEY_MATCH_ORDER:
+        # 优先处理完全匹配
+        opvalue = self.check_full_match_cmd(query, ctrl_panel)
+        if opvalue:
+            self.log.info(f"完全匹配指令. query:{query} opvalue:{opvalue}")
+            return (opvalue, None)
+
+        for opkey in self.config.key_match_order:
            patternarg = rf"(.*){opkey}(.*)"
            # 匹配参数
            matcharg = re.match(patternarg, query)
@@ -596,20 +647,18 @@ class XiaoMusic:
                argafter,
            )
            oparg = argafter
-            opvalue = KEY_WORD_DICT[opkey]
-            if not ctrl_panel and not self._playing:
-                if self.active_cmd and opvalue not in self.active_cmd:
-                    self.log.debug(f"不在激活命令中 {opvalue}")
-                    continue
            if opkey in KEY_WORD_ARG_BEFORE_DICT:
                oparg = argpre
-            self.log.info(
-                "匹配到指令. opkey:%s opvalue:%s oparg:%s", opkey, opvalue, oparg
-            )
+            opvalue = self.config.key_word_dict.get(opkey)
+            if not ctrl_panel and not self._playing:
+                if self.active_cmd and opvalue not in self.active_cmd:
+                    self.log.ifno(f"不在激活命令中 {opvalue}")
+                    continue
+            self.log.info(f"匹配到指令. opkey:{opkey} opvalue:{opvalue} oparg:{oparg}")
            return (opvalue, oparg)
        if self._playing:
            self.log.info("未匹配到指令，自动停止")
-            return ("stop", {})
+            return ("stop", "notts")
        return (None, None)

    # 判断是否播放下一首歌曲
@@ -623,6 +672,86 @@ class XiaoMusic:
                return True
        return False

+    async def _play_by_music_url(self, device_id, url):
+        audio_id = get_random(30)
+        audio_type = ""
+        if self.config.hardware in ["LX04", "X10A", "X08A"]:
+            audio_type = "MUSIC"
+        music = {
+            "payload": {
+                "audio_items": [
+                    {"item_id": {"audio_id": audio_id}, "stream": {"url": url}}
+                ],
+                "audio_type": audio_type,
+            }
+        }
+        return await self.mina_service.ubus_request(
+            device_id,
+            "player_play_music",
+            "mediaplayer",
+            {"startaudioid": audio_id, "music": json.dumps(music)},
+        )
+
+    async def play_url(self, **kwargs):
+        url = kwargs.get("arg1", "")
+        if self.config.use_music_api:
+            ret = await self._play_by_music_url(self.device_id, url)
+            self.log.debug(
+                f"play_url play_by_music_url {self.config.hardware}. ret:{ret} url:{url}"
+            )
+        else:
+            ret = await self.mina_service.play_by_url(self.device_id, url)
+            self.log.debug(
+                f"play_url play_by_url {self.config.hardware}. ret:{ret} url:{url}"
+            )
+        return ret
+
+    def find_real_music_name(self, name):
+        if not self.config.enable_fuzzy_match:
+            self.log.debug("没开启模糊匹配")
+            return name
+
+        all_music_list = list(self._all_music.keys())
+        real_name = find_best_match(
+            name, all_music_list, cutoff=self.config.fuzzy_match_cutoff
+        )
+        if real_name:
+            self.log.info(f"根据【{name}】找到歌曲【{real_name}】")
+            return real_name
+        self.log.info(f"没找到歌曲【{name}】")
+        return name
+
+    # 播放本地歌曲
+    async def playlocal(self, **kwargs):
+        name = kwargs.get("arg1", "")
+        if name == "":
+            if self.check_play_next():
+                await self.play_next()
+                return
+            else:
+                name = self.cur_music
+
+        self.log.info(f"playlocal. name:{name}")
+
+        # 本地歌曲不存在时下载
+        name = self.find_real_music_name(name)
+        if not self.is_music_exist(name):
+            await self.do_tts(f"本地不存在歌曲{name}")
+            return
+        await self._playmusic(name)
+
+    async def _playmusic(self, name):
+        self._playing = True
+        self.cur_music = name
+        self.log.info(f"cur_music {self.cur_music}")
+        sec, url = await self.get_music_sec_url(name)
+        self.log.info(f"播放 {url}")
+        await self.force_stop_xiaoai()
+        await self.play_url(arg1=url)
+        self.log.info("已经开始播放了")
+        # 设置下一首歌曲的播放定时器
+        await self.set_next_music_timeout(sec)
+
    # 播放歌曲
    async def play(self, **kwargs):
        parts = kwargs.get("arg1", "").split("|")
@@ -641,26 +770,17 @@ class XiaoMusic:
        self.log.info("play. search_key:%s name:%s", search_key, name)

        # 本地歌曲不存在时下载
+        name = self.find_real_music_name(name)
        if not self.is_music_exist(name):
            if self.config.disable_download:
                await self.do_tts(f"本地不存在歌曲{name}")
                return
            await self.download(search_key, name)
-            self.log.info("正在下载中 %s", search_key + ":" + name)
+            self.log.info(f"正在下载中 {search_key} {name}")
            await self.download_proc.wait()
            # 把文件插入到播放列表里
            self.add_download_music(name)
-
-        self._playing = True
-        self.cur_music = name
-        self.log.info("cur_music %s", self.cur_music)
-        url = self.get_music_url(name)
-        self.log.info("播放 %s", url)
-        await self.force_stop_xiaoai()
-        await self.mina_service.play_by_url(self.device_id, url)
-        self.log.info("已经开始播放了")
-        # 设置下一首歌曲的播放定时器
-        await self.set_next_music_timeout()
+        await self._playmusic(name)

    # 下一首
    async def play_next(self, **kwargs):
@@ -712,10 +832,27 @@ class XiaoMusic:
            self.log.error(f"del ${filename} failed")
        self._gen_all_music_list()

+    def find_real_music_list_name(self, list_name):
+        if not self.config.enable_fuzzy_match:
+            self.log.debug("没开启模糊匹配")
+            return list_name
+
+        # 模糊搜一个播放列表
+        real_name = find_best_match(
+            list_name, self._music_list, cutoff=self.config.fuzzy_match_cutoff
+        )
+        if real_name:
+            self.log.info(f"根据【{list_name}】找到播放列表【{real_name}】")
+            list_name = real_name
+        self.log.info(f"没找到播放列表【{list_name}】")
+        return list_name
+
    # 播放一个播放列表
    async def play_music_list(self, **kwargs):
        parts = kwargs.get("arg1").split("|")
        list_name = parts[0]
+
+        list_name = self.find_real_music_list_name(list_name)
        if list_name not in self._music_list:
            await self.do_tts(f"播放列表{list_name}不存在")
            return
@@ -733,6 +870,9 @@ class XiaoMusic:

    async def stop(self, **kwargs):
        self._playing = False
+        if kwargs.get("arg1", "") != "notts":
+            if self.config.stop_tts_msg:
+                await self.do_tts(self.config.stop_tts_msg)
        if self._next_timer:
            self._next_timer.cancel()
            self.log.info("定时器已取消")
@@ -747,12 +887,12 @@ class XiaoMusic:
        async def _do_stop():
            await asyncio.sleep(minute * 60)
            try:
-                await self.stop()
+                await self.stop(arg1="notts")
            except Exception as e:
                self.log.warning(f"执行出错 {str(e)}\n{traceback.format_exc()}")

        self._stop_timer = asyncio.ensure_future(_do_stop())
-        self.log.info(f"{minute}分钟后将关机")
+        await self.do_tts(f"收到,{minute}分钟后将关机")

    async def set_volume(self, **kwargs):
        value = kwargs.get("arg1", 0)
@@ -762,7 +902,7 @@ class XiaoMusic:
        playing_info = await self.mina_service.player_get_status(self.device_id)
        self.log.debug("get_volume. playing_info:%s", playing_info)
        self._volume = json.loads(playing_info.get("data", {}).get("info", "{}")).get(
-            "volume", 5
+            "volume", 0
        )
        self.log.info("get_volume. volume:%s", self._volume)

@@ -836,7 +976,7 @@ class XiaoMusic:

        self.search_prefix = self.config.search_prefix
        self.proxy = self.config.proxy
-        self.log.info("update_config_from_setting ok. data:%s", data)
+        self.log.debug("update_config_from_setting ok. data:%s", data)

    # 重新初始化
    async def reinit(self, **kwargs):
Author	SHA1	Message	Date
涵曦	23d321a722	new version v0.1.84	2024-06-30 09:44:25 +00:00
涵曦	20945954b1	feat: config.json 支持更多配置选项	2024-06-30 09:43:51 +00:00
涵曦	d6c2078917	docs: 文档更新	2024-06-30 09:43:28 +00:00
涵曦	a5b8dc639c	feat: 新增 XIAOMUSIC_STOP_TTS_MSG 配置关机提示音	2024-06-30 07:32:33 +00:00
涵曦	84751e0d68	new version v0.1.83	2024-06-30 06:38:09 +00:00
涵曦	e759658481	bugfix: pip安装运行名字错误	2024-06-30 06:38:04 +00:00
涵曦	d83100588f	new version v0.1.82	2024-06-30 06:34:03 +00:00
涵曦	83d0e02eb4	feat: 优化指令匹配规则	2024-06-30 06:33:53 +00:00
涵曦	20f1f33b6c	update readme	2024-06-30 05:53:54 +00:00
涵曦	fbb5d26c28	new version v0.1.81	2024-06-30 05:42:26 +00:00
涵曦	2c21778675	update project	2024-06-30 05:40:08 +00:00
涵曦	959acd8fb7	优化关机提示	2024-06-30 05:27:44 +00:00
涵曦	148c5b7621	命令行新增LOGO	2024-06-30 05:19:38 +00:00
涵曦	d7a2afba48	Update README.md	2024-06-30 12:06:01 +08:00
涵曦	559ed23214	Update README.md	2024-06-30 12:05:10 +08:00
涵曦	1d1e63df8a	Update README.md	2024-06-30 12:04:29 +08:00
涵曦	27e9d92a0a	提交config.json模板文件	2024-06-30 03:54:39 +00:00
涵曦	69573f3fa4	new version v0.1.80	2024-06-30 01:07:29 +00:00
涵曦	edafd79140	fix: #91 修复下载歌曲报错	2024-06-30 01:07:25 +00:00
涵曦	7c45d93fea	new version v0.1.79	2024-06-29 15:37:38 +00:00
涵曦	f19a7e1080	优化关机的问题	2024-06-29 15:37:08 +00:00
涵曦	5e0ae07978	new version v0.1.78	2024-06-29 15:35:15 +00:00
涵曦	116a05ce4b	修复播放列表的问题	2024-06-29 15:35:15 +00:00
涵曦	d6fdee5905	Update README.md	2024-06-29 21:33:09 +08:00
涵曦	af25300917	new version v0.1.77	2024-06-29 13:24:37 +00:00
涵曦	f18b2f49bf	fix: #52 支持配置模糊匹配本地歌曲	2024-06-29 13:21:37 +00:00
涵曦	db1e4e6fc4	整理代码	2024-06-29 12:42:15 +00:00
涵曦	dc49f63a37	新增直接播放链接的接口	2024-06-29 12:41:29 +00:00
涵曦	6837841872	Update README.md	2024-06-29 09:32:41 +08:00
涵曦	637347ae0c	Update README.md	2024-06-29 09:18:26 +08:00
涵曦	ff968c4db4	Update README.md	2024-06-29 00:14:52 +08:00
涵曦	ca547e0d81	new version v0.1.76	2024-06-28 16:10:50 +00:00
涵曦	f0931c447b	下载日志链接改为按钮样式	2024-06-28 16:10:34 +00:00
涵曦	d098b5eb60	Update README.md	2024-06-28 23:45:18 +08:00
涵曦	09111e849d	Update README.md	2024-06-28 23:43:48 +08:00
涵曦	49a76dee60	Update README.md	2024-06-28 23:20:45 +08:00
涵曦	637672473e	Update README.md	2024-06-28 23:14:16 +08:00
涵曦	e4e1d13b69	Update README.md	2024-06-28 23:00:01 +08:00
涵曦	7736f8c5b4	Update README.md	2024-06-28 22:55:31 +08:00
涵曦	29db69b52f	Update README.md	2024-06-28 22:52:04 +08:00
涵曦	37fe51771b	Update README.md	2024-06-28 22:48:42 +08:00
涵曦	77ece713dc	new version v0.1.75	2024-06-28 14:46:51 +00:00
涵曦	4436cc3a15	新增ogg格式文件	2024-06-28 14:46:46 +00:00
涵曦	c875350112	new version v0.1.74	2024-06-28 14:34:36 +00:00
涵曦	d6df2f6bfe	支持在设置页面下载日志	2024-06-28 14:34:12 +00:00
涵曦	03e3312218	新增日志文件	2024-06-28 14:03:09 +00:00
涵曦	5d7451c3f2	new version v0.1.73	2024-06-28 10:14:12 +00:00
涵曦	551dfa0c7f	播放列表口令加到默认唤醒词里	2024-06-28 10:14:08 +00:00
涵曦	3cc35e8f97	Update README.md	2024-06-28 15:32:19 +08:00
涵曦	01c68ba64e	Create FUNDING.yml	2024-06-28 13:43:16 +08:00
涵曦	61d167d347	Update README.md	2024-06-28 12:18:18 +08:00
涵曦	9393e9f1ca	new version v0.1.72	2024-06-28 02:43:35 +00:00
涵曦	c08ef030e9	优化配置页面，只允许选did see #83	2024-06-28 02:41:56 +00:00
涵曦	bad13f01f4	优化获取播放时长的问题	2024-06-28 02:33:12 +00:00
涵曦	049e1a2c38	测试触屏版本不能播放的问题	2024-06-28 01:47:27 +00:00
涵曦	a9fb829563	new version v0.1.71	2024-06-28 00:57:31 +00:00
涵曦	e66f731301	fix: #83	2024-06-28 00:56:39 +00:00
涵曦	538ac1d485	优化获取播放时长的逻辑	2024-06-27 23:20:43 +00:00
涵曦	88fbc503e7	加点调试日志	2024-06-27 16:36:53 +00:00
涵曦	1dc3ccbc16	更新依赖库	2024-06-27 15:34:03 +00:00
涵曦	df007d8e1b	Update README.md	2024-06-27 23:15:53 +08:00
涵曦	0876551795	Update README.md	2024-06-27 23:09:40 +08:00
涵曦	51acb3ac8e	Update README.md	2024-06-27 23:06:34 +08:00
涵曦	786af1c79e	Update README.md	2024-06-27 22:46:10 +08:00
涵曦	7fba78e44b	Update README.md	2024-06-27 22:03:06 +08:00
涵曦	9434cf3216	Update README.md	2024-06-27 14:17:00 +08:00
涵曦	f71ab25407	new version v0.1.70	2024-06-27 05:38:12 +00:00
涵曦	a634813c21	update readme	2024-06-27 05:33:58 +00:00
涵曦	17279aaae0	新增XIAOMUSIC_USE_MUSIC_API=true时使用player_play_music接口，兼容部分不能播放的设备型号 see #30	2024-06-27 05:33:53 +00:00
涵曦	4a234e8829	优化m3u文件转换工具	2024-06-27 05:16:33 +00:00
涵曦	805b3c41c8	优化下载文件的逻辑	2024-06-27 05:07:34 +00:00
涵曦	7a154fd847	修复停止播放导致退出问题 see #80	2024-06-26 23:33:15 +00:00
涵曦	3cdc836e9e	播放本地歌曲口令也作为唤醒词 see #80	2024-06-26 17:41:38 +00:00
涵曦	d232627796	优化播放歌曲口令和关机口令，新增播放本地歌曲口令，且都支持自定义配置这三个口令 see #80	2024-06-26 17:34:23 +00:00
涵曦	579820e606	new version v0.1.69	2024-06-26 16:24:12 +00:00
涵曦	a24a5166f9	new version v0.1.68	2024-06-26 16:24:09 +00:00
涵曦	ad67894244	Update README.md	2024-06-27 00:23:22 +08:00