new version v0.1.91

为支持的设备增加产品名称和官方产品百科链接

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [hanxi]
+custom: ['https://afdian.net/a/imhanxi']

.gitignore

@@ -164,3 +164,4 @@ cython_debug/
 ffmpeg
 music
 test.sh
+conf

Dockerfile

@@ -1,4 +1,5 @@
 FROM python:3.10 AS builder
+ENV DEBIAN_FRONTEND=noninteractive
 WORKDIR /app
 COPY requirements.txt .
 RUN python3 -m venv .venv && .venv/bin/pip install --no-cache-dir -r requirements.txt
@@ -6,7 +7,6 @@ COPY install_dependencies.sh .
 RUN bash install_dependencies.sh
 
 FROM python:3.10-slim
-
 WORKDIR /app
 COPY --from=builder /app/.venv /app/.venv
 COPY --from=builder /app/ffmpeg /app/ffmpeg

README.md

@@ -1,6 +1,19 @@
 # xiaomusic
+[![GitHub License](https://img.shields.io/github/license/hanxi/xiaomusic)](https://github.com/hanxi/xiaomusic)
+[![Docker Image Version](https://img.shields.io/docker/v/hanxi/xiaomusic?sort=semver&label=docker%20image)](https://hub.docker.com/r/hanxi/xiaomusic)
+[![Docker Pulls](https://img.shields.io/docker/pulls/hanxi/xiaomusic)](https://hub.docker.com/r/hanxi/xiaomusic)
+[![PyPI - Version](https://img.shields.io/pypi/v/xiaomusic)](https://pypi.org/project/xiaomusic/)
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/xiaomusic)](https://pypi.org/project/xiaomusic/)
+[![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fhanxi%2Fxiaomusic%2Fmain%2Fpyproject.toml)](https://pypi.org/project/xiaomusic/)
+[![GitHub Release](https://img.shields.io/github/v/release/hanxi/xiaomusic)](https://github.com/hanxi/xiaomusic/releases)
 
-使用小爱/红米音箱播放音乐，音乐使用 yt-dlp 下载。
+
+
+使用小爱音箱播放音乐，音乐使用 yt-dlp 下载。
+
+<https://github.com/hanxi/xiaomusic>
+
+> 初次安装遇到问题请查阅 <https://github.com/hanxi/xiaomusic/issues/99> 上是否已经有解决办法。
 
 ## 最简配置运行
 
@@ -19,10 +32,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 下载依赖
@@ -49,29 +131,50 @@ pdm run xiaomusic.py
 - 下一首
 - 单曲循环
 - 全部循环
+- 随机播放
+- 关机
+- 停止播放
+- 刷新列表
+- 播放列表+列表名 比如：播放列表其他
 
 > 隐藏玩法: 对小爱同学说播放歌曲小猪佩奇的故事，会播放小猪佩奇的故事。
 
-## 已测试设备
+## 已测试支持的设备
+
+| 型号   | 名称                                                                                             |
+| ---- | ---------------------------------------------------------------------------------------------- |
+| L06A | [小爱音箱](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l06a)             |
+| L07A | [Redmi小爱音箱 Play](https://home.mi.com/webapp/content/baike/product/index.html?model=xiaomi.wifispeaker.l7a)                     |
+| S12/S12A | [小米AI音箱](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.s12)            |
+| LX5A | [小爱音箱 万能遥控版](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.lx5a)       |
+| LX05 | [小爱音箱Play（2019款）](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.lx05)  |
+| L16A | [Xiaomi Sound](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l16a)     |
+| L17A | [Xiaomi Sound Pro](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l17a) |
+| LX06 | [小爱音箱Pro](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.lx06)          |
+| LX01 | [小爱音箱mini](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.lx01)         |
+| L05B | [小爱音箱Play](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l05b)         |
+| L05C | [小米小爱音箱Play 增强版](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l05c)   |
+
+型号与产品名称对照可以在这里查询 <https://home.miot-spec.com/s/xiaomi.wifispeaker>
+
+> 如果你的设备支持播放，请反馈给我添加到支持列表里，谢谢。
+> 目前应该所有设备类型都已经支持播放，有问题随时反馈。
 
-```txt
-"L07A": ("5-1", "5-5"),  # Redmi小爱音箱Play(l7a)
-````
 ## 支持音乐格式
 
 - mp3
 - flac
+- wav
+- ape
+- ogg
 
-> 本地音乐会搜索 mp3 和 flac 格式的文件，下载的歌曲是 mp3 格式的。
-
-## 其他参数
-
-- XIAOMUSIC_ACTIVE_CMD 环境变量，配置成'play,random_play'，在非播放状态下，只有这两个指令（播放歌曲和随机播放）可以触发，触发后，xiaomusic进入playing状态，其他指令则可以正常触发。
+> 本地音乐会搜索目录下上面格式的文件，下载的歌曲是 mp3 格式的。
+> 已知 L05B L05C 不支持 flac 格式。
 
 ## 在 Docker 里使用
 
 ```shell
-docker run -e MI_USER=<your-xiaomi-account> \
+docker run -e MI_USER='your-xiaomi-account' \
     -e MI_PASS='your-xiaomi-password' \
     -e MI_DID='your-xiaomi-speaker-mid' \
     -e MI_HARDWARE='L07A' \
@@ -157,6 +260,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'
+```
+
 
 ## 简易的控制面板
 
@@ -164,11 +287,14 @@ services:
 
 - ip 是 XIAOMUSIC_HOSTNAME 设置的
 - 8090 是默认端口
-- 新功能
+- 支持功能
     - 显示正在播放的歌曲
     - 模糊搜索本地歌曲
+    - 播放列表
+    - 删除歌曲
     - 设置页面
-
+    - 配置网络歌单
+    - 日志文件下载
 
 采用新的设置页面之后，必须在启动前配置的环境变量只剩下:
 - MI_USER
@@ -181,11 +307,35 @@ services:
 - XIAOMUSIC_SEARCH
 - XIAOMUSIC_PROXY
 
+## 网络歌单功能
+
+可以配置一个 json 格式的歌单，支持电台和歌曲，也可以直接用别人分享的链接，同时配备了 m3u 文件格式转换工具，可以很方便的把 m3u 电台文件转换成网络歌单格式的 json 文件，具体用法见  <https://github.com/hanxi/xiaomusic/issues/78>
+
+> 欢迎有想法的朋友们制作更多的歌单转换工具。
+
+## 更多其他可选配置
+
+- 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_DISABLE_DOWNLOAD 设为 true 时关闭下载功能，见 <https://github.com/hanxi/xiaomusic/issues/82>
+- XIAOMUSIC_USE_MUSIC_API 设为 true 时使用 player_play_music 接口播放音乐，用于兼容不能播放的型号，v0.1.86 之后的版本可以不用设置。
+- 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)
 
 ## 感谢
 
@@ -197,7 +347,15 @@ services:
 - [NAS部署教程](https://post.m.smzdm.com/p/avpe7n99/)
 - [群晖部署教程](https://post.m.smzdm.com/p/a7px7dol/)
 - [QNAS部署教程](https://post.smzdm.com/p/a5xz5x63/)
+- 所有帮忙调试和测试的朋友
+- 所有反馈问题和建议的朋友
 
 ## Star History
 
 [![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 ⭐
+- 谢谢 ❤️

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": "关机,暂停,停止,停止播放"
+}

install_dependencies.sh

@@ -4,14 +4,47 @@
 # https://github.com/yt-dlp/yt-dlp#dependencies
 
 # 判断系统架构
-arch=$(arch)
+arch=$(uname -m)
 
-pkg=ffmpeg-master-latest-linuxarm64-gpl
-if [[ "${arch}" == "x86_64" ]]; then
-	pkg=ffmpeg-master-latest-linux64-gpl
-fi
+# 输出架构信息
+echo "当前系统架构是：$arch"
 
-#export ALL_PROXY=http://192.168.2.5:8080
-wget https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/$pkg.tar.xz
-tar -xvJf $pkg.tar.xz
-mv $pkg ffmpeg
+install_from_github() {
+	pkg=$1
+	wget https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/$pkg.tar.xz
+	tar -xvJf $pkg.tar.xz
+	mkdir -p ffmpeg/bin
+	mv $pkg/bin/ffmpeg ffmpeg/bin/
+	mv $pkg/bin/ffprobe ffmpeg/bin/
+}
+
+install_from_ffmpeg() {
+	pkg=$1
+	wget https://johnvansickle.com/ffmpeg/builds/$pkg.tar.xz
+	mkdir -p $pkg
+	tar -xvJf $pkg.tar.xz -C $pkg
+	mkdir -p ffmpeg/bin
+	mv $pkg/*/ffmpeg ffmpeg/bin/
+	mv $pkg/*/ffprobe ffmpeg/bin/
+}
+
+# 基于架构执行不同的操作
+case "$arch" in
+x86_64)
+	echo "64位 x86 架构"
+	install_from_github ffmpeg-master-latest-linux64-gpl
+	#install_from_ffmpeg ffmpeg-git-amd64-static
+	;;
+arm64 | aarch64)
+	echo "64位 ARM 架构"
+	install_from_github ffmpeg-master-latest-linuxarm64-gpl
+	#install_from_ffmpeg ffmpeg-git-arm64-static
+	;;
+armv7l)
+	echo "armv7l 架构"
+	install_from_ffmpeg ffmpeg-git-armhf-static
+	;;
+*)
+	echo "未知架构 $arch"
+	;;
+esac

pdm.lock

@@ -2,10 +2,10 @@
 # It is not intended for manual editing.
 
 [metadata]
-groups = ["default"]
+groups = ["default", "lint"]
 strategy = ["cross_platform"]
 lock_version = "4.4.1"
-content_hash = "sha256:d771311a452ca58665efe3b74af341cb202d75d83a250896c293ea9c696e5696"
+content_hash = "sha256:ac53cf6421de7aded8475907adc40a716a3e5c6429c614b93e5cfbddea36d048"
 
 [[package]]
 name = "aiohttp"
@@ -356,6 +356,18 @@ files = [
     {file = "flask-3.0.3.tar.gz", hash = "sha256:ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842"},
 ]
 
+[[package]]
+name = "flask-httpauth"
+version = "4.8.0"
+summary = "HTTP authentication for Flask routes"
+dependencies = [
+    "flask",
+]
+files = [
+    {file = "Flask-HTTPAuth-4.8.0.tar.gz", hash = "sha256:66568a05bc73942c65f1e2201ae746295816dc009edd84b482c44c758d75097a"},
+    {file = "Flask_HTTPAuth-4.8.0-py3-none-any.whl", hash = "sha256:a58fedd09989b9975448eef04806b096a3964a7feeebc0a78831ff55685b62b0"},
+]
+
 [[package]]
 name = "flask"
 version = "3.0.3"
@@ -507,7 +519,7 @@ files = [
 
 [[package]]
 name = "miservice-fork"
-version = "2.5.0"
+version = "2.6.1"
 requires_python = ">=3.8"
 summary = "XiaoMi Cloud Service fork from https://github.com/Yonsm/MiService"
 dependencies = [
@@ -516,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.1-py3-none-any.whl", hash = "sha256:9b2cc4208486bbbf788d1bde6e2cbc70f241ce10db4dca6f918076a2d2942a39"},
+    {file = "miservice_fork-2.6.1.tar.gz", hash = "sha256:1702281e1e9827958eb3e82bc3242cd013c018e9aa1de8509b4805b5ccf5e60c"},
 ]
 
 [[package]]
@@ -620,8 +632,8 @@ files = [
 
 [[package]]
 name = "requests"
-version = "2.31.0"
-requires_python = ">=3.7"
+version = "2.32.3"
+requires_python = ">=3.8"
 summary = "Python HTTP for Humans."
 dependencies = [
     "certifi>=2017.4.17",
@@ -630,8 +642,8 @@ dependencies = [
     "urllib3<3,>=1.21.1",
 ]
 files = [
-    {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
-    {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
+    {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"},
+    {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"},
 ]
 
 [[package]]
@@ -648,6 +660,32 @@ files = [
     {file = "rich-13.7.1.tar.gz", hash = "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"},
 ]
 
+[[package]]
+name = "ruff"
+version = "0.5.0"
+requires_python = ">=3.7"
+summary = "An extremely fast Python linter and code formatter, written in Rust."
+files = [
+    {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]]
 name = "typing-extensions"
 version = "4.9.0"
@@ -794,7 +832,7 @@ files = [
 
 [[package]]
 name = "yt-dlp"
-version = "2024.5.16.232713.dev0"
+version = "2024.7.1.232715.dev0"
 requires_python = ">=3.8"
 summary = "A feature-rich command-line audio/video downloader"
 dependencies = [
@@ -803,11 +841,11 @@ dependencies = [
     "certifi",
     "mutagen",
     "pycryptodomex",
-    "requests<3,>=2.31.0",
+    "requests<3,>=2.32.2",
     "urllib3<3,>=1.26.17",
     "websockets>=12.0",
 ]
 files = [
-    {file = "yt_dlp-2024.5.16.232713.dev0-py3-none-any.whl", hash = "sha256:42d3c27ab77583ff67ee2ddc94e376ea2a76a561ed8b1836ee04fd1cd23ad88c"},
-    {file = "yt_dlp-2024.5.16.232713.dev0.tar.gz", hash = "sha256:d431187fa703c9f52225080ae56471272679e44d9363f97b7b3187d37a5e6480"},
+    {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"},
 ]

pyproject.toml

@@ -1,26 +1,57 @@
 [project]
 name = "xiaomusic"
-version = "0.1.40"
+version = "0.1.91"
 description = "Play Music with xiaomi AI speaker"
 authors = [
     {name = "涵曦", email = "im.hanxi@gmail.com"},
 ]
 dependencies = [
-    "rich>=13.6.0",
-    "requests>=2.31.0",
     "aiohttp>=3.8.6",
     "miservice-fork>=2.5.0",
     "mutagen>=1.47.0",
-    "yt-dlp>=2024.04.09",
+    "yt-dlp>=2024.07.01",
     "flask[async]>=3.0.1",
     "waitress>=3.0.0",
+    "flask-HTTPAuth>=4.8.0",
 ]
 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"
 
 [tool.pdm]
+[tool.pdm.dev-dependencies]
+lint = [
+    "ruff>=0.4.8",
+]
+[tool.ruff]
+lint.select = [
+        "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
+]
+include = ["**/*.py", "**/*.pyi", "**/pyproject.toml"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.pdm.scripts]
+lint = "ruff check ."
+fmt = "ruff format ."

requirements.txt

@@ -223,6 +223,9 @@ colorama==0.4.6; platform_system == "Windows" \
 flask==3.0.3 \
     --hash=sha256:34e815dfaa43340d1d15a5c3a02b8476004037eb4840b34910c6e21679d288f3 \
     --hash=sha256:ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842
+flask-HTTPAuth==4.8.0 \
+    --hash=sha256:66568a05bc73942c65f1e2201ae746295816dc009edd84b482c44c758d75097a \
+    --hash=sha256:a58fedd09989b9975448eef04806b096a3964a7feeebc0a78831ff55685b62b0
 frozenlist==1.4.0 \
     --hash=sha256:008eb8b31b3ea6896da16c38c1b136cb9fec9e249e77f6211d479db79a4eaf01 \
     --hash=sha256:09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251 \
@@ -302,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.1 \
+    --hash=sha256:1702281e1e9827958eb3e82bc3242cd013c018e9aa1de8509b4805b5ccf5e60c \
+    --hash=sha256:9b2cc4208486bbbf788d1bde6e2cbc70f241ce10db4dca6f918076a2d2942a39
 multidict==6.0.4 \
     --hash=sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9 \
     --hash=sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8 \
@@ -368,9 +371,9 @@ pycryptodomex==3.19.0 \
 pygments==2.16.1 \
     --hash=sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692 \
     --hash=sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29
-requests==2.31.0 \
-    --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
-    --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
+requests==2.32.3 \
+    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
+    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
 rich==13.7.1 \
     --hash=sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222 \
     --hash=sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432
@@ -469,6 +472,6 @@ yarl==1.9.2 \
     --hash=sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9 \
     --hash=sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3 \
     --hash=sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560
-yt-dlp==2024.5.16.232713.dev0 \
-    --hash=sha256:42d3c27ab77583ff67ee2ddc94e376ea2a76a561ed8b1836ee04fd1cd23ad88c \
-    --hash=sha256:d431187fa703c9f52225080ae56471272679e44d9363f97b7b3187d37a5e6480
+yt-dlp==2024.7.1.232715.dev0 \
+    --hash=sha256:4f1ab25318c9156cca0b7308bdd2aeb3e7f01e8d9fb83916b4719010038170c8 \
+    --hash=sha256:e9ab443353da0c8f01587b031fb84b2cc42eae82aeaa03a9ce5ed6edc301b503

update-requirements.sh

@@ -1 +1 @@
-pdm export -o requirements.txt
+pdm export --prod -o requirements.txt

xiaomusic/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.40"
+__version__ = "0.1.91"

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()
@@ -27,20 +39,6 @@ def main():
         dest="cookie",
         help="xiaomi cookie",
     )
-    parser.add_argument(
-        "--use_command",
-        dest="use_command",
-        action="store_true",
-        default=None,
-        help="use command to tts",
-    )
-    parser.add_argument(
-        "--mute_xiaoai",
-        dest="mute_xiaoai",
-        action="store_true",
-        default=None,
-        help="try to mute xiaoai answer",
-    )
     parser.add_argument(
         "--verbose",
         dest="verbose",
@@ -59,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)
 

xiaomusic/config.py

@@ -3,45 +3,19 @@ from __future__ import annotations
 import argparse
 import json
 import os
-from dataclasses import dataclass, field
-from typing import Any, Iterable
+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}"
-HARDWARE_COMMAND_DICT = {
-    # hardware: (tts_command, wakeup_command, volume_command)
-    "LX06": ("5-1", "5-5", "2-1"),
-    "L05B": ("5-3", "5-4", "2-1"),    
-    "S12": ("5-1", "5-5", "2-1"),  # 第一代小爱，型号MDZ-25-DA
-    "S12A": ("5-1", "5-5", "2-1"),
-    "LX01": ("5-1", "5-5", "2-1"),
-    "L06A": ("5-1", "5-5", "2-1"),
-    "LX04": ("5-1", "5-4", "2-1"),
-    "L05C": ("5-3", "5-4", "2-1"),
-    "L17A": ("7-3", "7-4", "2-1"),
-    "X08E": ("7-3", "7-4", "2-1"),
-    "LX05A": ("5-1", "5-5", "2-1"),  # 小爱红外版
-    "LX5A": ("5-1", "5-5", "2-1"),  # 小爱红外版
-    "L07A": ("5-1", "5-5", "2-1"),  # Redmi小爱音箱Play(l7a)
-    "L15A": ("7-3", "7-4", "2-1"),
-    "X6A": ("7-3", "7-4", "2-1"),  # 小米智能家庭屏6
-    "X10A": ("7-3", "7-4", "2-1"),  # 小米智能家庭屏10
-    # add more here
-}
-
-DEFAULT_COMMAND = ("5-1", "5-5", "2-1")
-
-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",
@@ -54,28 +28,21 @@ KEY_WORD_ARG_BEFORE_DICT = {
     "分钟后关机": True,
 }
 
-# 匹配优先级
-KEY_MATCH_ORDER = [
+# 口令匹配优先级
+DEFAULT_KEY_MATCH_ORDER = [
     "set_volume#",
     "get_volume#",
     "分钟后关机",
     "播放歌曲",
-    "放歌曲",
     "下一首",
     "单曲循环",
     "全部循环",
     "随机播放",
     "关机",
-    "停止播放",
     "刷新列表",
     "播放列表",
 ]
 
-SUPPORT_MUSIC_TYPE = [
-    ".mp3",
-    ".flac",
-]
-
 
 @dataclass
 class Config:
@@ -83,11 +50,10 @@ class Config:
     account: str = os.getenv("MI_USER", "")
     password: str = os.getenv("MI_PASS", "")
     mi_did: str = os.getenv("MI_DID", "")
-    mute_xiaoai: bool = True
     cookie: str = ""
-    use_command: bool = False
-    verbose: bool = False
+    verbose: bool = os.getenv("XIAOMUSIC_VERBOSE", "").lower() == "true"
     music_path: str = os.getenv("XIAOMUSIC_MUSIC_PATH", "music")
+    conf_path: str = os.getenv("XIAOMUSIC_CONF_PATH", None)
     hostname: str = os.getenv("XIAOMUSIC_HOSTNAME", "192.168.2.5")
     port: int = int(os.getenv("XIAOMUSIC_PORT", "8090"))
     proxy: str | None = os.getenv("XIAOMUSIC_PROXY", None)
@@ -95,23 +61,60 @@ 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 = (
+        os.getenv("XIAOMUSIC_DISABLE_HTTPAUTH", "true").lower() == "true"
+    )
+    httpauth_username: str = os.getenv("XIAOMUSIC_HTTPAUTH_USERNAME", "admin")
+    httpauth_password: str = os.getenv("XIAOMUSIC_HTTPAUTH_PASSWORD", "admin")
+    music_list_url: str = os.getenv("XIAOMUSIC_MUSIC_LIST_URL", "")
+    music_list_json: str = os.getenv("XIAOMUSIC_MUSIC_LIST_JSON", "")
+    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"
+    )
+    use_music_audio_id: str = os.getenv("XIAOMUSIC_USE_MUSIC_AUDIO_ID", "1582971365183456177")
+    use_music_id: str = os.getenv("XIAOMUSIC_USE_MUSIC_ID", "355454500")
+    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")
 
-    @property
-    def tts_command(self) -> str:
-        return HARDWARE_COMMAND_DICT.get(self.hardware, DEFAULT_COMMAND)[0]
-
-    @property
-    def wakeup_command(self) -> str:
-        return HARDWARE_COMMAND_DICT.get(self.hardware, DEFAULT_COMMAND)[1]
-
-    @property
-    def volume_command(self) -> str:
-        return HARDWARE_COMMAND_DICT.get(self.hardware, DEFAULT_COMMAND)[2]
+        # 保存配置到 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:

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}"

xiaomusic/httpserver.py

@@ -1,27 +1,21 @@
 #!/usr/bin/env python3
 import os
-import sys
-import traceback
-import asyncio
-
-from flask import Flask, request, send_from_directory
-from waitress import serve
 from threading import Thread
 
-from xiaomusic.config import (
-    KEY_WORD_DICT,
-)
+from flask import Flask, request, send_file, send_from_directory
+from flask_httpauth import HTTPBasicAuth
+from waitress import serve
 
 from xiaomusic import (
     __version__,
 )
-
-# 隐藏 flask 启动告警
-# https://gist.github.com/jerblack/735b9953ba1ab6234abb43174210d356
-#from flask import cli
-#cli.show_server_banner = lambda *_: None
+from xiaomusic.utils import (
+    downloadfile,
+)
 
 app = Flask(__name__)
+auth = HTTPBasicAuth()
+
 host = "0.0.0.0"
 port = 8090
 static_path = "music"
@@ -29,9 +23,23 @@ xiaomusic = None
 log = None
 
 
+@auth.verify_password
+def verify_password(username, password):
+    if xiaomusic.config.disable_httpauth:
+        return True
+
+    if (
+        xiaomusic.config.httpauth_username == username
+        and xiaomusic.config.httpauth_password == password
+    ):
+        return username
+
+
 @app.route("/allcmds")
+@auth.login_required
 def allcmds():
-    return KEY_WORD_DICT
+    return xiaomusic.config.key_word_dict
+
 
 @app.route("/getversion", methods=["GET"])
 def getversion():
@@ -40,28 +48,42 @@ def getversion():
         "version": __version__,
     }
 
+
 @app.route("/getvolume", methods=["GET"])
+@auth.login_required
 def getvolume():
     volume = xiaomusic.get_volume_ret()
     return {
         "volume": volume,
     }
 
+
 @app.route("/searchmusic", methods=["GET"])
+@auth.login_required
 def searchmusic():
-    name = request.args.get('name')
+    name = request.args.get("name")
     return xiaomusic.searchmusic(name)
 
+
 @app.route("/playingmusic", methods=["GET"])
+@auth.login_required
 def playingmusic():
     return xiaomusic.playingmusic()
 
+
+@app.route("/isplaying", methods=["GET"])
+@auth.login_required
+def isplaying():
+    return xiaomusic.isplaying()
+
+
 @app.route("/", methods=["GET"])
-def redirect_to_index():
+def index():
     return send_from_directory("static", "index.html")
 
 
 @app.route("/cmd", methods=["POST"])
+@auth.login_required
 async def do_cmd():
     data = request.get_json()
     cmd = data.get("cmd")
@@ -71,10 +93,11 @@ async def do_cmd():
         return {"ret": "OK"}
     return {"ret": "Unknow cmd"}
 
+
 @app.route("/getsetting", methods=["GET"])
+@auth.login_required
 async def getsetting():
     config = xiaomusic.getconfig()
-    log.debug(config)
 
     alldevices = await xiaomusic.call_main_thread_function(xiaomusic.getalldevices)
     log.info(alldevices)
@@ -85,24 +108,84 @@ async def getsetting():
         "mi_hardware_list": alldevices["hardware_list"],
         "xiaomusic_search": config.search_prefix,
         "xiaomusic_proxy": config.proxy,
+        "xiaomusic_music_list_url": config.music_list_url,
+        "xiaomusic_music_list_json": config.music_list_json,
     }
     return data
 
+
 @app.route("/savesetting", methods=["POST"])
+@auth.login_required
 async def savesetting():
     data = request.get_json()
     log.info(data)
     await xiaomusic.saveconfig(data)
     return "save success"
 
+
 @app.route("/musiclist", methods=["GET"])
+@auth.login_required
 async def musiclist():
     return xiaomusic.get_music_list()
 
+
 @app.route("/curplaylist", methods=["GET"])
+@auth.login_required
 async def curplaylist():
     return xiaomusic.get_cur_play_list()
 
+
+@app.route("/delmusic", methods=["POST"])
+@auth.login_required
+def delmusic():
+    data = request.get_json()
+    log.info(data)
+    xiaomusic.del_music(data["name"])
+    return "success"
+
+
+@app.route("/downloadjson", methods=["POST"])
+@auth.login_required
+def downloadjson():
+    data = request.get_json()
+    log.info(data)
+    url = data["url"]
+    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,
+        "content": content,
+    }
+
+
+@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)
+
+
+@app.route("/debug_play_by_music_url", methods=["POST"])
+@auth.login_required
+async def debug_play_by_music_url():
+    data = request.get_json()
+    log.info(f"data:{data}")
+    return await xiaomusic.call_main_thread_function(
+        xiaomusic.debug_play_by_music_url, arg1=data
+    )
+
+
 def static_path_handler(filename):
     log.debug(filename)
     log.debug(static_path)
@@ -110,9 +193,11 @@ def static_path_handler(filename):
     log.debug(absolute_path)
     return send_from_directory(absolute_path, filename)
 
+
 def run_app():
     serve(app, host=host, port=port)
 
+
 def StartHTTPServer(_port, _static_path, _xiaomusic):
     global port, static_path, xiaomusic, log
     port = _port

xiaomusic/static/app.js

@@ -23,10 +23,12 @@ $(function(){
   // 拉取版本
   $.get("/getversion", function(data, status) {
     console.log(data, status, data["version"]);
-    $("#version").text(`(${data.version})`);
+    $("#version").text(`${data.version}`);
   });
 
   // 拉取播放列表
+  function refresh_music_list() {
+    $('#music_list').empty();
     $.get("/musiclist", function(data, status) {
       console.log(data, status);
       $.each(data, function(key, value) {
@@ -36,7 +38,8 @@ $(function(){
       $('#music_list').change(function() {
         const selectedValue = $(this).val();
         $('#music_name').empty();
-      $.each(data[selectedValue], function(index, item) {
+        const sorted_musics = data[selectedValue].sort(custom_sort_key);
+        $.each(sorted_musics, function(index, item) {
           $('#music_name').append($('<option></option>').val(item).text(item));
         });
       });
@@ -49,13 +52,42 @@ $(function(){
         $('#music_list').trigger('change');
       })
     })
+  }
+  refresh_music_list();
 
   $("#play_music_list").on("click", () => {
     var music_list = $("#music_list").val();
     var music_name = $("#music_name").val();
     let cmd = "播放列表" + music_list + "|" + music_name;
     sendcmd(cmd);
-  })
+  });
+
+  $("#del_music").on("click", () => {
+    var del_music_name = $("#music_name").val();
+    if (confirm(`确定删除歌曲 ${del_music_name} 吗？`)) {
+      console.log(`删除歌曲 ${del_music_name}`);
+      $.ajax({
+        type: 'POST',
+        url: '/delmusic',
+        data: JSON.stringify({"name": del_music_name}),
+        contentType: "application/json; charset=utf-8",
+        success: () => {
+          alert(`删除 ${del_music_name} 成功`);
+          refresh_music_list();
+        },
+        error: () => {
+          alert(`删除 ${del_music_name} 失败`);
+        }
+      });
+    }
+  });
+
+  $("#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);
@@ -92,11 +124,11 @@ $(function(){
     $.ajax({
       type: "POST",
       url: "/cmd",
-      contentType: "application/json",
+      contentType: "application/json; charset=utf-8",
       data: JSON.stringify({cmd: cmd}),
       success: () => {
         if (cmd == "刷新列表") {
-          location.reload();
+          setTimeout(refresh_music_list, 3000);
         }
       },
       error: () => {
@@ -139,4 +171,23 @@ $(function(){
   setInterval(() => {
     get_playing_music();
   }, 3000);
+
+  function custom_sort_key(a, b) {
+    // 使用正则表达式提取数字前缀
+    const numericPrefixA = a.match(/^(\d+)/) ? parseInt(a.match(/^(\d+)/)[1], 10) : null;
+    const numericPrefixB = b.match(/^(\d+)/) ? parseInt(b.match(/^(\d+)/)[1], 10) : null;
+
+    // 如果两个键都有数字前缀，则按数字大小排序
+    if (numericPrefixA !== null && numericPrefixB !== null) {
+      return numericPrefixA - numericPrefixB;
+    }
+
+    // 如果一个键有数字前缀而另一个没有，则有数字前缀的键排在前面
+    if (numericPrefixA !== null) return -1;
+    if (numericPrefixB !== null) return 1;
+
+    // 如果两个键都没有数字前缀，则按照常规字符串排序
+    return a.localeCompare(b);
+  }
+
 });

xiaomusic/static/debug.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width">
+    <title>Debug For XiaoMusic</title>
+
+    <link rel="stylesheet" type="text/css" href="/static/style.css">
+    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+    <script src="/static/jquery-3.7.1.min.js"></script>
+
+    <script>
+var vConsole = new window.VConsole();
+
+function postJSON() {
+  var data = $('#post-input').val();
+  $.ajax({
+    type: 'POST',
+    url: '/debug_play_by_music_url',
+    data: data,
+    contentType: "application/json; charset=utf-8",
+    success: (err) => {
+      console.log("succ", res);
+    },
+    error: (res) => {
+      console.log("error", res);
+    }
+  });
+}
+</script>
+  </head>
+  <body>
+    <h1>Debug For XiaoMusic</h1>
+    <textarea id="post-input" rows="10" cols="50" placeholder="粘贴json数据..."></textarea><br>
+    <button onclick="postJSON()">提交</button><br>
+  </body>
+  <footer>
+    <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
+  </footer>
+</html>

xiaomusic/static/index.html

@@ -8,7 +8,11 @@
     <link rel="stylesheet" type="text/css" href="/static/style.css">
   </head>
   <body>
-    <h2>小爱音箱操控面板<span id="version">(版本未知)</span></h2>
+    <h2>小爱音箱操控面板
+      (<a  id="version" href="https://github.com/hanxi/xiaomusic/releases">
+        版本未知
+      </a>)
+    </h2>
     <hr>
     <div id="cmds">
     </div>
@@ -18,7 +22,7 @@
         <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">
-        <svg fill="#8e43e7" height="64px" width="64px" 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>
+        <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>
     </div>
@@ -41,6 +45,13 @@
       <select id="music_name"></select>
     </div>
     <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>

xiaomusic/static/m3u.html

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <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">
+    <!--
+<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+<script>
+// VConsole 默认会挂载到 `window.VConsole` 上
+var vConsole = new window.VConsole();
+</script>
+-->
+    <script>
+function handleFileSelect(evt) {
+  var file = evt.target.files[0];
+  if (file) {
+    var reader = new FileReader();
+    reader.onload = function(e) {
+      document.getElementById('m3u-input').value = e.target.result;
+    };
+    reader.readAsText(file);
+  } else {
+    alert('无法加载文件');
+  }
+}
+
+function convertToJSON() {
+  var m3uContent = document.getElementById('m3u-input').value;
+  var lines = m3uContent.split('\n');
+  console.log(lines);
+  var musicsArray = [];
+  var currentName = '';
+  lines.forEach(function(line) {
+    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});
+      currentName = ''; // Reset the name for the next entry
+    }
+  });
+  var output = [{
+    "name": "m3u电台",
+    "musics": musicsArray
+  }];
+
+  document.getElementById('json-output').value = JSON.stringify(output, null, 2);
+}
+    </script>
+  </head>
+  <body>
+    <h1>M3U to JSON Converter</h1>
+    <input type="file" id="file-input" accept=".m3u" onchange="handleFileSelect(event)"/><br>
+    <textarea id="m3u-input" rows="10" cols="50" placeholder="粘贴m3u内容或上传文件..."></textarea><br>
+    <button onclick="convertToJSON()">转换</button><br>
+    <textarea id="json-output" rows="10" cols="50" placeholder="转换后的JSON..."></textarea>
+  </body>
+  <footer>
+    <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
+  </footer>
+</html>
+

xiaomusic/static/setting.html

@@ -8,13 +8,17 @@
     <link rel="stylesheet" type="text/css" href="/static/style.css">
   </head>
   <body>
-    <h2>小爱音箱设置面板<span id="version">(版本未知)</span></h2>
+    <h2>小爱音箱设置面板
+      (<a  id="version" href="https://github.com/hanxi/xiaomusic/releases">
+        版本未知
+      </a>)
+    </h2>
     <hr>
     <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>
@@ -22,10 +26,21 @@
       </select>
       <label for="xiaomusic_proxy">XIAOMUSIC_PROXY(ytsearch需要):</label>
       <input id="xiaomusic_proxy" type="text" placeholder="http://192.168.2.5:8080"></input>
+      <label for="xiaomusic_music_list_url">歌单地址:</label>
+      <input id="xiaomusic_music_list_url" type="text" value="https://gist.githubusercontent.com/hanxi/dda82d964a28f8110f8fba81c3ff8314/raw/example.json"></input>
+      <label for="xiaomusic_music_list_json">歌单内容:</label>
+      <textarea id="xiaomusic_music_list_json" type="text"></textarea>
     </div>
     <hr>
     <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>
+    <hr>
+    <a href="/static/debug.html" target="_blank">调试工具</a>
 
     <footer>
       <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>

xiaomusic/static/setting.js

@@ -2,36 +2,52 @@ $(function(){
   // 拉取版本
   $.get("/getversion", function(data, status) {
     console.log(data, status, data["version"]);
-    $("#version").text(`(${data.version})`);
+    $("#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);
@@ -40,6 +56,14 @@ $(function(){
     if (data.xiaomusic_proxy != "") {
       $("#xiaomusic_proxy").val(data.xiaomusic_proxy);
     }
+
+    if (data.xiaomusic_music_list_url != "") {
+      $("#xiaomusic_music_list_url").val(data.xiaomusic_music_list_url);
+    }
+
+    if (data.xiaomusic_music_list_json != "") {
+      $("#xiaomusic_music_list_json").val(data.xiaomusic_music_list_json);
+    }
   });
 
   $("#save").on("click", () => {
@@ -47,15 +71,21 @@ $(function(){
     var mi_hardware = $("#mi_hardware").val();
     var xiaomusic_search = $("#xiaomusic_search").val();
     var xiaomusic_proxy = $("#xiaomusic_proxy").val();
+    var xiaomusic_music_list_url = $("#xiaomusic_music_list_url").val();
+    var xiaomusic_music_list_json = $("#xiaomusic_music_list_json").val();
     console.log("mi_did", mi_did);
     console.log("mi_hardware", mi_hardware);
     console.log("xiaomusic_search", xiaomusic_search);
     console.log("xiaomusic_proxy", xiaomusic_proxy);
+    console.log("xiaomusic_music_list_url", xiaomusic_music_list_url);
+    console.log("xiaomusic_music_list_json", xiaomusic_music_list_json);
     var data = {
       mi_did: mi_did,
       mi_hardware: mi_hardware,
       xiaomusic_search: xiaomusic_search,
       xiaomusic_proxy: xiaomusic_proxy,
+      xiaomusic_music_list_url: xiaomusic_music_list_url,
+      xiaomusic_music_list_json: xiaomusic_music_list_json,
     };
     $.ajax({
       type: "POST",
@@ -70,4 +100,30 @@ $(function(){
       }
     });
   });
+
+  $("#get_music_list").on("click", () => {
+    var xiaomusic_music_list_url = $("#xiaomusic_music_list_url").val();
+    console.log("xiaomusic_music_list_url", xiaomusic_music_list_url);
+    var data = {
+      url: xiaomusic_music_list_url,
+    };
+    $.ajax({
+      type: "POST",
+      url: "/downloadjson",
+      contentType: "application/json",
+      data: JSON.stringify(data),
+      success: (res) => {
+        if (res.ret == "OK") {
+          $("#xiaomusic_music_list_json").val(res.content);
+        } else {
+          console.log(res);
+          alert(res.ret);
+        }
+      },
+      error: (res) => {
+        console.log(res);
+        alert(res);
+      }
+    });
+  });
 });

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);
@@ -67,3 +71,9 @@ footer {
   text-align: center;
   padding: 10px 0;
 }
+
+ textarea{
+  margin: 10px;
+  width: 300px;
+  height: 200px;
+}

xiaomusic/utils.py

@@ -1,16 +1,23 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
-import os
-import re
-import socket
-from http.cookies import SimpleCookie
-from typing import AsyncIterator
-from urllib.parse import urlparse
 import difflib
+import os
+import random
+import re
+import string
+import tempfile
+from collections.abc import AsyncIterator
+from http.cookies import SimpleCookie
+from urllib.parse import urlparse
 
+import aiohttp
+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):
@@ -62,6 +69,174 @@ def validate_proxy(proxy_str: str) -> bool:
 
     return True
 
+
 # 模糊搜索
 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
+
+
+# 歌曲排序
+def custom_sort_key(s):
+    # 使用正则表达式分别提取字符串的数字前缀和数字后缀
+    prefix_match = re.match(r"^(\d+)", s)
+    suffix_match = re.search(r"(\d+)$", s)
+
+    numeric_prefix = int(prefix_match.group(0)) if prefix_match else None
+    numeric_suffix = int(suffix_match.group(0)) if suffix_match else None
+
+    if numeric_prefix is not None:
+        # 如果前缀是数字，先按前缀数字排序，再按整个字符串排序
+        return (0, numeric_prefix, s)
+    elif numeric_suffix is not None:
+        # 如果后缀是数字，先按前缀字符排序，再按后缀数字排序
+        return (1, s[: suffix_match.start()], numeric_suffix)
+    else:
+        # 如果前缀和后缀都不是数字，按字典序排序
+        return (2, s)
+
+
+# fork from https://gist.github.com/dougthor42/001355248518bc64d2f8
+def walk_to_depth(root, depth=None, *args, **kwargs):
+    """
+    Wrapper around os.walk that stops after going down `depth` folders.
+    I had my own version, but it wasn't as efficient as
+    http://stackoverflow.com/a/234329/1354930, so I modified to be more
+    similar to nosklo's answer.
+    However, nosklo's answer doesn't work if topdown=False, so I kept my
+    version.
+    """
+    # Let people use this as a standard `os.walk` function.
+    if depth is None:
+        return os.walk(root, *args, **kwargs)
+
+    # remove any trailing separators so that our counts are correct.
+    root = root.rstrip(os.path.sep)
+
+    def main_func(root, depth, *args, **kwargs):
+        """Faster because it skips traversing dirs that are too deep."""
+        root_depth = root.count(os.path.sep)
+        for dirpath, dirnames, filenames in os.walk(root, *args, **kwargs):
+            yield (dirpath, dirnames, filenames)
+
+            # calculate how far down we are.
+            current_folder_depth = dirpath.count(os.path.sep)
+            if current_folder_depth >= root_depth + depth:
+                del dirnames[:]
+
+    def fallback_func(root, depth, *args, **kwargs):
+        """Slower, but works when topdown is False"""
+        root_depth = root.count(os.path.sep)
+        for dirpath, dirnames, filenames in os.walk(root, *args, **kwargs):
+            current_folder_depth = dirpath.count(os.path.sep)
+            if current_folder_depth <= root_depth + depth:
+                yield (dirpath, dirnames, filenames)
+
+    # there's gotta be a better way do do this...
+    try:
+        if args[0] is False:
+            yield from fallback_func(root, depth, *args, **kwargs)
+            return
+        else:
+            yield from main_func(root, depth, *args, **kwargs)
+            return
+    except IndexError:
+        pass
+
+    try:
+        if kwargs["topdown"] is False:
+            yield from fallback_func(root, depth, *args, **kwargs)
+            return
+        else:
+            yield from main_func(root, depth, *args, **kwargs)
+            return
+    except KeyError:
+        yield from main_func(root, depth, *args, **kwargs)
+        return
+
+
+def downloadfile(url):
+    # 清理和验证URL
+    # 解析URL
+    parsed_url = urlparse(url)
+
+    # 基础验证：仅允许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()
+
+    # 发起请求
+    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):
+    duration = 0
+    headers = {"Range": f"bytes={start}-{end}"}
+    async with session.get(url, headers=headers) as response:
+        array_buffer = await response.read()
+    with tempfile.NamedTemporaryFile(delete=False) as tmp:
+        tmp.write(array_buffer)
+        name = tmp.name
+
+    try:
+        m = mutagen.File(name)
+        duration = m.info.length
+    except Exception:
+        pass
+    os.remove(name)
+    return duration
+
+
+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:
+            duration = await _get_web_music_duration(session, url, start=0, end=500)
+            if duration <= 0:
+                duration = await _get_web_music_duration(
+                    session, url, start=0, end=1000
+                )
+    except Exception:
+        pass
+    return duration, url
+
+
+# 获取文件播放时长
+def get_local_music_duration(filename):
+    duration = 0
+    try:
+        m = mutagen.File(filename)
+        duration = m.info.length
+    except Exception:
+        pass
+    return duration
+
+
+def get_random(length):
+    return "".join(random.sample(string.ascii_letters + string.digits, length))