bump: version 0.3.39 → 0.3.40

* bug: sort results from keyword search

* Auto-format code 🧹🌟🤖

---------

Co-authored-by: Formatter [BOT] <runner@fv-az1538-928.upsp13a5k4ou3ds4kr34xzh2lh.cx.internal.cloudapp.net>

.github/workflows/fmt.yaml

@@ -0,0 +1,47 @@
+name: fmt
+
+on:
+  push:
+    branches:
+      - "*"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup PDM
+        uses: pdm-project/setup-pdm@v4
+      - name: install ruff
+        run: pip install ruff
+      - name: Format code
+        run: pdm fmt && pdm lint --fix
+
+      - name: Check for changes
+        id: check_changes
+        run: |
+          if [ -n "$(git diff)" ]; then
+            echo "changed=true" >> $GITHUB_OUTPUT
+          else
+            echo "changed=false" >> $GITHUB_OUTPUT
+          fi
+        continue-on-error: true
+  
+      # Optionally, customize the user name and commit message, and can add an email as well such as Github Actions' email
+      - name: Set up Git and Commit Changes
+        run: |
+          if [ "${{ steps.check_changes.outputs.changed }}" == "true" ]; then
+            git config --local user.name "Formatter [BOT]"
+            git add .
+            git commit -m "Auto-format code 🧹🌟🤖"
+            git push
+          fi

.github/workflows/release.yml

@@ -6,41 +6,36 @@ permissions:
 on:
   push:
     tags:
-      - "*"
+      - "v*"
   workflow_dispatch:
 
 jobs:
-  release-pypi:
-    name: Build and Release PyPI
+  pypi-publish:
+    name: upload release to PyPI
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: write
+      id-token: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-node@v4
         with:
-          python-version: "3.10"
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Build artifacts
-        run: |
-          pip install build
-          python -m build
-
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          registry-url: https://registry.npmjs.org/
+          node-version: lts/*
 
       - run: npx changelogithub
         continue-on-error: true
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
+      - uses: pdm-project/setup-pdm@v3
+
+      - name: Publish package distributions to PyPI
+        run: pdm publish
+
   build-image:
     runs-on: ubuntu-latest
     #needs: release-pypi

.gitignore

@@ -25,7 +25,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
-
+*_bak/
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -167,3 +167,5 @@ test.sh
 conf
 setting.json
 .DS_Store
+cache
+tmp/

CHANGELOG.md

@@ -1,3 +1,313 @@
+## v0.3.40 (2024-10-16)
+
+### Feat
+
+- 默认主题的播放列表上显示歌曲数量
+
+### Fix
+
+- 修复播放卡顿问题（谷歌统计地址无法访问的情况）
+
+## v0.3.39 (2024-10-15)
+
+### Feat
+
+- 固定的播放列表全部初始化
+- 生产环境与开发环境接口分离、关于页面增加返回到主页的链接
+update: 支持https页面未及时更新的问题
+
+### Fix
+
+- pure主题 当前设备与远程设备未正确区分的问题 (#234)
+- static和doc添加basic auth (#231)
+
+### Refactor
+
+- 修改默认UI播放提示词 (#233)
+
+## v0.3.38 (2024-10-14)
+
+### Feat
+
+- 播放状态接口返回当前播放列表 (#229)
+- 新增口令收藏歌曲用来收藏当前播放的歌曲
+- 默认UI搜索框动态显示 (#228)
+- 文件转换逻辑延迟到读取文件的时候 see #218
+- 重写播放组件，现在支持歌词显示了
+- 使用 /cmdstatus 接口来判断异步任务是否完成
+- 新增接口 /cmdstatus 用于查询异步任务是否执行完毕
+- XMusicPlayer播放器主题优化 (#216)
+- XMusicPlayer播放器主题 (#214)
+- 新增 yt-dlp cookies 文件参数支持
+- 新增批量下载歌曲工具
+- 新增后台网站图标
+- 加密音乐和图片访问链接 (#200)
+- 歌曲信息中的图片改为url #190
+- 新增更新提醒
+- 定时任务新增刷新播放列表接口
+- 后台设置名称优化
+- 新增按钮刷新 tag 信息
+- 新增 musicinfos 接口用于批量查询歌曲信息
+- 增加 tags 缓存 (#193)
+- 使用 opencc 将歌曲名转化为简体 (#192)
+- 搜索的歌曲存成列表供前端显示,实现额外索引 (#188)
+- 搜索多个结果，并更新“当前”播放列表 (#185)
+- musicinfo接口新增musictag参数，用于返回歌曲额外信息
+- 新增口令【播放列表第几个+列表名】来播放列表里的第几个 #158
+- 新增定时任务功能 #182
+- hostname can take protocol，域名支持 https 格式 (#181)
+
+### Fix
+
+- xplayer 收藏歌曲、取消收藏 (#230)
+- 修复型号M01获取对话记录时间戳的问题
+- 修复型号M01无法获取到对话记录的问题
+- 使用小爱设备播放时组件异常的问题 (#217)
+- 修复图片获取失败的问题
+- 修复 yt-dlp-cookies 报错
+- 修复自定义口令末尾多余逗号的情况
+- 修复windows下路径问题
+- 解决 L05C 无提示音问题 support MiIOService tts (#198)
+- 解决歌曲信息乱码问题
+- 修复搜索补全不生效的问题
+- 修复默认主题没有选中上次播放列表的问题
+- ffmpeg only output audio (#184)
+
+### Refactor
+
+- 新增清理缓存按钮
+- 优化默认UI的搜索框#226 (#227)
+- 修复告警
+- 体验优化，音乐列表缓存 (#222)
+- 修改为播放选中歌曲
+- 更新静态文件
+
+### Perf
+
+- 对歌曲信息中的图片缩小到300 #190
+
+## v0.3.37 (2024-09-20)
+
+### Feat
+
+- Pure主题更新 设置中心新增主题音乐列表样式选择、夜间模式、其他多项优化 (#180)
+
+## v0.3.36 (2024-09-19)
+
+### Feat
+
+- Pure 主题更新 (#178)
+- 支持配置获取对话记录间隔时间 #169
+- 允许在后台设置监听端口
+
+### Fix
+
+- 修复开启继续播放时歌曲播放不完整问题 (#177)
+
+## v0.3.35 (2024-09-18)
+
+### Feat
+
+- 允许跨域访问 #172
+
+### Fix
+
+- 修复 Pure 主题白屏无法打开的问题 (#176)
+
+## v0.3.34 (2024-09-18)
+
+### Feat
+
+- 新增 pure 主题 vue + elementUI (#172)
+
+### Fix
+
+- 主页适配移动端
+- 修复网页播放点击后没有关闭旧声音的问题 #166
+- 修复单曲循环的情况下歌曲不在当前播放列表时失效的情况
+
+### Refactor
+
+- 优化代码:输入框处理抖动问题，网页播放修改实现方式 see #166
+
+## v0.3.33 (2024-09-15)
+
+### Feat
+
+- 调整页面布局
+- 支持继续播放 (#171)
+
+### Fix
+
+- #168 安全优化: 设置数据接口密码隐藏处理
+- 修复谷歌统计报错问题
+
+### Refactor
+
+- 优化谷歌统计
+
+## v0.3.32 (2024-09-14)
+
+### Feat
+
+- 新增谷歌统计
+- 增加播放进度 (#160)
+
+### Fix
+
+- 优化audio_id查询方式 (#165)
+- 播放链接接口支持复杂的链接
+
+## v0.3.31 (2024-09-10)
+
+### Feat
+
+- 新增播放上一首歌曲功能 #90
+- 新增所有歌曲列表
+- 触屏版显示歌曲名称 (#156)
+
+### Fix
+
+- 修复插件示例报错 #105
+- 修复当前播放歌曲没保存的问题 #90
+
+## v0.3.30 (2024-09-07)
+
+### Feat
+
+- 修改设置按钮位置
+- 新增网页播放接口 #138
+
+## v0.3.29 (2024-09-06)
+
+### Feat
+
+- 设置页面新增接口文档入口
+
+### Fix
+
+- 修复网页开启秘密验证无法播歌的问题 #149
+
+## v0.3.28 (2024-09-03)
+
+### Feat
+
+- 新增歌曲收藏功能 #87
+
+### Fix
+
+- docker下minetypes无法判断m4a
+
+### Refactor
+
+- ffmpeg_location 从配置里读取
+
+## v0.3.27 (2024-09-02)
+
+### Feat
+
+- Add feature as requested in issue #143
+
+### Fix
+
+- 默认下载目录修改
+
+### Refactor
+
+- 处理 code review 问题'
+
+## v0.3.26 (2024-08-17)
+
+### Feat
+
+- 删除网关模式
+
+## v0.3.25 (2024-08-16)
+
+### Feat
+
+- 设置页面支持配置 use_music_api 选项
+
+## v0.3.24 (2024-08-01)
+
+### Fix
+
+- #131 修复多设备切换时播放模式显示错误问题
+
+## v0.3.23 (2024-08-01)
+
+### Fix
+
+- 修复部分文件获取不到播放时长问题
+- 处理安全问题
+
+## v0.3.22 (2024-08-01)
+
+### Feat
+
+- 网关模式支持配置，默认关闭
+
+### Fix
+
+- 继续优化延迟问题
+
+## v0.3.21 (2024-07-30)
+
+### Feat
+
+- 尝试加个网关在前面处理静态文件来加速文件获取
+
+### Fix
+
+- 使用前置网关处理静态文件来加速，尝试解决延迟的问题
+- 播放前先立即暂停之前的音乐
+
+## v0.3.20 (2024-07-30)
+
+### Fix
+
+- 尝试修复延迟问题，修复播放停止不了的问题
+
+## v0.3.19 (2024-07-30)
+
+### Fix
+
+- 调整配置，优化获取歌曲时长接口
+
+## v0.3.18 (2024-07-29)
+
+### Fix
+
+- #135 修复获取不到播放时长时只播放3秒的问题
+
+## v0.3.17 (2024-07-28)
+
+### Fix
+
+- 优化日志输出，尝试排查延迟播放的问题
+
+## v0.3.16 (2024-07-28)
+
+## v0.3.15 (2024-07-28)
+
+### Fix
+
+- 修复自定义口令重复的问题
+- 修复日志输出问题
+- 修复退出异常问题
+
+## v0.3.14 (2024-07-28)
+
+### Feat
+
+- 优化播放延迟问题，并新增配置下一首播放的延迟秒数
+
+## v0.3.13 (2024-07-24)
+
+### Fix
+
+- 解决 docker 镜像问题
+
 ## v0.3.12 (2024-07-24)
 
 ### Feat

Dockerfile

@@ -1,8 +1,13 @@
 FROM python:3.10 AS builder
 ENV DEBIAN_FRONTEND=noninteractive
+RUN pip install -U pdm
+ENV PDM_CHECK_UPDATE=false
 WORKDIR /app
-COPY requirements.txt .
-RUN python3 -m venv .venv && .venv/bin/pip install --upgrade pip && .venv/bin/pip install --no-cache-dir -r requirements.txt
+COPY pyproject.toml README.md .
+COPY xiaomusic/ ./xiaomusic/
+COPY plugins/ ./plugins/
+COPY xiaomusic.py .
+RUN pdm install --prod --no-editable
 COPY install_dependencies.sh .
 RUN bash install_dependencies.sh
 
@@ -13,7 +18,6 @@ COPY --from=builder /app/ffmpeg /app/ffmpeg
 COPY xiaomusic/ ./xiaomusic/
 COPY plugins/ ./plugins/
 COPY xiaomusic.py .
-ENV XDG_CONFIG_HOME=/config
 ENV XIAOMUSIC_HOSTNAME=192.168.2.5
 ENV XIAOMUSIC_PORT=8090
 VOLUME /app/conf

README.md

@@ -1,4 +1,4 @@
-# xiaomusic
+# 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)
@@ -13,11 +13,18 @@
 
 <https://github.com/hanxi/xiaomusic>
 
-> 初次安装遇到问题请查阅 <https://github.com/hanxi/xiaomusic/issues/99> 上是否已经有解决办法。
+> [!TIP]
+> 初次安装遇到问题请查阅 [💬 FAQ问题集合](https://github.com/hanxi/xiaomusic/issues/99) ，一般遇到的问题都已经有解决办法。
 
-## 最简配置运行
+## 👋 最简配置运行
 
-已经支持在 web 页面配置其他参数，docker compose 配置如下：
+已经支持在 web 页面配置其他参数，docker 启动命令如下:
+
+```bash
+docker run -p 8090:8090 -v /xiaomusic/music:/app/music -v /xiaomusic/conf:/app/conf hanxi/xiaomusic
+```
+
+对应的 docker compose 配置如下：
 
 ```yaml
 services:
@@ -28,24 +35,21 @@ services:
     ports:
       - 8090:8090
     volumes:
-      - ./music:/app/music
-      - ./conf:/app/conf
-```
-
-对应的 docker 启动命令如下:
-
-```yaml
-docker run -p 8090:8090 \
-    -v ./music:/app/music \
-    -v ./conf:/app/conf
-    hanxi/xiaomusic
+      - /xiaomusic/music:/app/music
+      - /xiaomusic/conf:/app/conf
 ```
 
 其中 conf 目录为配置文件存放目录，music 目录为音乐存放目录，建议分开配置为不同的目录。
 
-启动成功后，在 web 页面可以配置其他参数，带有 `*` 号的配置是必须要配置的，其他的用不上时不用修改。初次配置时需要在页面上输入小米账号和密码保存后才能获取到设备列表。
+> [!NOTE]
+> 上面配置的 /xiaomusic/music 和 /xiaomusic/conf 是 docker 主机里的 /xiaomusic 目录下的，可以修改为其他目录。如果报错找不到 /xiaomusic/music 目录，可以先执行 `mkdir -p /xiaomusic/{music,conf}` 命令新建目录。
 
-### ✨✨✨ 修改默认8090端口映射 ✨✨✨
+docker 和 docker compose 二选一即可，启动成功后，在 web 页面可以配置其他参数，带有 `*` 号的配置是必须要配置的，其他的用不上时不用修改。初次配置时需要在页面上输入小米账号和密码保存后才能获取到设备列表。
+
+> [!TIP]
+> 目前安装步骤已经是最简化了，如果还是嫌安装麻烦，可以微信或者 QQ 约我远程安装，我一般周末和晚上才有时间，收个辛苦费 :moneybag: 50 元一次，安装失败不收费。
+
+### 🔥 修改默认8090端口映射
 
 如果需要修改 8090 端口为其他端口，比如 5678，需要这样配，3个数字都需要是 5678 。见 <https://github.com/hanxi/xiaomusic/issues/19>
 
@@ -58,16 +62,43 @@ services:
     ports:
       - 5678:5678
     volumes:
-      - ./music:/app/music
+      - /xiaomusic/music:/app/music
+      - /xiaomusic/conf:/app/conf
     environment:
       XIAOMUSIC_PORT: 5678
 ```
 
+如果不是首次修改端口，还需要修改 /xiaomusic/conf/setting.json 文件里的端口(也可以在后台修改监听端口后重启)。
+
 遇到问题可以去 web 设置页面底部点击【下载日志文件】按钮，然后搜索一下日志文件内容确保里面没有账号密码信息后(有就删除这些敏感信息)，然后在提 issues 反馈问题时把下载的日志文件带上。
 
-> 目前除了 XIAOMUSIC_PORT 只能在启动前配置，其他参数都可以在 web 网页里配置。
+> [!IMPORTANT]
+> XIAOMUSIC_PORT 也可以在后台配置，对应的是监听端口。
 
-## pip 方式安装运行
+
+### 🤐 支持语音口令
+
+- 【播放歌曲】，播放本地的歌曲
+- 【播放歌曲+歌名】，比如：播放歌曲周杰伦晴天
+- 【上一首】
+- 【下一首】
+- 【单曲循环】
+- 【全部循环】
+- 【随机播放】
+- 【关机】，【停止播放】，两个效果是一样的。
+- 【刷新列表】，当复制了歌曲进 music 目录后，可以用这个口令刷新歌单。
+- 【播放列表+列表名】，比如：播放列表其他。
+- 【加入收藏】，把当前播放的歌曲加入收藏歌单。
+- 【取消收藏】，把当前播放的歌曲从收藏歌单里移除。
+- 【播放列表收藏】，这个用于播放收藏歌单。
+- 【播放本地歌曲+歌名】，这个口令和播放歌曲的区别是本地找不到也不会去下载。
+- 【播放列表第几个+列表名】，具体见： <https://github.com/hanxi/xiaomusic/issues/158>
+- 【播放歌曲+关键词】，会搜索关键词作为临时搜索列表播放，比如说【播放歌曲林俊杰】，会播放所有林俊杰的歌。
+
+> [!TIP]
+> 隐藏玩法: 对小爱同学说播放歌曲小猪佩奇的故事，会先下载小猪佩奇的故事，然后再播放小猪佩奇的故事。
+
+## 🛠️ pip 方式安装运行
 
 ```shell
 > pip install -U xiaomusic
@@ -77,7 +108,7 @@ services:
   \  /  | |  / _` |  / _ \  | |\/| | | | | | / __| | |  / __|
   /  \  | | | (_| | | (_) | | |  | | | |_| | \__ \ | | | (__
  /_/\_\ |_|  \__,_|  \___/  |_|  |_|  \__,_| |___/ |_|  \___|
-          XiaoMusic v0.1.92 by: github.com/hanxi
+          XiaoMusic v0.3.37 by: github.com/hanxi
 
 usage: xiaomusic [-h] [--port PORT] [--hardware HARDWARE] [--account ACCOUNT]
                  [--password PASSWORD] [--cookie COOKIE] [--verbose]
@@ -101,41 +132,35 @@ options:
 
 不修改默认端口 8090 的情况下，只需要执行 `xiaomusic` 即可启动。
 
-## 开发环境运行
+## 🔩 开发环境运行
 
 - 使用 install_dependencies.sh 下载依赖
 - 使用 pdm 安装环境
-- 参考 [xiaogpt](https://github.com/yihong0618/xiaogpt) 设置好环境变量
-
-```shell
-export MI_USER="xxxxx"
-export MI_PASS="xxxx"
-export MI_DID=00000
-export XIAOMUSIC_SEARCH='bilisearch:'
-```
-
-然后启动即可。默认监听了端口 8090 , 使用其他端口自行修改。
+- 默认监听了端口 8090 , 使用其他端口自行修改。
 
 ```shell
 pdm run xiaomusic.py
 ````
 
-如果是开发前端界面，可以通过 <http://localhost:8090/docs> 查看有什么接口。
+如果是开发前端界面，可以通过 <http://localhost:8090/docs>
+查看有什么接口。目前的 web 控制台非常简陋，欢迎有兴趣的朋友帮忙实现一个漂亮的前端，需要什么接口可以随时提需求。
 
-### 支持口令
+### 🚦 代码提交规范
 
-- **播放歌曲**
-- **播放歌曲**+歌名 比如：播放歌曲周杰伦晴天
-- 下一首
-- 单曲循环
-- 全部循环
-- 随机播放
-- 关机
-- 停止播放
-- 刷新列表
-- 播放列表+列表名 比如：播放列表其他
+提交前请执行
 
-> 隐藏玩法: 对小爱同学说播放歌曲小猪佩奇的故事，会播放小猪佩奇的故事。
+```
+pdm fmt
+pdm lint --fix
+```
+
+用于检查代码和格式化代码。
+
+### 本地编译 Docker Image
+
+```shell
+docker build -t xiaomusic .
+```
 
 ## 已测试支持的设备
 
@@ -146,21 +171,25 @@ pdm run xiaomusic.py
 | S12/S12A/MDZ-25-DA | [小米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)  |
+| L15A | [小米AI音箱（第二代）](https://home.mi.com/webapp/content/baike/product/index.html?model=xiaomi.wifispeaker.l15a#/) |
 | 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)   |
+| L09A | [小米音箱Art](https://home.mi.com/webapp/content/baike/product/index.html?model=xiaomi.wifispeaker.l09a) |
 | LX04 X10A X08A | 已经支持的触屏版 |
+| M01/XMYX01JY | 小米小爱音箱HD (获取对话记录的接口比较特殊) |
 
 型号与产品名称对照可以在这里查询 <https://home.miot-spec.com/s/xiaomi.wifispeaker>
 
+> [!NOTE]
 > 如果你的设备支持播放，请反馈给我添加到支持列表里，谢谢。
 > 目前应该所有设备类型都已经支持播放，有问题随时反馈。
-> 其他触屏版不能播放可以设置 XIAOMUSIC_USE_MUSIC_API 为 true 试试。
+> 其他触屏版不能播放可以设置【型号兼容模式】选项为 true 试试。见 <https://github.com/hanxi/xiaomusic/issues/30>
 
-## 支持音乐格式
+## 🎵 支持音乐格式
 
 - mp3
 - flac
@@ -169,120 +198,13 @@ pdm run xiaomusic.py
 - ogg
 - m4a
 
+> [!NOTE]
 > 本地音乐会搜索目录下上面格式的文件，下载的歌曲是 mp3 格式的。
-> 已知 L05B L05C 不支持 flac 格式。
-
-## 在 Docker 里使用
-
-```shell
-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' \
-    -e XIAOMUSIC_PROXY='proxy-for-yt-dlp' \
-    -e XIAOMUSIC_HOSTNAME=192.168.2.5 \
-    -e XIAOMUSIC_SEARCH='bilisearch:' \
-    -p 8090:8090 \
-    -v ./music:/app/music hanxi/xiaomusic
-```
-
-- XIAOMUSIC_SEARCH 可以配置为 'bilisearch:' 表示歌曲从哔哩哔哩下载;
-    - 配置为 'ytsearch:' 表示歌曲从 youtube 下载。
-- XIAOMUSIC_PROXY 用于配置代理，默认为空;
-    - 当 XIAOMUSIC_SEARCH 配置为 'ytsearch:' 时在国内需要用到。
-- MI_HARDWARE 是小米音箱的型号，默认为'L07A'
-- 注意端口必须映射为与容器内一致， XIAOMUSIC_HOSTNAME 需要设置为宿主机的 IP 地址，否则小爱无法正常播放。
-- 可以把 /app/music 目录映射到本地，用于保存下载的歌曲。
-
-XIAOMUSIC_PROXY 参数格式参考 yt-dlp 文档说明:
-```
-Use the specified HTTP/HTTPS/SOCKS proxy. To
-enable SOCKS proxy, specify a proper scheme,
-e.g. socks5://user:pass@127.0.0.1:1080/.
-Pass in an empty string (--proxy "") for
-direct connection
-```
-
-见 <https://github.com/hanxi/xiaomusic/issues/2> 和 <https://github.com/hanxi/xiaomusic/issues/11>
-
-### 本地编译Docker Image
-
-```shell
-docker build -t xiaomusic .
-```
-
-### docker compose 示例
-
-使用哔哩哔哩下载歌曲:
-
-```yaml
-version: '3'
-
-services:
-  xiaomusic:
-    image: hanxi/xiaomusic
-    container_name: xiaomusic
-    restart: unless-stopped
-    ports:
-      - 8090:8090
-    volumes:
-      - ./music:/app/music
-    environment:
-      MI_USER: '小米账号'
-      MI_PASS: '小米密码'
-      MI_DID: 00000
-      MI_HARDWARE: 'L07A'
-      XIAOMUSIC_SEARCH: 'bilisearch:'
-      XIAOMUSIC_HOSTNAME: '192.168.2.5'
-```
+> 已知 L05B L05C LX06 L16A 不支持 flac 格式。
+> 如果格式不能播放可以打开【转换为MP3】和【型号兼容模式】选项。具体见 <https://github.com/hanxi/xiaomusic/issues/153#issuecomment-2328168689>
 
 
-使用 youtobe 下载歌曲:
-
-```yaml
-version: '3'
-
-services:
-  xiaomusic:
-    image: hanxi/xiaomusic
-    container_name: xiaomusic
-    restart: unless-stopped
-    ports:
-      - 8090:8090
-    volumes:
-      - ./music:/app/music
-    environment:
-      MI_USER: '小米账号'
-      MI_PASS: '小米密码'
-      MI_DID: 00000
-      MI_HARDWARE: 'L07A'
-      XIAOMUSIC_SEARCH: 'ytsearch:'
-      XIAOMUSIC_PROXY: 'http://192.168.2.5:8080'
-      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'
-```
-
-
-## 简易的控制面板
+## 💡 简易的控制面板
 
 浏览器进入 <http://192.168.2.5:8090>
 
@@ -297,73 +219,92 @@ services:
     - 配置网络歌单
     - 日志文件下载
 
-采用新的设置页面之后，必须在启动前配置的环境变量只剩下:
-- MI_USER
-- MI_PASS
-- XIAOMUSIC_HOSTNAME
+采用新的设置页面之后，没有必须在启动前配置的环境变量了，除非是改默认的 8090 端口才需要配置环境变量。
 
-其他的这些可以在网页里配置:
-- MI_DID
-- MI_HARDWARE
-- XIAOMUSIC_SEARCH
-- XIAOMUSIC_PROXY
-
-## 网络歌单功能
+## 🌏 网络歌单功能
 
 可以配置一个 json 格式的歌单，支持电台和歌曲，也可以直接用别人分享的链接，同时配备了 m3u 文件格式转换工具，可以很方便的把 m3u 电台文件转换成网络歌单格式的 json 文件，具体用法见  <https://github.com/hanxi/xiaomusic/issues/78>
 
+> [!NOTE]
 > 欢迎有想法的朋友们制作更多的歌单转换工具。
 
-## 更多其他可选配置
+## 🍺 更多其他可选配置
 
-- 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 用来存放配置文件的目录，记得把目录映射到主机，默认为 `/app/config` ，具体见 <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 接口播放音乐，用于兼容不能播放的型号，如果发现需要设置这个选项的时候请告知我加一下设备型号，方便以后不用设置。 见 <https://github.com/hanxi/xiaomusic/issues/30>
-- 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>
-- XIAOMUSIC_PUBLIC_PORT 用于设置外网端口，当使用反向代理时可以设置为外网端口，XIAOMUSIC_HOSTNAME 设为外网IP或者域名即可。
-- XIAOMUSIC_DOWNLOAD_PATH 变量可以配置下载目录，默认为空，表示使用 music 目录为下载目录。设置这个目录必须是 music 的子目录，否则刷新列表后会找不到歌曲。具体见 <https://github.com/hanxi/xiaomusic/issues/98>
+- 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 用来存放配置文件的目录，对应后台的 【配置文件目录】，记得把目录映射到主机，默认为 `/app/config` ，具体见 <https://github.com/hanxi/xiaomusic/issues/74>
+- XIAOMUSIC_CACHE_DIR 用来音乐 tag 缓存，默认为 `/app/cache`，对应后台的 【缓存文件目录】。
+- XIAOMUSIC_DISABLE_DOWNLOAD 设为 true 时关闭下载功能，对应后台的 【关闭下载功能】，见 <https://github.com/hanxi/xiaomusic/issues/82>
+- XIAOMUSIC_USE_MUSIC_API 设为 true 时使用 player_play_music 接口播放音乐，对应后台的 【型号兼容模式】，用于兼容不能播放的型号，如果发现需要设置这个选项的时候请告知我加一下设备型号，方便以后不用设置。 见 <https://github.com/hanxi/xiaomusic/issues/30>
+- 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>
+- XIAOMUSIC_PUBLIC_PORT 用于设置外网端口，对应后台的 【外网访问端口】，当使用反向代理时可以设置为外网端口，XIAOMUSIC_HOSTNAME 设为外网IP或者域名即可。
+- XIAOMUSIC_DOWNLOAD_PATH 变量可以配置下载目录，默认为空，表示使用 music 目录为下载目录，对应后台的 【音乐下载目录】。设置这个目录必须是 music 的子目录，否则刷新列表后会找不到歌曲。具体见 <https://github.com/hanxi/xiaomusic/issues/98>
+- XIAOMUSIC_PROXY 用于配置国内使用 youtube 源下载歌曲时使用的代理，参数格式参考 yt-dlp 文档说明。 见 <https://github.com/hanxi/xiaomusic/issues/2> 和 <https://github.com/hanxi/xiaomusic/issues/11>
+- MIIO_TTS_CMD 用于部分机型（如：`L05C`）使用 MiIO 支持 tts 能力，默认为空，命令选择见 [MiService-fork 文档](https://github.com/yihong0618/MiService)
 
-## 高级篇
+### ⚠️ 安全提醒
+
+> [!IMPORTANT]
+> 如果配置了公网访问 xiaomusic ，请一定要开启密码登陆，并设置复杂的密码。且不要在公共场所的 WiFi 环境下使用，否则可能造成小米账号密码泄露。
+
+## 🤔 高级篇
 
 - 自定义口令功能 <https://github.com/hanxi/xiaomusic/issues/105>
 - [ ] 缺少一篇教程 [如何写自定义插件](https://github.com/hanxi/xiaomusic/issues/105)
 
-## 讨论区
+## 📢 讨论区
 
 - [点击链接加入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/86)
 
-## 感谢
+## ❤️ 感谢
 
 - [xiaomi](https://www.mi.com/)
 - [PDM](https://pdm.fming.dev/latest/)
 - [xiaogpt](https://github.com/yihong0618/xiaogpt)
 - [MiService](https://github.com/yihong0618/MiService)
+- [实现原理](https://github.com/yihong0618/gitblog/issues/258)
 - [yt-dlp](https://github.com/yt-dlp/yt-dlp)
-- [NAS部署教程](https://post.m.smzdm.com/p/avpe7n99/)
-- [群晖部署教程](https://post.m.smzdm.com/p/a7px7dol/)
-- [QNAS部署教程](https://post.smzdm.com/p/a5xz5x63/)
+- [awesome-xiaoai](https://github.com/zzz6519003/awesome-xiaoai)
+- [微信小程序: XIAO晓音](https://github.com/F-loat/xiaoplayer)
+- [pure 主题 xiaomusicUI](https://github.com/52fisher/xiaomusicUI)
+- [移动端的播放器主题](https://github.com/52fisher/XMusicPlayer)
 - 所有帮忙调试和测试的朋友
 - 所有反馈问题和建议的朋友
 
+### 👉 其他教程
+
+更多功能见 [📝 文档汇总](https://github.com/hanxi/xiaomusic/issues/211)
+
+## 🚨 免责声明
+
+本项目仅供学习和研究目的，不得用于任何商业活动。用户在使用本项目时应遵守所在地区的法律法规，对于违法使用所导致的后果，本项目及作者不承担任何责任。
+本项目可能存在未知的缺陷和风险（包括但不限于设备损坏和账号封禁等），使用者应自行承担使用本项目所产生的所有风险及责任。
+作者不保证本项目的准确性、完整性、及时性、可靠性，也不承担任何因使用本项目而产生的任何损失或损害责任。
+使用本项目即表示您已阅读并同意本免责声明的全部内容。
+
 ## 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 ⭐
-- 谢谢 ❤️
+- :moneybag: 爱发电 <https://afdian.com/a/imhanxi>
+- 点个 Star :star:
+- 谢谢 :heart:
+- ![喝杯奶茶](https://i.v2ex.co/7Q03axO5l.png)
+
+## License
+
+[MIT](https://github.com/hanxi/xiaomusic/blob/main/LICENSE) License © 2024 涵曦
+

config-example.json

@@ -2,11 +2,13 @@
   "account": "",
   "password": "",
   "mi_did": "",
+  "miio_tts_command": null,
   "cookie": "",
   "verbose": false,
   "music_path": "music",
   "download_path": "",
   "conf_path": null,
+  "tag_cache_dir": null,
   "hostname": "192.168.2.5",
   "port": 8090,
   "public_port": 0,
@@ -77,5 +79,6 @@
   },
   "enable_force_stop": false,
   "devices": {},
-  "group_list": ""
-}
+  "group_list": "",
+  "convert_to_mp3": false
+}

pdm.lock

@@ -5,7 +5,7 @@
 groups = ["default", "dev", "lint"]
 strategy = ["inherit_metadata"]
 lock_version = "4.5.0"
-content_hash = "sha256:662037dc1982f7f3592bd691dffc2ffd7b7d7f7b464fa74f716403a03e3a7725"
+content_hash = "sha256:c7b4db9b4f139c1e6f1f2bd499d57c8f2246688fc5a39d675627d23920dc4403"
 
 [[metadata.targets]]
 requires_python = "==3.10.12"
@@ -25,14 +25,27 @@ files = [
     {file = "aiofiles-24.1.0.tar.gz", hash = "sha256:22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c"},
 ]
 
+[[package]]
+name = "aiohappyeyeballs"
+version = "2.3.4"
+requires_python = "<4.0,>=3.8"
+summary = "Happy Eyeballs for asyncio"
+groups = ["default"]
+marker = "python_full_version == \"3.10.12\""
+files = [
+    {file = "aiohappyeyeballs-2.3.4-py3-none-any.whl", hash = "sha256:40a16ceffcf1fc9e142fd488123b2e218abc4188cf12ac20c67200e1579baa42"},
+    {file = "aiohappyeyeballs-2.3.4.tar.gz", hash = "sha256:7e1ae8399c320a8adec76f6c919ed5ceae6edd4c3672f4d9eae2b27e37c80ff6"},
+]
+
 [[package]]
 name = "aiohttp"
-version = "3.9.5"
+version = "3.10.0"
 requires_python = ">=3.8"
 summary = "Async http client/server framework (asyncio)"
 groups = ["default"]
 marker = "python_full_version == \"3.10.12\""
 dependencies = [
+    "aiohappyeyeballs>=2.3.0",
     "aiosignal>=1.1.2",
     "async-timeout<5.0,>=4.0; python_version < \"3.11\"",
     "attrs>=17.3.0",
@@ -41,8 +54,8 @@ dependencies = [
     "yarl<2.0,>=1.0",
 ]
 files = [
-    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c26959ca7b75ff768e2776d8055bf9582a6267e24556bb7f7bd29e677932be72"},
-    {file = "aiohttp-3.9.5.tar.gz", hash = "sha256:edea7d15772ceeb29db4aff55e482d4bcfb6ae160ce144f2682de02f6d693551"},
+    {file = "aiohttp-3.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06ef0135d7ab7fb0284342fbbf8e8ddf73b7fee8ecc55f5c3a3d0a6b765e6d8b"},
+    {file = "aiohttp-3.10.0.tar.gz", hash = "sha256:e8dd7da2609303e3574c95b0ec9f1fd49647ef29b94701a2862cceae76382e1d"},
 ]
 
 [[package]]
@@ -93,6 +106,24 @@ files = [
     {file = "anyio-4.4.0.tar.gz", hash = "sha256:5aadc6a1bbb7cdb0bede386cac5e2940f5e2ff3aa20277e991cf028e0585ce94"},
 ]
 
+[[package]]
+name = "apscheduler"
+version = "3.10.4"
+requires_python = ">=3.6"
+summary = "In-process task scheduler with Cron-like capabilities"
+groups = ["default"]
+marker = "python_full_version == \"3.10.12\""
+dependencies = [
+    "importlib-metadata>=3.6.0; python_version < \"3.8\"",
+    "pytz",
+    "six>=1.4.0",
+    "tzlocal!=3.*,>=2.0",
+]
+files = [
+    {file = "APScheduler-3.10.4-py3-none-any.whl", hash = "sha256:fb91e8a768632a4756a585f79ec834e0e27aad5860bac7eaa523d9ccefd87661"},
+    {file = "APScheduler-3.10.4.tar.gz", hash = "sha256:e6df071b27d9be898e486bc7940a7be50b4af2e9da7c08f0744a96d4bd4cef4a"},
+]
+
 [[package]]
 name = "argcomplete"
 version = "3.4.0"
@@ -451,6 +482,18 @@ files = [
     {file = "frozenlist-1.4.1.tar.gz", hash = "sha256:c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b"},
 ]
 
+[[package]]
+name = "ga4mp"
+version = "2.0.4"
+requires_python = ">=3.6,<4.0"
+summary = "Google Analytics 4 Measurement Protocol Python Module"
+groups = ["default"]
+marker = "python_full_version == \"3.10.12\""
+files = [
+    {file = "ga4mp-2.0.4-py3-none-any.whl", hash = "sha256:11e5072b33a93917bbfcf5b44ee48d21e45124ef18e2a0f1275e1529df340de8"},
+    {file = "ga4mp-2.0.4.tar.gz", hash = "sha256:2fdcf275e643c5c3ab2c3a03e82edc3551109f7e9175b3604aea8c8e015c15ad"},
+]
+
 [[package]]
 name = "h11"
 version = "0.14.0"
@@ -714,6 +757,17 @@ files = [
     {file = "mutagen-1.47.0.tar.gz", hash = "sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99"},
 ]
 
+[[package]]
+name = "opencc-python-reimplemented"
+version = "0.1.7"
+summary = "OpenCC made with Python"
+groups = ["default"]
+marker = "python_full_version == \"3.10.12\""
+files = [
+    {file = "opencc-python-reimplemented-0.1.7.tar.gz", hash = "sha256:4f777ea3461a25257a7b876112cfa90bb6acabc6dfb843bf4d11266e43579dee"},
+    {file = "opencc_python_reimplemented-0.1.7-py2.py3-none-any.whl", hash = "sha256:41b3b92943c7bed291f448e9c7fad4b577c8c2eae30fcfe5a74edf8818493aa6"},
+]
+
 [[package]]
 name = "packaging"
 version = "24.1"
@@ -726,6 +780,19 @@ files = [
     {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"},
 ]
 
+[[package]]
+name = "pillow"
+version = "10.4.0"
+requires_python = ">=3.8"
+summary = "Python Imaging Library (Fork)"
+groups = ["default"]
+marker = "python_full_version == \"3.10.12\""
+files = [
+    {file = "pillow-10.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4d49b85c4348ea0b31ea63bc75a9f3857869174e2bf17e7aba02945cd218e6f"},
+    {file = "pillow-10.4.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:a985e028fc183bf12a77a8bbf36318db4238a3ded7fa9df1b9a133f1cb79f8fc"},
+    {file = "pillow-10.4.0.tar.gz", hash = "sha256:166c1cd4d24309b30d61f79f4a9114b7b2313d7450912277855ff5dfd7cd4a06"},
+]
+
 [[package]]
 name = "prompt-toolkit"
 version = "3.0.36"
@@ -880,14 +947,25 @@ files = [
 
 [[package]]
 name = "python-multipart"
-version = "0.0.9"
+version = "0.0.12"
 requires_python = ">=3.8"
 summary = "A streaming multipart parser for Python"
 groups = ["default"]
 marker = "python_full_version == \"3.10.12\""
 files = [
-    {file = "python_multipart-0.0.9-py3-none-any.whl", hash = "sha256:97ca7b8ea7b05f977dc3849c3ba99d51689822fab725c3703af7c866a0c2b215"},
-    {file = "python_multipart-0.0.9.tar.gz", hash = "sha256:03f54688c663f1b7977105f021043b0793151e4cb1c1a9d4a11fc13d622c4026"},
+    {file = "python_multipart-0.0.12-py3-none-any.whl", hash = "sha256:43dcf96cf65888a9cd3423544dd0d75ac10f7aa0c3c28a175bbcd00c9ce1aebf"},
+    {file = "python_multipart-0.0.12.tar.gz", hash = "sha256:045e1f98d719c1ce085ed7f7e1ef9d8ccc8c02ba02b5566d5f7521410ced58cb"},
+]
+
+[[package]]
+name = "pytz"
+version = "2024.2"
+summary = "World timezone definitions, modern and historical"
+groups = ["default"]
+marker = "python_full_version == \"3.10.12\""
+files = [
+    {file = "pytz-2024.2-py2.py3-none-any.whl", hash = "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725"},
+    {file = "pytz-2024.2.tar.gz", hash = "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a"},
 ]
 
 [[package]]
@@ -976,14 +1054,14 @@ files = [
 
 [[package]]
 name = "ruff"
-version = "0.5.3"
+version = "0.5.5"
 requires_python = ">=3.7"
 summary = "An extremely fast Python linter and code formatter, written in Rust."
 groups = ["lint"]
 marker = "python_full_version == \"3.10.12\""
 files = [
-    {file = "ruff-0.5.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03bfe9ab5bdc0b08470c3b261643ad54ea86edc32b64d1e080892d7953add3ad"},
-    {file = "ruff-0.5.3.tar.gz", hash = "sha256:2a3eb4f1841771fa5b67a56be9c2d16fd3cc88e378bd86aaeaec2f7e6bcdd0a2"},
+    {file = "ruff-0.5.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3687d002f911e8a5faf977e619a034d159a8373514a587249cc00f211c67a091"},
+    {file = "ruff-0.5.5.tar.gz", hash = "sha256:cc5516bdb4858d972fbc31d246bdb390eab8df1a26e2353be2dbc0c2d7f5421a"},
 ]
 
 [[package]]
@@ -998,6 +1076,18 @@ files = [
     {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"},
 ]
 
+[[package]]
+name = "six"
+version = "1.16.0"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+summary = "Python 2 and 3 compatibility utilities"
+groups = ["default"]
+marker = "python_full_version == \"3.10.12\""
+files = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
+
 [[package]]
 name = "sniffio"
 version = "1.3.1"
@@ -1080,6 +1170,22 @@ files = [
     {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"},
 ]
 
+[[package]]
+name = "tzlocal"
+version = "5.2"
+requires_python = ">=3.8"
+summary = "tzinfo object for the local timezone"
+groups = ["default"]
+marker = "python_full_version == \"3.10.12\""
+dependencies = [
+    "backports-zoneinfo; python_version < \"3.9\"",
+    "tzdata; platform_system == \"Windows\"",
+]
+files = [
+    {file = "tzlocal-5.2-py3-none-any.whl", hash = "sha256:49816ef2fe65ea8ac19d19aa7a1ae0551c834303d5014c6d5a62e4cbda8047b8"},
+    {file = "tzlocal-5.2.tar.gz", hash = "sha256:8d399205578f1a9342816409cc1e46a93ebd5755e39ea2d85334bea911bf0e6e"},
+]
+
 [[package]]
 name = "urllib3"
 version = "2.2.2"
@@ -1094,7 +1200,7 @@ files = [
 
 [[package]]
 name = "uvicorn"
-version = "0.30.1"
+version = "0.30.4"
 requires_python = ">=3.8"
 summary = "The lightning-fast ASGI server."
 groups = ["default"]
@@ -1105,13 +1211,13 @@ dependencies = [
     "typing-extensions>=4.0; python_version < \"3.11\"",
 ]
 files = [
-    {file = "uvicorn-0.30.1-py3-none-any.whl", hash = "sha256:cd17daa7f3b9d7a24de3617820e634d0933b69eed8e33a516071174427238c81"},
-    {file = "uvicorn-0.30.1.tar.gz", hash = "sha256:d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8"},
+    {file = "uvicorn-0.30.4-py3-none-any.whl", hash = "sha256:06b00e3087e58c6865c284143c0c42f810b32ff4f265ab19d08c566f74a08728"},
+    {file = "uvicorn-0.30.4.tar.gz", hash = "sha256:00db9a9e3711a5fa59866e2b02fac69d8dc70ce0814aaec9a66d1d9e5c832a30"},
 ]
 
 [[package]]
 name = "uvicorn"
-version = "0.30.1"
+version = "0.30.4"
 extras = ["standard"]
 requires_python = ">=3.8"
 summary = "The lightning-fast ASGI server."
@@ -1122,14 +1228,14 @@ dependencies = [
     "httptools>=0.5.0",
     "python-dotenv>=0.13",
     "pyyaml>=5.1",
-    "uvicorn==0.30.1",
+    "uvicorn==0.30.4",
     "uvloop!=0.15.0,!=0.15.1,>=0.14.0; (sys_platform != \"cygwin\" and sys_platform != \"win32\") and platform_python_implementation != \"PyPy\"",
     "watchfiles>=0.13",
     "websockets>=10.4",
 ]
 files = [
-    {file = "uvicorn-0.30.1-py3-none-any.whl", hash = "sha256:cd17daa7f3b9d7a24de3617820e634d0933b69eed8e33a516071174427238c81"},
-    {file = "uvicorn-0.30.1.tar.gz", hash = "sha256:d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8"},
+    {file = "uvicorn-0.30.4-py3-none-any.whl", hash = "sha256:06b00e3087e58c6865c284143c0c42f810b32ff4f265ab19d08c566f74a08728"},
+    {file = "uvicorn-0.30.4.tar.gz", hash = "sha256:00db9a9e3711a5fa59866e2b02fac69d8dc70ce0814aaec9a66d1d9e5c832a30"},
 ]
 
 [[package]]
@@ -1345,7 +1451,7 @@ files = [
 
 [[package]]
 name = "yt-dlp"
-version = "2024.7.16"
+version = "2024.8.1"
 requires_python = ">=3.8"
 summary = "A feature-rich command-line audio/video downloader"
 groups = ["default"]
@@ -1361,6 +1467,6 @@ dependencies = [
     "websockets>=12.0",
 ]
 files = [
-    {file = "yt_dlp-2024.7.16-py3-none-any.whl", hash = "sha256:424805a112e757b141e767bc938d49db56d13d6415a92fa4cd8acadd55790be0"},
-    {file = "yt_dlp-2024.7.16.tar.gz", hash = "sha256:c5bd517a49dea1923ec8e14f51858f10fd89dfece14cb701392b480b41b2f516"},
+    {file = "yt_dlp-2024.8.1-py3-none-any.whl", hash = "sha256:d0d927038e30a05f6eab26ff6189628456ea21bb159a3d9dc2e855eef2810eac"},
+    {file = "yt_dlp-2024.8.1.tar.gz", hash = "sha256:4318aa523694611562f01419c8d526b662a72df34ef8ba454016b34c8366c158"},
 ]

plugins/code1.py

@@ -1,4 +1,5 @@
 async def code1(arg1):
     global log, xiaomusic
     log.info(f"code1:{arg1}")
-    await xiaomusic.do_tts("你好，我是自定义的测试口令")
+    did = xiaomusic._cur_did
+    await xiaomusic.do_tts(did, "你好，我是自定义的测试口令")

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xiaomusic"
-version = "0.3.12"
+version = "0.3.40"
 description = "Play Music with xiaomi AI speaker"
 authors = [
 {name = "涵曦", email = "im.hanxi@gmail.com"},
@@ -14,8 +14,13 @@ dependencies = [
     "fastapi>=0.111.0",
     "starlette>=0.37.2",
     "aiofiles>=24.1.0",
+    "ga4mp>=2.0.4",
+    "apscheduler>=3.10.4",
+    "opencc-python-reimplemented==0.1.7",
+    "pillow>=10.4.0",
+    "python-multipart>=0.0.12",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.12"
 readme = "README.md"
 license = {text = "MIT"}
 
@@ -57,11 +62,18 @@ include = ["**/*.py", "**/*.pyi", "**/pyproject.toml"]
 convention = "google"
 
 [tool.ruff.lint.flake8-bugbear]
-extend-immutable-calls = ["fastapi.Depends", "fastapi.params.Depends", "fastapi.Query", "fastapi.params.Query"]
+extend-immutable-calls = [
+    "fastapi.Depends",
+    "fastapi.params.Depends",
+    "fastapi.Query",
+    "fastapi.params.Query",
+    "fastapi.File"
+]
 
 [tool.pdm.scripts]
 lint = "ruff check ."
 fmt = "ruff format ."
+lintfmt = {composite = ["ruff check --fix .", "ruff format ."]}
 
 [tool.commitizen]
 name = "cz_conventional_commits"

requirements.txt

@@ -1,606 +0,0 @@
-# This file is @generated by PDM.
-# Please do not edit it manually.
-
-aiofiles==24.1.0; python_full_version == "3.10.12" \
-    --hash=sha256:22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c \
-    --hash=sha256:b4ec55f4195e3eb5d7abd1bf7e061763e864dd4954231fb8539a0ef8bb8260e5
-aiohttp==3.9.5; python_full_version == "3.10.12" \
-    --hash=sha256:c26959ca7b75ff768e2776d8055bf9582a6267e24556bb7f7bd29e677932be72 \
-    --hash=sha256:edea7d15772ceeb29db4aff55e482d4bcfb6ae160ce144f2682de02f6d693551
-aiosignal==1.3.1; python_full_version == "3.10.12" \
-    --hash=sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc \
-    --hash=sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17
-annotated-types==0.7.0; python_full_version == "3.10.12" \
-    --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
-    --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
-anyio==4.4.0; python_full_version == "3.10.12" \
-    --hash=sha256:5aadc6a1bbb7cdb0bede386cac5e2940f5e2ff3aa20277e991cf028e0585ce94 \
-    --hash=sha256:c1b2d8f46a8a812513012e1107cb0e68c17159a7a594208005a57dc776e1bdc7
-async-timeout==4.0.3; python_full_version == "3.10.12" \
-    --hash=sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f \
-    --hash=sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028
-attrs==23.2.0; python_full_version == "3.10.12" \
-    --hash=sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 \
-    --hash=sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1
-brotli==1.1.0; implementation_name == "cpython" and python_full_version == "3.10.12" \
-    --hash=sha256:0c6244521dda65ea562d5a69b9a26120769b7a9fb3db2fe9545935ed6735b128 \
-    --hash=sha256:19c116e796420b0cee3da1ccec3b764ed2952ccfcc298b55a10e5610ad7885f9 \
-    --hash=sha256:1ae56aca0402a0f9a3431cddda62ad71666ca9d4dc3a10a142b9dce2e3c0cda3 \
-    --hash=sha256:30924eb4c57903d5a7526b08ef4a584acc22ab1ffa085faceb521521d2de32dd \
-    --hash=sha256:316cc9b17edf613ac76b1f1f305d2a748f1b976b033b049a6ecdfd5612c70409 \
-    --hash=sha256:38025d9f30cf4634f8309c6874ef871b841eb3c347e90b0851f63d1ded5212da \
-    --hash=sha256:39da8adedf6942d76dc3e46653e52df937a3c4d6d18fdc94a7c29d263b1f5b50 \
-    --hash=sha256:4093c631e96fdd49e0377a9c167bfd75b6d0bad2ace734c6eb20b348bc3ea180 \
-    --hash=sha256:43ce1b9935bfa1ede40028054d7f48b5469cd02733a365eec8a329ffd342915d \
-    --hash=sha256:4ed11165dd45ce798d99a136808a794a748d5dc38511303239d4e2363c0695dc \
-    --hash=sha256:510b5b1bfbe20e1a7b3baf5fed9e9451873559a976c1a78eebaa3b86c57b4265 \
-    --hash=sha256:524f35912131cc2cabb00edfd8d573b07f2d9f21fa824bd3fb19725a9cf06327 \
-    --hash=sha256:5b3cc074004d968722f51e550b41a27be656ec48f8afaeeb45ebf65b561481dd \
-    --hash=sha256:5f4d5ea15c9382135076d2fb28dde923352fe02951e66935a9efaac8f10e81b0 \
-    --hash=sha256:6c3020404e0b5eefd7c9485ccf8393cfb75ec38ce75586e046573c9dc29967a0 \
-    --hash=sha256:70051525001750221daa10907c77830bc889cb6d865cc0b813d9db7fefc21451 \
-    --hash=sha256:7c4855522edb2e6ae7fdb58e07c3ba9111e7621a8956f481c68d5d979c93032e \
-    --hash=sha256:7e4c4629ddad63006efa0ef968c8e4751c5868ff0b1c5c40f76524e894c50248 \
-    --hash=sha256:7f4bf76817c14aa98cc6697ac02f3972cb8c3da93e9ef16b9c66573a68014f91 \
-    --hash=sha256:81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724 \
-    --hash=sha256:861bf317735688269936f755fa136a99d1ed526883859f86e41a5d43c61d8966 \
-    --hash=sha256:906bc3a79de8c4ae5b86d3d75a8b77e44404b0f4261714306e3ad248d8ab0951 \
-    --hash=sha256:a1fd8a29719ccce974d523580987b7f8229aeace506952fa9ce1d53a033873c8 \
-    --hash=sha256:a37b8f0391212d29b3a91a799c8e4a2855e0576911cdfb2515487e30e322253d \
-    --hash=sha256:a3daabb76a78f829cafc365531c972016e4aa8d5b4bf60660ad8ecee19df7ccc \
-    --hash=sha256:a469274ad18dc0e4d316eefa616d1d0c2ff9da369af19fa6f3daa4f09671fd61 \
-    --hash=sha256:aac0411d20e345dc0920bdec5548e438e999ff68d77564d5e9463a7ca9d3e7b1 \
-    --hash=sha256:be36e3d172dc816333f33520154d708a2657ea63762ec16b62ece02ab5e4daf2 \
-    --hash=sha256:c8146669223164fc87a7e3de9f81e9423c67a79d6b3447994dfb9c95da16e2d6 \
-    --hash=sha256:c8fd5270e906eef71d4a8d19b7c6a43760c6abcfcc10c9101d14eb2357418de9 \
-    --hash=sha256:caf9ee9a5775f3111642d33b86237b05808dafcd6268faa492250e9b78046eb2 \
-    --hash=sha256:ceb64bbc6eac5a140ca649003756940f8d6a7c444a68af170b3187623b43bebf \
-    --hash=sha256:d0c5516f0aed654134a2fc936325cc2e642f8a0e096d075209672eb321cff408 \
-    --hash=sha256:e1140c64812cb9b06c922e77f1c26a75ec5e3f0fb2bf92cc8c58720dec276752 \
-    --hash=sha256:e6a904cb26bfefc2f0a6f240bdf5233be78cd2488900a2f846f3c3ac8489ab80 \
-    --hash=sha256:e84799f09591700a4154154cab9787452925578841a94321d5ee8fb9a9a328f0 \
-    --hash=sha256:f66b5337fa213f1da0d9000bc8dc0cb5b896b726eefd9c6046f699b169c41b9e
-certifi==2024.7.4; python_full_version == "3.10.12" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
-charset-normalizer==3.3.2; python_full_version == "3.10.12" \
-    --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
-    --hash=sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8 \
-    --hash=sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09 \
-    --hash=sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574 \
-    --hash=sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e \
-    --hash=sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3 \
-    --hash=sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f \
-    --hash=sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73 \
-    --hash=sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc \
-    --hash=sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc \
-    --hash=sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce \
-    --hash=sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e \
-    --hash=sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6 \
-    --hash=sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269 \
-    --hash=sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96 \
-    --hash=sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4 \
-    --hash=sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77 \
-    --hash=sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d \
-    --hash=sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed \
-    --hash=sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068 \
-    --hash=sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 \
-    --hash=sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab \
-    --hash=sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26 \
-    --hash=sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db \
-    --hash=sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f \
-    --hash=sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5 \
-    --hash=sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d \
-    --hash=sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa \
-    --hash=sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a \
-    --hash=sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03 \
-    --hash=sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b \
-    --hash=sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001 \
-    --hash=sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389 \
-    --hash=sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537 \
-    --hash=sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143 \
-    --hash=sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c \
-    --hash=sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6 \
-    --hash=sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7 \
-    --hash=sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b \
-    --hash=sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae \
-    --hash=sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12 \
-    --hash=sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae \
-    --hash=sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887 \
-    --hash=sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4 \
-    --hash=sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f \
-    --hash=sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5 \
-    --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519
-click==8.1.7; python_full_version == "3.10.12" \
-    --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
-    --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
-dnspython==2.6.1; python_full_version == "3.10.12" \
-    --hash=sha256:5ef3b9680161f6fa89daf8ad451b5f1a33b18ae8a1c6778cdf4b43f08c0a6e50 \
-    --hash=sha256:e8f0f9c23a7b7cb99ded64e6c3a6f3e701d78f50c55e002b839dea7225cff7cc
-email-validator==2.2.0; python_full_version == "3.10.12" \
-    --hash=sha256:561977c2d73ce3611850a06fa56b414621e0c8faa9d66f2611407d87465da631 \
-    --hash=sha256:cb690f344c617a714f22e66ae771445a1ceb46821152df8e165c5f9a364582b7
-exceptiongroup==1.2.2; python_full_version == "3.10.12" \
-    --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
-    --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
-fastapi==0.111.1; python_full_version == "3.10.12" \
-    --hash=sha256:4f51cfa25d72f9fbc3280832e84b32494cf186f50158d364a8765aabf22587bf \
-    --hash=sha256:ddd1ac34cb1f76c2e2d7f8545a4bcb5463bce4834e81abf0b189e0c359ab2413
-fastapi-cli==0.0.4; python_full_version == "3.10.12" \
-    --hash=sha256:a2552f3a7ae64058cdbb530be6fa6dbfc975dc165e4fa66d224c3d396e25e809 \
-    --hash=sha256:e2e9ffaffc1f7767f488d6da34b6f5a377751c996f397902eb6abb99a67bde32
-frozenlist==1.4.1; python_full_version == "3.10.12" \
-    --hash=sha256:04ced3e6a46b4cfffe20f9ae482818e34eba9b5fb0ce4056e4cc9b6e212d09b7 \
-    --hash=sha256:0633c8d5337cb5c77acbccc6357ac49a1770b8c487e5b3505c57b949b4b82e98 \
-    --hash=sha256:068b63f23b17df8569b7fdca5517edef76171cf3897eb68beb01341131fbd2ad \
-    --hash=sha256:1979bc0aeb89b33b588c51c54ab0161791149f2461ea7c7c946d95d5f93b56ae \
-    --hash=sha256:1a4471094e146b6790f61b98616ab8e44f72661879cc63fa1049d13ef711e71e \
-    --hash=sha256:1b280e6507ea8a4fa0c0a7150b4e526a8d113989e28eaaef946cc77ffd7efc0a \
-    --hash=sha256:23b701e65c7b36e4bf15546a89279bd4d8675faabc287d06bbcfac7d3c33e1e6 \
-    --hash=sha256:2471c201b70d58a0f0c1f91261542a03d9a5e088ed3dc6c160d614c01649c106 \
-    --hash=sha256:27657df69e8801be6c3638054e202a135c7f299267f1a55ed3a598934f6c0d75 \
-    --hash=sha256:29acab3f66f0f24674b7dc4736477bcd4bc3ad4b896f5f45379a67bce8b96868 \
-    --hash=sha256:3e0153a805a98f5ada7e09826255ba99fb4f7524bb81bf6b47fb702666484ae1 \
-    --hash=sha256:442acde1e068288a4ba7acfe05f5f343e19fac87bfc96d89eb886b0363e977ec \
-    --hash=sha256:4f57dab5fe3407b6c0c1cc907ac98e8a189f9e418f3b6e54d65a718aaafe3950 \
-    --hash=sha256:4f9c515e7914626b2a2e1e311794b4c35720a0be87af52b79ff8e1429fc25f19 \
-    --hash=sha256:5667ed53d68d91920defdf4035d1cdaa3c3121dc0b113255124bcfada1cfa1b8 \
-    --hash=sha256:590344787a90ae57d62511dd7c736ed56b428f04cd8c161fcc5e7232c130c69a \
-    --hash=sha256:5c3894db91f5a489fc8fa6a9991820f368f0b3cbdb9cd8849547ccfab3392d86 \
-    --hash=sha256:5c849d495bf5154cd8da18a9eb15db127d4dba2968d88831aff6f0331ea9bd4c \
-    --hash=sha256:64536573d0a2cb6e625cf309984e2d873979709f2cf22839bf2d61790b448ad5 \
-    --hash=sha256:722e1124aec435320ae01ee3ac7bec11a5d47f25d0ed6328f2273d287bc3abb0 \
-    --hash=sha256:74fb4bee6880b529a0c6560885fce4dc95936920f9f20f53d99a213f7bf66776 \
-    --hash=sha256:780d3a35680ced9ce682fbcf4cb9c2bad3136eeff760ab33707b71db84664e3a \
-    --hash=sha256:8aefbba5f69d42246543407ed2461db31006b0f76c4e32dfd6f42215a2c41d09 \
-    --hash=sha256:9750cc7fe1ae3b1611bb8cfc3f9ec11d532244235d75901fb6b8e42ce9229dfe \
-    --hash=sha256:9acbb16f06fe7f52f441bb6f413ebae6c37baa6ef9edd49cdd567216da8600cd \
-    --hash=sha256:a0cb6f11204443f27a1628b0e460f37fb30f624be6051d490fa7d7e26d4af3d0 \
-    --hash=sha256:a828c57f00f729620a442881cc60e57cfcec6842ba38e1b19fd3e47ac0ff8dc1 \
-    --hash=sha256:a9b2de4cf0cdd5bd2dee4c4f63a653c61d2408055ab77b151c1957f221cabf2a \
-    --hash=sha256:b46c8ae3a8f1f41a0d2ef350c0b6e65822d80772fe46b653ab6b6274f61d4a49 \
-    --hash=sha256:ba60bb19387e13597fb059f32cd4d59445d7b18b69a745b8f8e5db0346f33480 \
-    --hash=sha256:beee944ae828747fd7cb216a70f120767fc9f4f00bacae8543c14a6831673f89 \
-    --hash=sha256:c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b \
-    --hash=sha256:c302220494f5c1ebeb0912ea782bcd5e2f8308037b3c7553fad0e48ebad6ad82 \
-    --hash=sha256:c757a9dd70d72b076d6f68efdbb9bc943665ae954dad2801b874c8c69e185068 \
-    --hash=sha256:c9c92be9fd329ac801cc420e08452b70e7aeab94ea4233a4804f0915c14eba9b \
-    --hash=sha256:cc7b01b3754ea68a62bd77ce6020afaffb44a590c2289089289363472d13aedb \
-    --hash=sha256:db9e724bebd621d9beca794f2a4ff1d26eed5965b004a97f1f1685a173b869c2 \
-    --hash=sha256:dd9b1baec094d91bf36ec729445f7769d0d0cf6b64d04d86e45baf89e2b9059b \
-    --hash=sha256:e02a0e11cf6597299b9f3bbd3f93d79217cb90cfd1411aec33848b13f5c656cc \
-    --hash=sha256:e774d53b1a477a67838a904131c4b0eef6b3d8a651f8b138b04f748fccfefe17 \
-    --hash=sha256:f146e0911cb2f1da549fc58fc7bcd2b836a44b79ef871980d605ec392ff6b0d2 \
-    --hash=sha256:f56e2333dda1fe0f909e7cc59f021eba0d2307bc6f012a1ccf2beca6ba362439 \
-    --hash=sha256:f9a3ea26252bd92f570600098783d1371354d89d5f6b7dfd87359d669f2109b5 \
-    --hash=sha256:f9aa1878d1083b276b0196f2dfbe00c9b7e752475ed3b682025ff20c1c1f51ac \
-    --hash=sha256:fb3c2db03683b5767dedb5769b8a40ebb47d6f7f45b1b3e3b4b51ec8ad9d9825 \
-    --hash=sha256:fde5bd59ab5357e3853313127f4d3565fc7dad314a74d7b5d43c22c6a5ed2ced \
-    --hash=sha256:fe1a06da377e3a1062ae5fe0926e12b84eceb8a50b350ddca72dc85015873f74
-h11==0.14.0; python_full_version == "3.10.12" \
-    --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
-    --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
-httpcore==1.0.5; python_full_version == "3.10.12" \
-    --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
-    --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httptools==0.6.1; python_full_version == "3.10.12" \
-    --hash=sha256:00d5d4b68a717765b1fabfd9ca755bd12bf44105eeb806c03d1962acd9b8e563 \
-    --hash=sha256:0ac5a0ae3d9f4fe004318d64b8a854edd85ab76cffbf7ef5e32920faef62f142 \
-    --hash=sha256:1ed99a373e327f0107cb513b61820102ee4f3675656a37a50083eda05dc9541b \
-    --hash=sha256:3f30d3ce413088a98b9db71c60a6ada2001a08945cb42dd65a9a9fe228627658 \
-    --hash=sha256:48ed8129cd9a0d62cf4d1575fcf90fb37e3ff7d5654d3a5814eb3d55f36478c2 \
-    --hash=sha256:4f0f8271c0a4db459f9dc807acd0eadd4839934a4b9b892f6f160e94da309837 \
-    --hash=sha256:5cceac09f164bcba55c0500a18fe3c47df29b62353198e4f37bbcc5d591172c3 \
-    --hash=sha256:639dc4f381a870c9ec860ce5c45921db50205a37cc3334e756269736ff0aac58 \
-    --hash=sha256:6a4f5ccead6d18ec072ac0b84420e95d27c1cdf5c9f1bc8fbd8daf86bd94f43d \
-    --hash=sha256:6f58e335a1402fb5a650e271e8c2d03cfa7cea46ae124649346d17bd30d59c90 \
-    --hash=sha256:75c8022dca7935cba14741a42744eee13ba05db00b27a4b940f0d646bd4d56d0 \
-    --hash=sha256:7a7ea483c1a4485c71cb5f38be9db078f8b0e8b4c4dc0210f531cdd2ddac1ef1 \
-    --hash=sha256:7d9ceb2c957320def533671fc9c715a80c47025139c8d1f3797477decbc6edd2 \
-    --hash=sha256:85ed077c995e942b6f1b07583e4eb0a8d324d418954fc6af913d36db7c05a5a0 \
-    --hash=sha256:8b0bb634338334385351a1600a73e558ce619af390c2b38386206ac6a27fecfc \
-    --hash=sha256:93ad80d7176aa5788902f207a4e79885f0576134695dfb0fefc15b7a4648d503 \
-    --hash=sha256:97662ce7fb196c785344d00d638fc9ad69e18ee4bfb4000b35a52efe5adcc949 \
-    --hash=sha256:9bb68d3a085c2174c2477eb3ffe84ae9fb4fde8792edb7bcd09a1d8467e30a84 \
-    --hash=sha256:b512aa728bc02354e5ac086ce76c3ce635b62f5fbc32ab7082b5e582d27867bb \
-    --hash=sha256:c6e26c30455600b95d94b1b836085138e82f177351454ee841c148f93a9bad5a \
-    --hash=sha256:d2f6c3c4cb1948d912538217838f6e9960bc4a521d7f9b323b3da579cd14532f \
-    --hash=sha256:e57997ac7fb7ee43140cc03664de5f268813a481dff6245e0075925adc6aa185
-httpx==0.27.0; python_full_version == "3.10.12" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
-idna==3.7; python_full_version == "3.10.12" \
-    --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
-    --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
-jinja2==3.1.4; python_full_version == "3.10.12" \
-    --hash=sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 \
-    --hash=sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d
-markdown-it-py==3.0.0; python_full_version == "3.10.12" \
-    --hash=sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1 \
-    --hash=sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb
-markupsafe==2.1.5; python_full_version == "3.10.12" \
-    --hash=sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff \
-    --hash=sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f \
-    --hash=sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f \
-    --hash=sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617 \
-    --hash=sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906 \
-    --hash=sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f \
-    --hash=sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4 \
-    --hash=sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169 \
-    --hash=sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad \
-    --hash=sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2 \
-    --hash=sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f \
-    --hash=sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced \
-    --hash=sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5 \
-    --hash=sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c \
-    --hash=sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb \
-    --hash=sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad \
-    --hash=sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1 \
-    --hash=sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc \
-    --hash=sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee \
-    --hash=sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900 \
-    --hash=sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5 \
-    --hash=sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f \
-    --hash=sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5 \
-    --hash=sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a \
-    --hash=sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a \
-    --hash=sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b \
-    --hash=sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4 \
-    --hash=sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46 \
-    --hash=sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b \
-    --hash=sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5 \
-    --hash=sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd
-mdurl==0.1.2; python_full_version == "3.10.12" \
-    --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
-    --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
-miservice-fork==2.7.0; python_full_version == "3.10.12" \
-    --hash=sha256:8e2c91ebe1fc4b3c63b01cbf1818e5d5833d024fd3a8311970d649ad2d49d6e6 \
-    --hash=sha256:8e87ef6d89adceaf3f7a98242cdae1c9135498d77f2c743ec3871d2e42bcbab8
-multidict==6.0.5; python_full_version == "3.10.12" \
-    --hash=sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556 \
-    --hash=sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29 \
-    --hash=sha256:0d63c74e3d7ab26de115c49bffc92cc77ed23395303d496eae515d4204a625e7 \
-    --hash=sha256:14c2976aa9038c2629efa2c148022ed5eb4cb939e15ec7aace7ca932f48f9ba6 \
-    --hash=sha256:1d147090048129ce3c453f0292e7697d333db95e52616b3793922945804a433c \
-    --hash=sha256:215ed703caf15f578dca76ee6f6b21b7603791ae090fbf1ef9d865571039ade5 \
-    --hash=sha256:21fd81c4ebdb4f214161be351eb5bcf385426bf023041da2fd9e60681f3cebae \
-    --hash=sha256:220dd781e3f7af2c2c1053da9fa96d9cf3072ca58f057f4c5adaaa1cab8fc442 \
-    --hash=sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9 \
-    --hash=sha256:29bfeb0dff5cb5fdab2023a7a9947b3b4af63e9c47cae2a10ad58394b517fddc \
-    --hash=sha256:2f4848aa3baa109e6ab81fe2006c77ed4d3cd1e0ac2c1fbddb7b1277c168788c \
-    --hash=sha256:2faa5ae9376faba05f630d7e5e6be05be22913782b927b19d12b8145968a85ea \
-    --hash=sha256:2ffc42c922dbfddb4a4c3b438eb056828719f07608af27d163191cb3e3aa6cc5 \
-    --hash=sha256:3cc2ad10255f903656017363cd59436f2111443a76f996584d1077e43ee51182 \
-    --hash=sha256:411bf8515f3be9813d06004cac41ccf7d1cd46dfe233705933dd163b60e37600 \
-    --hash=sha256:425bf820055005bfc8aa9a0b99ccb52cc2f4070153e34b701acc98d201693733 \
-    --hash=sha256:435a0984199d81ca178b9ae2c26ec3d49692d20ee29bc4c11a2a8d4514c67eda \
-    --hash=sha256:51d035609b86722963404f711db441cf7134f1889107fb171a970c9701f92e1e \
-    --hash=sha256:53689bb4e102200a4fafa9de9c7c3c212ab40a7ab2c8e474491914d2305f187e \
-    --hash=sha256:612d1156111ae11d14afaf3a0669ebf6c170dbb735e510a7438ffe2369a847fd \
-    --hash=sha256:6939c95381e003f54cd4c5516740faba40cf5ad3eeff460c3ad1d3e0ea2549bf \
-    --hash=sha256:766c8f7511df26d9f11cd3a8be623e59cca73d44643abab3f8c8c07620524e4a \
-    --hash=sha256:76c0de87358b192de7ea9649beb392f107dcad9ad27276324c24c91774ca5271 \
-    --hash=sha256:7901c05ead4b3fb75113fb1dd33eb1253c6d3ee37ce93305acd9d38e0b5f21a4 \
-    --hash=sha256:79660376075cfd4b2c80f295528aa6beb2058fd289f4c9252f986751a4cd0496 \
-    --hash=sha256:79a6d2ba910adb2cbafc95dad936f8b9386e77c84c35bc0add315b856d7c3abb \
-    --hash=sha256:7afcdd1fc07befad18ec4523a782cde4e93e0a2bf71239894b8d61ee578c1319 \
-    --hash=sha256:7be7047bd08accdb7487737631d25735c9a04327911de89ff1b26b81745bd4e3 \
-    --hash=sha256:7c6390cf87ff6234643428991b7359b5f59cc15155695deb4eda5c777d2b880f \
-    --hash=sha256:85f67aed7bb647f93e7520633d8f51d3cbc6ab96957c71272b286b2f30dc70ed \
-    --hash=sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604 \
-    --hash=sha256:92d16a3e275e38293623ebf639c471d3e03bb20b8ebb845237e0d3664914caef \
-    --hash=sha256:99f60d34c048c5c2fabc766108c103612344c46e35d4ed9ae0673d33c8fb26e8 \
-    --hash=sha256:9fe7b0653ba3d9d65cbe7698cca585bf0f8c83dbbcc710db9c90f478e175f2d5 \
-    --hash=sha256:c1c1496e73051918fcd4f58ff2e0f2f3066d1c76a0c6aeffd9b45d53243702cc \
-    --hash=sha256:cbebcd5bcaf1eaf302617c114aa67569dd3f090dd0ce8ba9e35e9985b41ac35b \
-    --hash=sha256:ceb3b7e6a0135e092de86110c5a74e46bda4bd4fbfeeb3a3bcec79c0f861e450 \
-    --hash=sha256:d3eb1ceec286eba8220c26f3b0096cf189aea7057b6e7b7a2e60ed36b373b77f \
-    --hash=sha256:d84a5c3a5f7ce6db1f999fb9438f686bc2e09d38143f2d93d8406ed2dd6b9226 \
-    --hash=sha256:de170c7b4fe6859beb8926e84f7d7d6c693dfe8e27372ce3b76f01c46e489fcf \
-    --hash=sha256:e030047e85cbcedbfc073f71836d62dd5dadfbe7531cae27789ff66bc551bd5e \
-    --hash=sha256:e0e79d91e71b9867c73323a3444724d496c037e578a0e1755ae159ba14f4f3d1 \
-    --hash=sha256:e4428b29611e989719874670fd152b6625500ad6c686d464e99f5aaeeaca175a \
-    --hash=sha256:f285e862d2f153a70586579c15c44656f888806ed0e5b56b64489afe4a2dbfba \
-    --hash=sha256:f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da \
-    --hash=sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24 \
-    --hash=sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef
-mutagen==1.47.0; python_full_version == "3.10.12" \
-    --hash=sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99 \
-    --hash=sha256:edd96f50c5907a9539d8e5bba7245f62c9f520aef333d13392a79a4f70aca719
-pycryptodomex==3.20.0; python_full_version == "3.10.12" \
-    --hash=sha256:25cd61e846aaab76d5791d006497134602a9e451e954833018161befc3b5b9ed \
-    --hash=sha256:2a47bcc478741b71273b917232f521fd5704ab4b25d301669879e7273d3586cc \
-    --hash=sha256:59af01efb011b0e8b686ba7758d59cf4a8263f9ad35911bfe3f416cee4f5c08c \
-    --hash=sha256:6e186342cfcc3aafaad565cbd496060e5a614b441cacc3995ef0091115c1f6c5 \
-    --hash=sha256:7a710b79baddd65b806402e14766c721aee8fb83381769c27920f26476276c1e \
-    --hash=sha256:7a7a8f33a1f1fb762ede6cc9cbab8f2a9ba13b196bfaf7bc6f0b39d2ba315a43 \
-    --hash=sha256:82ee7696ed8eb9a82c7037f32ba9b7c59e51dda6f105b39f043b6ef293989cb3 \
-    --hash=sha256:88afd7a3af7ddddd42c2deda43d53d3dfc016c11327d0915f90ca34ebda91499 \
-    --hash=sha256:91852d4480a4537d169c29a9d104dda44094c78f1f5b67bca76c29a91042b623 \
-    --hash=sha256:9c682436c359b5ada67e882fec34689726a09c461efd75b6ea77b2403d5665b7 \
-    --hash=sha256:bca649483d5ed251d06daf25957f802e44e6bb6df2e8f218ae71968ff8f8edc4 \
-    --hash=sha256:c39778fd0548d78917b61f03c1fa8bfda6cfcf98c767decf360945fe6f97461e \
-    --hash=sha256:d00fe8596e1cc46b44bf3907354e9377aa030ec4cd04afbbf6e899fc1e2a7781 \
-    --hash=sha256:e48217c7901edd95f9f097feaa0388da215ed14ce2ece803d3f300b4e694abea \
-    --hash=sha256:f2e497413560e03421484189a6b65e33fe800d3bd75590e6d78d4dfdb7accf3b
-pydantic==2.8.2; python_full_version == "3.10.12" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
-pydantic-core==2.20.1; python_full_version == "3.10.12" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pygments==2.18.0; python_full_version == "3.10.12" \
-    --hash=sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 \
-    --hash=sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a
-python-dotenv==1.0.1; python_full_version == "3.10.12" \
-    --hash=sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca \
-    --hash=sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a
-python-multipart==0.0.9; python_full_version == "3.10.12" \
-    --hash=sha256:03f54688c663f1b7977105f021043b0793151e4cb1c1a9d4a11fc13d622c4026 \
-    --hash=sha256:97ca7b8ea7b05f977dc3849c3ba99d51689822fab725c3703af7c866a0c2b215
-pyyaml==6.0.1; python_full_version == "3.10.12" \
-    --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \
-    --hash=sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df \
-    --hash=sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741 \
-    --hash=sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290 \
-    --hash=sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9 \
-    --hash=sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d \
-    --hash=sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007 \
-    --hash=sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938 \
-    --hash=sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0 \
-    --hash=sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d \
-    --hash=sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28 \
-    --hash=sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4 \
-    --hash=sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef \
-    --hash=sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515 \
-    --hash=sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924 \
-    --hash=sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34 \
-    --hash=sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 \
-    --hash=sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673 \
-    --hash=sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54 \
-    --hash=sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a \
-    --hash=sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b \
-    --hash=sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab \
-    --hash=sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d \
-    --hash=sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f
-requests==2.32.3; python_full_version == "3.10.12" \
-    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
-    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
-rich==13.7.1; python_full_version == "3.10.12" \
-    --hash=sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222 \
-    --hash=sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432
-shellingham==1.5.4; python_full_version == "3.10.12" \
-    --hash=sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686 \
-    --hash=sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de
-sniffio==1.3.1; python_full_version == "3.10.12" \
-    --hash=sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2 \
-    --hash=sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc
-starlette==0.37.2; python_full_version == "3.10.12" \
-    --hash=sha256:6fe59f29268538e5d0d182f2791a479a0c64638e6935d1c6989e63fb2699c6ee \
-    --hash=sha256:9af890290133b79fc3db55474ade20f6220a364a0402e0b556e7cd5e1e093823
-typer==0.12.3; python_full_version == "3.10.12" \
-    --hash=sha256:070d7ca53f785acbccba8e7d28b08dcd88f79f1fbda035ade0aecec71ca5c914 \
-    --hash=sha256:49e73131481d804288ef62598d97a1ceef3058905aa536a1134f90891ba35482
-typing-extensions==4.12.2; python_full_version == "3.10.12" \
-    --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
-    --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
-urllib3==2.2.2; python_full_version == "3.10.12" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
-uvicorn==0.30.1; python_full_version == "3.10.12" \
-    --hash=sha256:cd17daa7f3b9d7a24de3617820e634d0933b69eed8e33a516071174427238c81 \
-    --hash=sha256:d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8
-uvicorn[standard]==0.30.1; python_full_version == "3.10.12" \
-    --hash=sha256:cd17daa7f3b9d7a24de3617820e634d0933b69eed8e33a516071174427238c81 \
-    --hash=sha256:d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8
-uvloop==0.19.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy" and python_full_version == "3.10.12" \
-    --hash=sha256:0246f4fd1bf2bf702e06b0d45ee91677ee5c31242f39aab4ea6fe0c51aedd0fd \
-    --hash=sha256:02506dc23a5d90e04d4f65c7791e65cf44bd91b37f24cfc3ef6cf2aff05dc7ec \
-    --hash=sha256:2693049be9d36fef81741fddb3f441673ba12a34a704e7b4361efb75cf30befc \
-    --hash=sha256:31e672bb38b45abc4f26e273be83b72a0d28d074d5b370fc4dcf4c4eb15417d2 \
-    --hash=sha256:47bf3e9312f63684efe283f7342afb414eea4d3011542155c7e625cd799c3b12 \
-    --hash=sha256:4ce6b0af8f2729a02a5d1575feacb2a94fc7b2e983868b009d51c9a9d2149bef \
-    --hash=sha256:5138821e40b0c3e6c9478643b4660bd44372ae1e16a322b8fc07478f92684e24 \
-    --hash=sha256:5588bd21cf1fcf06bded085f37e43ce0e00424197e7c10e77afd4bbefffef428 \
-    --hash=sha256:570fc0ed613883d8d30ee40397b79207eedd2624891692471808a95069a007c1 \
-    --hash=sha256:5a05128d315e2912791de6088c34136bfcdd0c7cbc1cf85fd6fd1bb321b7c849 \
-    --hash=sha256:5daa304d2161d2918fa9a17d5635099a2f78ae5b5960e742b2fcfbb7aefaa593 \
-    --hash=sha256:5f17766fb6da94135526273080f3455a112f82570b2ee5daa64d682387fe0dcd \
-    --hash=sha256:7010271303961c6f0fe37731004335401eb9075a12680738731e9c92ddd96ad6 \
-    --hash=sha256:7207272c9520203fea9b93843bb775d03e1cf88a80a936ce760f60bb5add92f3 \
-    --hash=sha256:7b1fd71c3843327f3bbc3237bedcdb6504fd50368ab3e04d0410e52ec293f5b8 \
-    --hash=sha256:91ab01c6cd00e39cde50173ba4ec68a1e578fee9279ba64f5221810a9e786533 \
-    --hash=sha256:cd81bdc2b8219cb4b2556eea39d2e36bfa375a2dd021404f90a62e44efaaf957 \
-    --hash=sha256:da8435a3bd498419ee8c13c34b89b5005130a476bda1d6ca8cfdde3de35cd650 \
-    --hash=sha256:de4313d7f575474c8f5a12e163f6d89c0a878bc49219641d49e6f1444369a90e
-watchfiles==0.22.0; python_full_version == "3.10.12" \
-    --hash=sha256:00095dd368f73f8f1c3a7982a9801190cc88a2f3582dd395b289294f8975172b \
-    --hash=sha256:00f39592cdd124b4ec5ed0b1edfae091567c72c7da1487ae645426d1b0ffcad1 \
-    --hash=sha256:030bc4e68d14bcad2294ff68c1ed87215fbd9a10d9dea74e7cfe8a17869785ab \
-    --hash=sha256:052d668a167e9fc345c24203b104c313c86654dd6c0feb4b8a6dfc2462239249 \
-    --hash=sha256:067dea90c43bf837d41e72e546196e674f68c23702d3ef80e4e816937b0a3ffd \
-    --hash=sha256:1235c11510ea557fe21be5d0e354bae2c655a8ee6519c94617fe63e05bca4171 \
-    --hash=sha256:1cc0cba54f47c660d9fa3218158b8963c517ed23bd9f45fe463f08262a4adae1 \
-    --hash=sha256:1d9188979a58a096b6f8090e816ccc3f255f137a009dd4bbec628e27696d67c1 \
-    --hash=sha256:213792c2cd3150b903e6e7884d40660e0bcec4465e00563a5fc03f30ea9c166c \
-    --hash=sha256:2627a91e8110b8de2406d8b2474427c86f5a62bf7d9ab3654f541f319ef22bcb \
-    --hash=sha256:28585744c931576e535860eaf3f2c0ec7deb68e3b9c5a85ca566d69d36d8dd27 \
-    --hash=sha256:2bdadf6b90c099ca079d468f976fd50062905d61fae183f769637cb0f68ba59a \
-    --hash=sha256:3218a6f908f6a276941422b035b511b6d0d8328edd89a53ae8c65be139073f84 \
-    --hash=sha256:425440e55cd735386ec7925f64d5dde392e69979d4c8459f6bb4e920210407f2 \
-    --hash=sha256:4b9f2a128a32a2c273d63eb1fdbf49ad64852fc38d15b34eaa3f7ca2f0d2b797 \
-    --hash=sha256:52fc9b0dbf54d43301a19b236b4a4614e610605f95e8c3f0f65c3a456ffd7d35 \
-    --hash=sha256:55b7cc10261c2786c41d9207193a85c1db1b725cf87936df40972aab466179b6 \
-    --hash=sha256:581f0a051ba7bafd03e17127735d92f4d286af941dacf94bcf823b101366249e \
-    --hash=sha256:5e45fb0d70dda1623a7045bd00c9e036e6f1f6a85e4ef2c8ae602b1dfadf7550 \
-    --hash=sha256:61af9efa0733dc4ca462347becb82e8ef4945aba5135b1638bfc20fad64d4f0e \
-    --hash=sha256:68fe0c4d22332d7ce53ad094622b27e67440dacefbaedd29e0794d26e247280c \
-    --hash=sha256:8c39987a1397a877217be1ac0fb1d8b9f662c6077b90ff3de2c05f235e6a8f96 \
-    --hash=sha256:94ebe84a035993bb7668f58a0ebf998174fb723a39e4ef9fce95baabb42b787f \
-    --hash=sha256:9624a68b96c878c10437199d9a8b7d7e542feddda8d5ecff58fdc8e67b460848 \
-    --hash=sha256:988e981aaab4f3955209e7e28c7794acdb690be1efa7f16f8ea5aba7ffdadacb \
-    --hash=sha256:a8a31bfd98f846c3c284ba694c6365620b637debdd36e46e1859c897123aa232 \
-    --hash=sha256:a927b3034d0672f62fb2ef7ea3c9fc76d063c4b15ea852d1db2dc75fe2c09696 \
-    --hash=sha256:ace7d060432acde5532e26863e897ee684780337afb775107c0a90ae8dbccfd2 \
-    --hash=sha256:aec83c3ba24c723eac14225194b862af176d52292d271c98820199110e31141e \
-    --hash=sha256:b44b70850f0073b5fcc0b31ede8b4e736860d70e2dbf55701e05d3227a154a67 \
-    --hash=sha256:b810a2c7878cbdecca12feae2c2ae8af59bea016a78bc353c184fa1e09f76b68 \
-    --hash=sha256:bbf8a20266136507abf88b0df2328e6a9a7c7309e8daff124dda3803306a9fdb \
-    --hash=sha256:bd4c06100bce70a20c4b81e599e5886cf504c9532951df65ad1133e508bf20be \
-    --hash=sha256:c2444dc7cb9d8cc5ab88ebe792a8d75709d96eeef47f4c8fccb6df7c7bc5be71 \
-    --hash=sha256:c49b76a78c156979759d759339fb62eb0549515acfe4fd18bb151cc07366629c \
-    --hash=sha256:c4a65474fd2b4c63e2c18ac67a0c6c66b82f4e73e2e4d940f837ed3d2fd9d4da \
-    --hash=sha256:c5af2347d17ab0bd59366db8752d9e037982e259cacb2ba06f2c41c08af02c39 \
-    --hash=sha256:c668228833c5619f6618699a2c12be057711b0ea6396aeaece4ded94184304ea \
-    --hash=sha256:c7b978c384e29d6c7372209cbf421d82286a807bbcdeb315427687f8371c340a \
-    --hash=sha256:da1e0a8caebf17976e2ffd00fa15f258e14749db5e014660f53114b676e68538 \
-    --hash=sha256:dc2e8fe41f3cac0660197d95216c42910c2b7e9c70d48e6d84e22f577d106fc1 \
-    --hash=sha256:e0f0a874231e2839abbf473256efffe577d6ee2e3bfa5b540479e892e47c172d \
-    --hash=sha256:f7e1f9c5d1160d03b93fc4b68a0aeb82fe25563e12fbcdc8507f8434ab6f823c
-websockets==12.0; python_full_version == "3.10.12" \
-    --hash=sha256:0e6e2711d5a8e6e482cacb927a49a3d432345dfe7dea8ace7b5790df5932e4df \
-    --hash=sha256:12743ab88ab2af1d17dd4acb4645677cb7063ef4db93abffbf164218a5d54c6b \
-    --hash=sha256:1e4b3f8ea6a9cfa8be8484c9221ec0257508e3a1ec43c36acdefb2a9c3b00aa2 \
-    --hash=sha256:1f38a7b376117ef7aff996e737583172bdf535932c9ca021746573bce40165ed \
-    --hash=sha256:248d8e2446e13c1d4326e0a6a4e9629cb13a11195051a73acf414812700badbd \
-    --hash=sha256:25eb766c8ad27da0f79420b2af4b85d29914ba0edf69f547cc4f06ca6f1d403b \
-    --hash=sha256:2c71bd45a777433dd9113847af751aae36e448bc6b8c361a566cb043eda6ec30 \
-    --hash=sha256:2d225bb6886591b1746b17c0573e29804619c8f755b5598d875bb4235ea639be \
-    --hash=sha256:363f57ca8bc8576195d0540c648aa58ac18cf85b76ad5202b9f976918f4219cf \
-    --hash=sha256:3d829f975fc2e527a3ef2f9c8f25e553eb7bc779c6665e8e1d52aa22800bb38b \
-    --hash=sha256:3e3aa8c468af01d70332a382350ee95f6986db479ce7af14d5e81ec52aa2b402 \
-    --hash=sha256:3f61726cae9f65b872502ff3c1496abc93ffbe31b278455c418492016e2afc8f \
-    --hash=sha256:4d87be612cbef86f994178d5186add3d94e9f31cc3cb499a0482b866ec477603 \
-    --hash=sha256:5693ef74233122f8ebab026817b1b37fe25c411ecfca084b29bc7d6efc548f45 \
-    --hash=sha256:5aa9348186d79a5f232115ed3fa9020eab66d6c3437d72f9d2c8ac0c6858c558 \
-    --hash=sha256:5d873c7de42dea355d73f170be0f23788cf3fa9f7bed718fd2830eefedce01b4 \
-    --hash=sha256:6350b14a40c95ddd53e775dbdbbbc59b124a5c8ecd6fbb09c2e52029f7a9f480 \
-    --hash=sha256:6e2df67b8014767d0f785baa98393725739287684b9f8d8a1001eb2839031447 \
-    --hash=sha256:6e96f5ed1b83a8ddb07909b45bd94833b0710f738115751cdaa9da1fb0cb66e8 \
-    --hash=sha256:6e9e7db18b4539a29cc5ad8c8b252738a30e2b13f033c2d6e9d0549b45841c04 \
-    --hash=sha256:70ec754cc2a769bcd218ed8d7209055667b30860ffecb8633a834dde27d6307c \
-    --hash=sha256:7b645f491f3c48d3f8a00d1fce07445fab7347fec54a3e65f0725d730d5b99cb \
-    --hash=sha256:81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b \
-    --hash=sha256:8e332c210b14b57904869ca9f9bf4ca32f5427a03eeb625da9b616c85a3a506c \
-    --hash=sha256:9893d1aa45a7f8b3bc4510f6ccf8db8c3b62120917af15e3de247f0780294b92 \
-    --hash=sha256:9fdf06fd06c32205a07e47328ab49c40fc1407cdec801d698a7c41167ea45113 \
-    --hash=sha256:ae0a5da8f35a5be197f328d4727dbcfafa53d1824fac3d96cdd3a642fe09394f \
-    --hash=sha256:baa386875b70cbd81798fa9f71be689c1bf484f65fd6fb08d051a0ee4e79924d \
-    --hash=sha256:bea88d71630c5900690fcb03161ab18f8f244805c59e2e0dc4ffadae0a7ee0ca \
-    --hash=sha256:befe90632d66caaf72e8b2ed4d7f02b348913813c8b0a32fae1cc5fe3730902f \
-    --hash=sha256:c4e37d36f0d19f0a4413d3e18c0d03d0c268ada2061868c1e6f5ab1a6d575077 \
-    --hash=sha256:c588f6abc13f78a67044c6b1273a99e1cf31038ad51815b3b016ce699f0d75c2 \
-    --hash=sha256:d554236b2a2006e0ce16315c16eaa0d628dab009c33b63ea03f41c6107958374 \
-    --hash=sha256:dbcf72a37f0b3316e993e13ecf32f10c0e1259c28ffd0a85cee26e8549595fbc \
-    --hash=sha256:dc284bbc8d7c78a6c69e0c7325ab46ee5e40bb4d50e494d8131a07ef47500e9e \
-    --hash=sha256:dff6cdf35e31d1315790149fee351f9e52978130cef6c87c4b6c9b3baf78bc53 \
-    --hash=sha256:eb809e816916a3b210bed3c82fb88eaf16e8afcf9c115ebb2bacede1797d2547 \
-    --hash=sha256:ed2fcf7a07334c77fc8a230755c2209223a7cc44fc27597729b8ef5425aa61a3 \
-    --hash=sha256:f44069528d45a933997a6fef143030d8ca8042f0dfaad753e2906398290e2870 \
-    --hash=sha256:f764ba54e33daf20e167915edc443b6f88956f37fb606449b4a5b10ba42235a5
-yarl==1.9.4; python_full_version == "3.10.12" \
-    --hash=sha256:008d3e808d03ef28542372d01057fd09168419cdc8f848efe2804f894ae03e51 \
-    --hash=sha256:03caa9507d3d3c83bca08650678e25364e1843b484f19986a527630ca376ecce \
-    --hash=sha256:09efe4615ada057ba2d30df871d2f668af661e971dfeedf0c159927d48bbeff0 \
-    --hash=sha256:0d2454f0aef65ea81037759be5ca9947539667eecebca092733b2eb43c965a81 \
-    --hash=sha256:0e9d124c191d5b881060a9e5060627694c3bdd1fe24c5eecc8d5d7d0eb6faabc \
-    --hash=sha256:357495293086c5b6d34ca9616a43d329317feab7917518bc97a08f9e55648455 \
-    --hash=sha256:35a2b9396879ce32754bd457d31a51ff0a9d426fd9e0e3c33394bf4b9036b099 \
-    --hash=sha256:3777ce5536d17989c91696db1d459574e9a9bd37660ea7ee4d3344579bb6f129 \
-    --hash=sha256:3986b6f41ad22988e53d5778f91855dc0399b043fc8946d4f2e68af22ee9ff10 \
-    --hash=sha256:44d8ffbb9c06e5a7f529f38f53eda23e50d1ed33c6c869e01481d3fafa6b8142 \
-    --hash=sha256:49a180c2e0743d5d6e0b4d1a9e5f633c62eca3f8a86ba5dd3c471060e352ca98 \
-    --hash=sha256:4b21516d181cd77ebd06ce160ef8cc2a5e9ad35fb1c5930882baff5ac865eee7 \
-    --hash=sha256:4b3c1ffe10069f655ea2d731808e76e0f452fc6c749bea04781daf18e6039525 \
-    --hash=sha256:4c7d56b293cc071e82532f70adcbd8b61909eec973ae9d2d1f9b233f3d943f2c \
-    --hash=sha256:4e9035df8d0880b2f1c7f5031f33f69e071dfe72ee9310cfc76f7b605958ceb9 \
-    --hash=sha256:54525ae423d7b7a8ee81ba189f131054defdb122cde31ff17477951464c1691c \
-    --hash=sha256:549d19c84c55d11687ddbd47eeb348a89df9cb30e1993f1b128f4685cd0ebbf8 \
-    --hash=sha256:54beabb809ffcacbd9d28ac57b0db46e42a6e341a030293fb3185c409e626b8b \
-    --hash=sha256:566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf \
-    --hash=sha256:6f5cb257bc2ec58f437da2b37a8cd48f666db96d47b8a3115c29f316313654ff \
-    --hash=sha256:7855426dfbddac81896b6e533ebefc0af2f132d4a47340cee6d22cac7190022d \
-    --hash=sha256:7d5aaac37d19b2904bb9dfe12cdb08c8443e7ba7d2852894ad448d4b8f442863 \
-    --hash=sha256:801e9264d19643548651b9db361ce3287176671fb0117f96b5ac0ee1c3530d53 \
-    --hash=sha256:81eb57278deb6098a5b62e88ad8281b2ba09f2f1147c4767522353eaa6260b31 \
-    --hash=sha256:848cd2a1df56ddbffeb375535fb62c9d1645dde33ca4d51341378b3f5954429b \
-    --hash=sha256:928cecb0ef9d5a7946eb6ff58417ad2fe9375762382f1bf5c55e61645f2c43ad \
-    --hash=sha256:992f18e0ea248ee03b5a6e8b3b4738850ae7dbb172cc41c966462801cbf62cf7 \
-    --hash=sha256:9fc5fc1eeb029757349ad26bbc5880557389a03fa6ada41703db5e068881e5f2 \
-    --hash=sha256:a3a6ed1d525bfb91b3fc9b690c5a21bb52de28c018530ad85093cc488bee2dd2 \
-    --hash=sha256:a7409f968456111140c1c95301cadf071bd30a81cbd7ab829169fb9e3d72eae9 \
-    --hash=sha256:a8c1df72eb746f4136fe9a2e72b0c9dc1da1cbd23b5372f94b5820ff8ae30e0e \
-    --hash=sha256:a9bd00dc3bc395a662900f33f74feb3e757429e545d831eef5bb280252631984 \
-    --hash=sha256:aa102d6d280a5455ad6a0f9e6d769989638718e938a6a0a2ff3f4a7ff8c62cc4 \
-    --hash=sha256:aaaea1e536f98754a6e5c56091baa1b6ce2f2700cc4a00b0d49eca8dea471074 \
-    --hash=sha256:b8477c1ee4bd47c57d49621a062121c3023609f7a13b8a46953eb6c9716ca392 \
-    --hash=sha256:bac8d525a8dbc2a1507ec731d2867025d11ceadcb4dd421423a5d42c56818541 \
-    --hash=sha256:c0ec0ed476f77db9fb29bca17f0a8fcc7bc97ad4c6c1d8959c507decb22e8572 \
-    --hash=sha256:c38c9ddb6103ceae4e4498f9c08fac9b590c5c71b0370f98714768e22ac6fa66 \
-    --hash=sha256:d1d2532b340b692880261c15aee4dc94dd22ca5d61b9db9a8a361953d36410b1 \
-    --hash=sha256:d5ff2c858f5f6a42c2a8e751100f237c5e869cbde669a724f2062d4c4ef93551 \
-    --hash=sha256:d8a1c6c0be645c745a081c192e747c5de06e944a0d21245f4cf7c05e457c36e0 \
-    --hash=sha256:d8b889777de69897406c9fb0b76cdf2fd0f31267861ae7501d93003d55f54fbe \
-    --hash=sha256:d9e09c9d74f4566e905a0b8fa668c58109f7624db96a2171f21747abc7524234 \
-    --hash=sha256:e23a6d84d9d1738dbc6e38167776107e63307dfc8ad108e580548d1f2c587f42 \
-    --hash=sha256:e516dc8baf7b380e6c1c26792610230f37147bb754d6426462ab115a02944385 \
-    --hash=sha256:ea65804b5dc88dacd4a40279af0cdadcfe74b3e5b4c897aa0d81cf86927fee78 \
-    --hash=sha256:ee04010f26d5102399bd17f8df8bc38dc7ccd7701dc77f4a68c5b8d733406958
-yt-dlp==2024.7.16; python_full_version == "3.10.12" \
-    --hash=sha256:424805a112e757b141e767bc938d49db56d13d6415a92fa4cd8acadd55790be0 \
-    --hash=sha256:c5bd517a49dea1923ec8e14f51858f10fd89dfece14cb701392b480b41b2f516

test/test_music_duration.py

@@ -0,0 +1,32 @@
+import math
+
+from xiaomusic.const import (
+    SUPPORT_MUSIC_TYPE,
+)
+from xiaomusic.utils import (
+    get_local_music_duration,
+    traverse_music_directory,
+)
+
+
+async def test_one_music(filename):
+    # 获取播放时长
+    duration = await get_local_music_duration(filename)
+    sec = math.ceil(duration)
+    print(f"本地歌曲 : {filename} 的时长 {duration} {sec} 秒")
+
+
+async def main(directory):
+    # 获取所有歌曲文件
+    local_musics = traverse_music_directory(directory, 10, [], SUPPORT_MUSIC_TYPE)
+    print(local_musics)
+    for _, files in local_musics.items():
+        for file in files:
+            await test_one_music(file)
+
+
+if __name__ == "__main__":
+    import asyncio
+
+    directory = "./music"  # 替换为你的音乐目录路径
+    asyncio.run(main(directory))

test/test_music_tags.py

@@ -0,0 +1,48 @@
+import traceback
+
+from xiaomusic.const import (
+    SUPPORT_MUSIC_TYPE,
+)
+from xiaomusic.utils import (
+    extract_audio_metadata,
+    traverse_music_directory,
+)
+
+# title 标题
+# artist 艺术家
+# album 影集
+# year 年
+# genre 性
+# picture 图片
+# lyrics 歌词
+
+
+async def test_one_music(filename):
+    # 获取播放时长
+    try:
+        metadata = extract_audio_metadata(filename, "cache/picture_cache")
+        print(metadata)
+    except Exception as e:
+        print(f"歌曲 : {filename} no tag {e}")
+        traceback.print_exc()
+
+
+async def main(directory):
+    # 获取所有歌曲文件
+    local_musics = traverse_music_directory(directory, 10, [], SUPPORT_MUSIC_TYPE)
+    for _, files in local_musics.items():
+        for file in files:
+            print(file)
+            # await test_one_music(file)
+            pass
+
+    await test_one_music("./music/4.mp3")
+    # await test_one_music("./music/4 In Love - 一千零一个愿.mp3")
+    # await test_one_music("./music/程响-人间烟火.flac")
+
+
+if __name__ == "__main__":
+    import asyncio
+
+    directory = "./music"  # 替换为你的音乐目录路径
+    asyncio.run(main(directory))

test/test_remove_common_prefix.py

@@ -0,0 +1,8 @@
+from xiaomusic.utils import (
+    remove_common_prefix,
+)
+
+if __name__ == "__main__":
+    remove_common_prefix(
+        "./tmp/【无损音质】2024年9月酷狗热歌榜TOP100合集（只选热歌最高的）首首王炸，分P合集！"
+    )

update-requirements.sh

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

update-static-version.py

@@ -16,13 +16,12 @@ def get_html_files(directory):
 
 def update_html_version(html_files, version):
     """
-    更新HTML文件中所有以 /static/ 开头的CSS和JS文件引用的版本号。
+    更新HTML文件中所有以 ./ 开头的CSS和JS文件引用的版本号。
 
     :param html_files: 需要更新的HTML文件路径的列表。
     :param version: 新的版本号字符串。
     """
-    pattern = re.compile(r'(/static/.*(css|js))\?version=[^"]*"')
-    # pattern = re.compile(r'(/static/.*html)\?version=[^"]*"')
+    pattern = re.compile(r'(\./.*(css|js))\?version=[^"]*"')
 
     for html_file in html_files:
         if not html_file.exists():
@@ -48,7 +47,7 @@ if __name__ == "__main__":
     t = str(int(time.time()))
 
     # 指定目录
-    html_directory = "xiaomusic/static"  # 修改为实际的HTML文件目录路径
+    html_directory = "xiaomusic/static/default"  # 修改为实际的HTML文件目录路径
 
     # 获取HTML文件列表
     html_files_to_update = get_html_files(html_directory)

xiaomusic/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.12"
+__version__ = "0.3.40"

xiaomusic/analytics.py

@@ -0,0 +1,86 @@
+import asyncio
+from datetime import datetime
+
+from ga4mp import GtagMP
+
+from xiaomusic import __version__
+
+
+class Analytics:
+    def __init__(self, log):
+        self.gtag = None
+        self.current_date = None
+        self.log = log
+        self.task = None
+        self.init()
+
+    def init(self):
+        if self.gtag is not None:
+            return
+
+        gtag = GtagMP(
+            api_secret="sVRsf3T9StuWc-ZiWZxDVA",
+            measurement_id="G-Z09NC1K7ZW",
+            client_id="",
+        )
+        gtag.client_id = gtag.random_client_id()
+        gtag.store.set_user_property(name="version", value=__version__)
+        self.gtag = gtag
+        self.log.info("analytics init ok")
+
+    async def run_with_cancel(self, func, *args, **kwargs):
+        try:
+            if self.task:
+                self.log.warning(f"analytics run_with_cancel old : {self.task}")
+                self.task.cancel()
+            self.task = asyncio.create_task(func(*args, **kwargs))
+        except Exception as e:
+            self.log.warning(f"analytics run_with_cancel failed {e}")
+            return None
+
+    async def send_startup_event(self):
+        try:
+            await self.run_with_cancel(self._send_startup_event)
+        except Exception as e:
+            self.log.warning(f"analytics send_startup_event failed {e}")
+            self.init()
+
+    async def _send_startup_event(self):
+        event = self.gtag.create_new_event(name="startup")
+        event.set_event_param(name="version", value=__version__)
+        event_list = [event]
+        self.gtag.send(events=event_list)
+
+    async def send_daily_event(self):
+        try:
+            await self.run_with_cancel(self._send_daily_event)
+        except Exception as e:
+            self.log.warning(f"analytics send_daily_event failed {e}")
+            self.init()
+
+    async def _send_daily_event(self):
+        current_date = datetime.now().strftime("%Y-%m-%d")
+        if self.current_date == current_date:
+            return
+
+        event = self.gtag.create_new_event(name="daily_active_user")
+        event.set_event_param(name="version", value=__version__)
+        event.set_event_param(name="date", value=current_date)
+        event_list = [event]
+        self.gtag.send(events=event_list)
+        self.current_date = current_date
+
+    async def send_play_event(self, name, sec):
+        try:
+            await self.run_with_cancel(self._send_play_event, name, sec)
+        except Exception as e:
+            self.log.warning(f"analytics send_play_event failed {e}")
+            self.init()
+
+    async def _send_play_event(self, name, sec):
+        event = self.gtag.create_new_event(name="play")
+        event.set_event_param(name="version", value=__version__)
+        event.set_event_param(name="music", value=name)
+        event.set_event_param(name="sec", value=sec)
+        event_list = [event]
+        self.gtag.send(events=event_list)

xiaomusic/cli.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 import argparse
+import json
+import os
+import signal
 
 import uvicorn
 
@@ -75,29 +78,89 @@ def main():
     options = parser.parse_args()
     config = Config.from_options(options)
 
-    xiaomusic = XiaoMusic(config)
-    HttpInit(xiaomusic)
-
-    from uvicorn.config import LOGGING_CONFIG
-
-    LOGGING_CONFIG["formatters"]["access"] = {
-        "format": f"%(asctime)s [{__version__}] [%(levelname)s] %(filename)s:%(lineno)d: %(message)s",
-        "datefmt": "[%X]",
+    LOGGING_CONFIG = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "formatters": {
+            "default": {
+                "format": f"%(asctime)s [{__version__}] [%(levelname)s] %(message)s",
+                "datefmt": "[%X]",
+                "use_colors": False,
+            },
+            "access": {
+                "format": f"%(asctime)s [{__version__}] [%(levelname)s] %(message)s",
+                "datefmt": "[%X]",
+            },
+        },
+        "handlers": {
+            "default": {
+                "formatter": "default",
+                "class": "logging.StreamHandler",
+                "stream": "ext://sys.stderr",
+            },
+            "access": {
+                "formatter": "access",
+                "class": "logging.StreamHandler",
+                "stream": "ext://sys.stdout",
+            },
+            "file": {
+                "level": "INFO",
+                "class": "logging.handlers.RotatingFileHandler",
+                "formatter": "access",
+                "filename": config.log_file,
+                "maxBytes": 10 * 1024 * 1024,
+                "backupCount": 1,
+            },
+        },
+        "loggers": {
+            "uvicorn": {
+                "handlers": [
+                    "default",
+                    "file",
+                ],
+                "level": "INFO",
+            },
+            "uvicorn.error": {
+                "level": "INFO",
+            },
+            "uvicorn.access": {
+                "handlers": [
+                    "access",
+                    "file",
+                ],
+                "level": "INFO",
+                "propagate": False,
+            },
+        },
     }
-    LOGGING_CONFIG["handlers"]["access"] = {
-        "level": "INFO",
-        "class": "logging.handlers.RotatingFileHandler",
-        "formatter": "access",
-        "filename": config.log_file,
-        "maxBytes": 10 * 1024 * 1024,
-        "backupCount": 1,
-    }
-    uvicorn.run(
-        HttpApp,
-        host=["::", "0.0.0.0"],
-        port=config.port,
-        log_config=LOGGING_CONFIG,
-    )
+
+    try:
+        filename = config.getsettingfile()
+        with open(filename, encoding="utf-8") as f:
+            data = json.loads(f.read())
+            config.update_config(data)
+    except Exception as e:
+        print(f"Execption {e}")
+
+    def run_server(port):
+        xiaomusic = XiaoMusic(config)
+        HttpInit(xiaomusic)
+        uvicorn.run(
+            HttpApp,
+            host=["0.0.0.0", "::"],
+            port=port,
+            log_config=LOGGING_CONFIG,
+        )
+
+    def signal_handler(sig, frame):
+        print("主进程收到退出信号，准备退出...")
+        os._exit(0)  # 退出主进程
+
+    # 捕获主进程的退出信号
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+    port = int(config.port)
+    run_server(port)
 
 
 if __name__ == "__main__":

xiaomusic/config.py

@@ -16,12 +16,17 @@ def default_key_word_dict():
         "播放本地歌曲": "playlocal",
         "关机": "stop",
         "下一首": "play_next",
+        "上一首": "play_prev",
         "单曲循环": "set_play_type_one",
         "全部循环": "set_play_type_all",
         "随机播放": "set_random_play",
         "分钟后关机": "stop_after_minute",
         "播放列表": "play_music_list",
         "刷新列表": "gen_music_list",
+        "加入收藏": "add_to_favorites",
+        "收藏歌曲": "add_to_favorites",
+        "取消收藏": "del_from_favorites",
+        "播放列表第": "play_music_list_index",
     }
 
 
@@ -44,12 +49,17 @@ def default_key_match_order():
         "分钟后关机",
         "播放歌曲",
         "下一首",
+        "上一首",
         "单曲循环",
         "全部循环",
         "随机播放",
         "关机",
         "刷新列表",
+        "播放列表第",
         "播放列表",
+        "加入收藏",
+        "收藏歌曲",
+        "取消收藏",
     ]
 
 
@@ -69,13 +79,15 @@ class Config:
     account: str = os.getenv("MI_USER", "")
     password: str = os.getenv("MI_PASS", "")
     mi_did: str = os.getenv("MI_DID", "")  # 逗号分割支持多设备
+    miio_tts_command: str = os.getenv("MIIO_TTS_CMD", "")
     cookie: str = ""
     verbose: bool = os.getenv("XIAOMUSIC_VERBOSE", "").lower() == "true"
     music_path: str = os.getenv(
         "XIAOMUSIC_MUSIC_PATH", "music"
     )  # 只能是music目录下的子目录
-    download_path: str = os.getenv("XIAOMUSIC_DOWNLOAD_PATH", "")
+    download_path: str = os.getenv("XIAOMUSIC_DOWNLOAD_PATH", "music/download")
     conf_path: str = os.getenv("XIAOMUSIC_CONF_PATH", "conf")
+    cache_dir: str = os.getenv("XIAOMUSIC_CACHE_DIR", "cache")
     hostname: str = os.getenv("XIAOMUSIC_HOSTNAME", "192.168.2.5")
     port: int = int(os.getenv("XIAOMUSIC_PORT", "8090"))  # 监听端口
     public_port: int = int(os.getenv("XIAOMUSIC_PUBLIC_PORT", 0))  # 歌曲访问端口
@@ -85,9 +97,10 @@ class Config:
     )  # "bilisearch:" or "ytsearch:"
     ffmpeg_location: str = os.getenv("XIAOMUSIC_FFMPEG_LOCATION", "./ffmpeg/bin")
     active_cmd: str = os.getenv(
-        "XIAOMUSIC_ACTIVE_CMD", "play,set_random_play,playlocal,play_music_list,stop"
+        "XIAOMUSIC_ACTIVE_CMD",
+        "play,set_random_play,playlocal,play_music_list,play_music_list_index,stop_after_minute,stop",
     )
-    exclude_dirs: str = os.getenv("XIAOMUSIC_EXCLUDE_DIRS", "@eaDir")
+    exclude_dirs: str = os.getenv("XIAOMUSIC_EXCLUDE_DIRS", "@eaDir,tmp")
     music_path_depth: int = int(os.getenv("XIAOMUSIC_MUSIC_PATH_DEPTH", "10"))
     disable_httpauth: bool = (
         os.getenv("XIAOMUSIC_DISABLE_HTTPAUTH", "true").lower() == "true"
@@ -96,6 +109,7 @@ class Config:
     httpauth_password: str = os.getenv("XIAOMUSIC_HTTPAUTH_PASSWORD", "")
     music_list_url: str = os.getenv("XIAOMUSIC_MUSIC_LIST_URL", "")
     music_list_json: str = os.getenv("XIAOMUSIC_MUSIC_LIST_JSON", "")
+    custom_play_list_json: str = os.getenv("XIAOMUSIC_CUSTOM_PLAY_LIST_JSON", "")
     disable_download: bool = (
         os.getenv("XIAOMUSIC_DISABLE_DOWNLOAD", "false").lower() == "true"
     )
@@ -136,19 +150,36 @@ class Config:
     remove_id3tag: bool = (
         os.getenv("XIAOMUSIC_REMOVE_ID3TAG", "false").lower() == "true"
     )
+    convert_to_mp3: bool = os.getenv("CONVERT_TO_MP3", "false").lower() == "true"
+    delay_sec: int = int(os.getenv("XIAOMUSIC_DELAY_SEC", 3))  # 下一首歌延迟播放秒数
+    continue_play: bool = (
+        os.getenv("XIAOMUSIC_CONTINUE_PLAY", "false").lower() == "true"
+    )
+    pull_ask_sec: int = int(os.getenv("XIAOMUSIC_PULL_ASK_SEC", "1"))
+    crontab_json: str = os.getenv("XIAOMUSIC_CRONTAB_JSON", "")  # 定时任务
+    enable_yt_dlp_cookies: bool = (
+        os.getenv("XIAOMUSIC_ENABLE_YT_DLP_COOKIES", "false").lower() == "true"
+    )
+    get_ask_by_mina: bool = (
+        os.getenv("XIAOMUSIC_GET_ASK_BY_MINA", "false").lower() == "true"
+    )
 
     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)
+            if key:
+                self.key_word_dict[key] = action
+                if key not in self.key_match_order:
+                    self.key_match_order.append(key)
 
     def append_user_keyword(self):
         for k, v in self.user_key_word_dict.items():
             self.key_word_dict[k] = v
-            self.key_match_order.append(k)
+            if k not in self.key_match_order:
+                self.key_match_order.append(k)
 
     def init_keyword(self):
+        self.key_match_order = default_key_match_order()
+        self.key_word_dict = default_key_word_dict()
         self.append_keyword(self.keywords_playlocal, "playlocal")
         self.append_keyword(self.keywords_play, "play")
         self.append_keyword(self.keywords_stop, "stop")
@@ -216,3 +247,34 @@ class Config:
             if converted_value is not None:
                 setattr(self, k, converted_value)
         self.init_keyword()
+
+    # 获取设置文件
+    def getsettingfile(self):
+        # 兼容旧配置空的情况
+        if not self.conf_path:
+            self.conf_path = "conf"
+        if not os.path.exists(self.conf_path):
+            os.makedirs(self.conf_path)
+        filename = os.path.join(self.conf_path, "setting.json")
+        return filename
+
+    @property
+    def tag_cache_path(self):
+        if not os.path.exists(self.cache_dir):
+            os.makedirs(self.cache_dir)
+        filename = os.path.join(self.cache_dir, "tag_cache.json")
+        return filename
+
+    @property
+    def picture_cache_path(self):
+        cache_path = os.path.join(self.cache_dir, "picture_cache")
+        if not os.path.exists(cache_path):
+            os.makedirs(cache_path)
+        return cache_path
+
+    @property
+    def yt_dlp_cookies_path(self):
+        if not os.path.exists(self.conf_path):
+            os.makedirs(self.conf_path)
+        cookies_path = os.path.join(self.conf_path, "yt-dlp-cookie.txt")
+        return cookies_path

xiaomusic/const.py

@@ -19,3 +19,8 @@ PLAY_TYPE_TTS = {
     PLAY_TYPE_ALL: "已经设置为全部循环",
     PLAY_TYPE_RND: "已经设置为随机播放",
 }
+
+# 需要采用 mina 获取对话记录的设备型号
+GET_ASK_BY_MINA = {
+    "M01",
+}

xiaomusic/crontab.py

@@ -0,0 +1,98 @@
+import json
+
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+from apscheduler.triggers.cron import CronTrigger
+
+
+class Crontab:
+    def __init__(self, log):
+        self.log = log
+        self.scheduler = AsyncIOScheduler()
+
+    def start(self):
+        self.scheduler.start()
+
+    def add_job(self, expression, job):
+        try:
+            trigger = CronTrigger.from_crontab(expression)
+            self.scheduler.add_job(job, trigger)
+        except ValueError as e:
+            self.log.error(f"Invalid crontab expression {e}")
+        except Exception as e:
+            self.log.exception(f"Execption {e}")
+
+    # 添加关机任务
+    def add_job_stop(self, expression, xiaomusic, did, **kwargs):
+        async def job():
+            await xiaomusic.stop(did, "notts")
+
+        self.add_job(expression, job)
+
+    # 添加播放任务
+    def add_job_play(self, expression, xiaomusic, did, arg1, **kwargs):
+        async def job():
+            await xiaomusic.play(did, arg1)
+
+        self.add_job(expression, job)
+
+    # 添加播放列表任务
+    def add_job_play_music_list(self, expression, xiaomusic, did, arg1, **kwargs):
+        async def job():
+            await xiaomusic.play_music_list(did, arg1)
+
+        self.add_job(expression, job)
+
+    # 添加语音播放任务
+    def add_job_tts(self, expression, xiaomusic, did, arg1, **kwargs):
+        async def job():
+            xiaomusic.do_tts(did, arg1)
+
+        self.add_job(expression, job)
+
+    # 刷新播放列表任务
+    def add_job_refresh_music_list(self, expression, xiaomusic, **kwargs):
+        async def job():
+            await xiaomusic.gen_music_list()
+
+        self.add_job(expression, job)
+
+    def add_job_cron(self, xiaomusic, cron):
+        expression = cron["expression"]  # cron 计划格式
+        name = cron["name"]  # stop, play, play_music_list, tts
+        did = cron["did"]
+        arg1 = cron.get("arg1", "")
+        jobname = f"add_job_{name}"
+        func = getattr(self, jobname, None)
+        if callable(func):
+            func(expression, xiaomusic, did=did, arg1=arg1)
+            self.log.info(
+                f"crontab add_job_cron ok. did:{did}, name:{name}, arg1:{arg1}"
+            )
+        else:
+            self.log.error(
+                f"'{self.__class__.__name__}' object has no attribute '{jobname}'"
+            )
+
+    # 清空任务
+    def clear_jobs(self):
+        for job in self.scheduler.get_jobs():
+            try:
+                job.remove()
+            except Exception as e:
+                self.log.exception(f"Execption {e}")
+
+    # 重新加载计划任务
+    def reload_config(self, xiaomusic):
+        self.clear_jobs()
+
+        crontab_json = xiaomusic.config.crontab_json
+        if not crontab_json:
+            return
+
+        try:
+            cron_list = json.loads(crontab_json)
+            for cron in cron_list:
+                self.add_job_cron(xiaomusic, cron)
+            self.log.info("crontab reload_config ok")
+        except Exception as e:
+            self.log.exception(f"Execption {e}")

xiaomusic/httpserver.py

@@ -1,24 +1,50 @@
 import asyncio
+import hashlib
 import json
+import mimetypes
 import os
+import re
 import secrets
 import shutil
 import tempfile
+import urllib.parse
 from contextlib import asynccontextmanager
 from dataclasses import asdict
 from typing import Annotated
 
-from fastapi import Depends, FastAPI, HTTPException, Request, status
+import aiofiles
+from fastapi import (
+    Depends,
+    FastAPI,
+    File,
+    HTTPException,
+    Query,
+    Request,
+    UploadFile,
+    status,
+)
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
+from fastapi.openapi.utils import get_openapi
+from fastapi.responses import RedirectResponse, StreamingResponse
 from fastapi.security import HTTPBasic, HTTPBasicCredentials
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
 from starlette.background import BackgroundTask
-from starlette.responses import FileResponse
+from starlette.responses import FileResponse, Response
 
 from xiaomusic import __version__
 from xiaomusic.utils import (
+    convert_file_to_mp3,
     deepcopy_data_no_sensitive_info,
+    download_one_music,
+    download_playlist,
     downloadfile,
+    get_latest_version,
+    is_mp3,
+    remove_common_prefix,
+    remove_id3_tags,
+    try_add_access_control_param,
 )
 
 xiaomusic = None
@@ -29,9 +55,11 @@ log = None
 @asynccontextmanager
 async def app_lifespan(app):
     if xiaomusic is not None:
-        task = asyncio.create_task(xiaomusic.run_forever())
+        asyncio.create_task(xiaomusic.run_forever())
+    try:
         yield
-        task.cancel()
+    except Exception as e:
+        log.exception(f"Execption {e}")
 
 
 security = HTTPBasic()
@@ -66,7 +94,17 @@ def no_verification():
 app = FastAPI(
     lifespan=app_lifespan,
     version=__version__,
-    dependencies=[Depends(verification)],
+    docs_url=None,
+    redoc_url=None,
+    openapi_url=None,
+)
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],  # 允许访问的源
+    allow_credentials=False,  # 支持 cookie
+    allow_methods=["*"],  # 允许使用的请求方法
+    allow_headers=["*"],  # 允许携带的 Headers
 )
 
 
@@ -77,13 +115,16 @@ def reset_http_server():
     else:
         app.dependency_overrides = {}
 
-    # 更新 music 链接
-    app.router.routes = [route for route in app.router.routes if route.path != "/music"]
-    app.mount(
-        "/music",
-        StaticFiles(directory=config.music_path, follow_symlink=True),
-        name="music",
-    )
+
+class AuthStaticFiles(StaticFiles):
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+    async def __call__(self, scope, receive, send) -> None:
+        request = Request(scope, receive)
+        if not config.disable_httpauth:
+            assert verification(await security(request))
+        await super().__call__(scope, receive, send)
 
 
 def HttpInit(_xiaomusic):
@@ -93,24 +134,24 @@ def HttpInit(_xiaomusic):
     log = xiaomusic.log
 
     folder = os.path.dirname(__file__)
-    app.mount("/static", StaticFiles(directory=f"{folder}/static"), name="static")
+    app.mount("/static", AuthStaticFiles(directory=f"{folder}/static"), name="static")
     reset_http_server()
 
 
 @app.get("/")
-async def read_index():
+async def read_index(Verifcation=Depends(verification)):
     folder = os.path.dirname(__file__)
     return FileResponse(f"{folder}/static/index.html")
 
 
 @app.get("/getversion")
-def getversion():
+def getversion(Verifcation=Depends(verification)):
     log.debug("getversion %s", __version__)
     return {"version": __version__}
 
 
 @app.get("/getvolume")
-async def getvolume(did: str = ""):
+async def getvolume(did: str = "", Verifcation=Depends(verification)):
     if not xiaomusic.did_exist(did):
         return {"volume": 0}
 
@@ -124,7 +165,7 @@ class DidVolume(BaseModel):
 
 
 @app.post("/setvolume")
-async def setvolume(data: DidVolume):
+async def setvolume(data: DidVolume, Verifcation=Depends(verification)):
     did = data.did
     volume = data.volume
     if not xiaomusic.did_exist(did):
@@ -136,21 +177,27 @@ async def setvolume(data: DidVolume):
 
 
 @app.get("/searchmusic")
-def searchmusic(name: str = ""):
+def searchmusic(name: str = "", Verifcation=Depends(verification)):
     return xiaomusic.searchmusic(name)
 
 
 @app.get("/playingmusic")
-def playingmusic(did: str = ""):
+def playingmusic(did: str = "", Verifcation=Depends(verification)):
     if not xiaomusic.did_exist(did):
         return {"ret": "Did not exist"}
 
     is_playing = xiaomusic.isplaying(did)
     cur_music = xiaomusic.playingmusic(did)
+    cur_playlist = xiaomusic.get_cur_play_list(did)
+    # 播放进度
+    offset, duration = xiaomusic.get_offset_duration(did)
     return {
         "ret": "OK",
         "is_playing": is_playing,
         "cur_music": cur_music,
+        "cur_playlist": cur_playlist,
+        "offset": offset,
+        "duration": duration,
     }
 
 
@@ -160,7 +207,7 @@ class DidCmd(BaseModel):
 
 
 @app.post("/cmd")
-async def do_cmd(data: DidCmd):
+async def do_cmd(data: DidCmd, Verifcation=Depends(verification)):
     did = data.did
     cmd = data.cmd
     log.info(f"docmd. did:{did} cmd:{cmd}")
@@ -168,15 +215,30 @@ async def do_cmd(data: DidCmd):
         return {"ret": "Did not exist"}
 
     if len(cmd) > 0:
-        asyncio.create_task(xiaomusic.do_check_cmd(did=did, query=cmd))
+        try:
+            await xiaomusic.cancel_all_tasks()
+            task = asyncio.create_task(xiaomusic.do_check_cmd(did=did, query=cmd))
+            xiaomusic.append_running_task(task)
+        except Exception as e:
+            log.warning(f"Execption {e}")
         return {"ret": "OK"}
     return {"ret": "Unknow cmd"}
 
 
+@app.get("/cmdstatus")
+async def cmd_status(Verifcation=Depends(verification)):
+    finish = await xiaomusic.is_task_finish()
+    if finish:
+        return {"ret": "OK", "status": "finish"}
+    return {"ret": "OK", "status": "running"}
+
+
 @app.get("/getsetting")
-async def getsetting(need_device_list: bool = False):
+async def getsetting(need_device_list: bool = False, Verifcation=Depends(verification)):
     config = xiaomusic.getconfig()
     data = asdict(config)
+    data["password"] = "******"
+    data["httpauth_password"] = "******"
     if need_device_list:
         device_list = await xiaomusic.getalldevices()
         log.info(f"getsetting device_list: {device_list}")
@@ -185,12 +247,17 @@ async def getsetting(need_device_list: bool = False):
 
 
 @app.post("/savesetting")
-async def savesetting(request: Request):
+async def savesetting(request: Request, Verifcation=Depends(verification)):
     try:
         data_json = await request.body()
         data = json.loads(data_json.decode("utf-8"))
         debug_data = deepcopy_data_no_sensitive_info(data)
         log.info(f"saveconfig: {debug_data}")
+        config = xiaomusic.getconfig()
+        if data["password"] == "******" or data["password"] == "":
+            data["password"] = config.password
+        if data["httpauth_password"] == "******" or data["httpauth_password"] == "":
+            data["httpauth_password"] = config.httpauth_password
         await xiaomusic.saveconfig(data)
         reset_http_server()
         return "save success"
@@ -203,8 +270,42 @@ async def musiclist(Verifcation=Depends(verification)):
     return xiaomusic.get_music_list()
 
 
+@app.get("/musicinfo")
+async def musicinfo(
+    name: str, musictag: bool = False, Verifcation=Depends(verification)
+):
+    url = xiaomusic.get_music_url(name)
+    info = {
+        "ret": "OK",
+        "name": name,
+        "url": url,
+    }
+    if musictag:
+        info["tags"] = xiaomusic.get_music_tags(name)
+    return info
+
+
+@app.get("/musicinfos")
+async def musicinfos(
+    name: list[str] = Query(None),
+    musictag: bool = False,
+    Verifcation=Depends(verification),
+):
+    ret = []
+    for music_name in name:
+        url = xiaomusic.get_music_url(music_name)
+        info = {
+            "name": music_name,
+            "url": url,
+        }
+        if musictag:
+            info["tags"] = xiaomusic.get_music_tags(music_name)
+        ret.append(info)
+    return ret
+
+
 @app.get("/curplaylist")
-async def curplaylist(did: str = ""):
+async def curplaylist(did: str = "", Verifcation=Depends(verification)):
     if not xiaomusic.did_exist(did):
         return ""
     return xiaomusic.get_cur_play_list(did)
@@ -215,7 +316,7 @@ class MusicItem(BaseModel):
 
 
 @app.post("/delmusic")
-def delmusic(data: MusicItem):
+def delmusic(data: MusicItem, Verifcation=Depends(verification)):
     log.info(data)
     xiaomusic.del_music(data.name)
     return "success"
@@ -226,7 +327,7 @@ class UrlInfo(BaseModel):
 
 
 @app.post("/downloadjson")
-async def downloadjson(data: UrlInfo):
+async def downloadjson(data: UrlInfo, Verifcation=Depends(verification)):
     log.info(data)
     url = data.url
     content = ""
@@ -274,16 +375,24 @@ def downloadlog(Verifcation=Depends(verification)):
 
 
 @app.get("/playurl")
-async def playurl(did: str, url: str):
+async def playurl(did: str, url: str, Verifcation=Depends(verification)):
     if not xiaomusic.did_exist(did):
         return {"ret": "Did not exist"}
+    decoded_url = urllib.parse.unquote(url)
+    log.info(f"playurl did: {did} url: {decoded_url}")
+    return await xiaomusic.play_url(did=did, arg1=decoded_url)
 
-    log.info(f"playurl did: {did} url: {url}")
-    return await xiaomusic.play_url(did=did, arg1=url)
+
+@app.post("/refreshmusictag")
+async def refreshmusictag(Verifcation=Depends(verification)):
+    xiaomusic.refresh_music_tag()
+    return {
+        "ret": "OK",
+    }
 
 
 @app.post("/debug_play_by_music_url")
-async def debug_play_by_music_url(request: Request):
+async def debug_play_by_music_url(request: Request, Verifcation=Depends(verification)):
     try:
         data = await request.body()
         data_dict = json.loads(data.decode("utf-8"))
@@ -291,3 +400,232 @@ async def debug_play_by_music_url(request: Request):
         return await xiaomusic.debug_play_by_music_url(arg1=data_dict)
     except json.JSONDecodeError as err:
         raise HTTPException(status_code=400, detail="Invalid JSON") from err
+
+
+@app.get("/latestversion")
+async def latest_version(Verifcation=Depends(verification)):
+    version = await get_latest_version("xiaomusic")
+    if version:
+        return {"ret": "OK", "version": version}
+    else:
+        return {"ret": "Fetch version failed"}
+
+
+class DownloadPlayList(BaseModel):
+    dirname: str
+    url: str
+
+
+# 下载歌单
+@app.post("/downloadplaylist")
+async def downloadplaylist(data: DownloadPlayList, Verifcation=Depends(verification)):
+    try:
+        download_proc = await download_playlist(config, data.url, data.dirname)
+
+        async def check_download_proc():
+            # 等待子进程完成
+            exit_code = await download_proc.wait()
+            log.info(f"Download completed with exit code {exit_code}")
+
+            dir_path = os.path.join(config.download_path, data.dirname)
+            log.debug(f"Download dir_path: {dir_path}")
+            # 可能只是部分失败，都需要整理下载目录
+            remove_common_prefix(dir_path)
+
+        asyncio.create_task(check_download_proc())
+        return {"ret": "OK"}
+    except Exception as e:
+        log.exception(f"Execption {e}")
+
+    return {"ret": "Failed download"}
+
+
+class DownloadOneMusic(BaseModel):
+    name: str = ""
+    url: str
+
+
+# 下载单首歌曲
+@app.post("/downloadonemusic")
+async def downloadonemusic(data: DownloadOneMusic, Verifcation=Depends(verification)):
+    try:
+        await download_one_music(config, data.url, data.name)
+        return {"ret": "OK"}
+    except Exception as e:
+        log.exception(f"Execption {e}")
+
+    return {"ret": "Failed download"}
+
+
+# 上传 yt-dlp cookies
+@app.post("/uploadytdlpcookie")
+async def upload_yt_dlp_cookie(file: UploadFile = File(...)):
+    with open(config.yt_dlp_cookies_path, "wb") as buffer:
+        shutil.copyfileobj(file.file, buffer)
+    return {
+        "ret": "OK",
+        "filename": file.filename,
+        "file_location": config.yt_dlp_cookies_path,
+    }
+
+
+async def file_iterator(file_path, start, end):
+    async with aiofiles.open(file_path, mode="rb") as file:
+        await file.seek(start)
+        chunk_size = 1024
+        while start <= end:
+            read_size = min(chunk_size, end - start + 1)
+            data = await file.read(read_size)
+            if not data:
+                break
+            start += len(data)
+            yield data
+
+
+def access_key_verification(file_path, key, code):
+    if config.disable_httpauth:
+        return True
+
+    log.debug(f"访问限制接收端[{file_path}, {key}, {code}]")
+    if key is not None:
+        current_key_bytes = key.encode("utf8")
+        correct_key_bytes = (
+            config.httpauth_username + config.httpauth_password
+        ).encode("utf8")
+        is_correct_key = secrets.compare_digest(correct_key_bytes, current_key_bytes)
+        if is_correct_key:
+            return True
+
+    if code is not None:
+        current_code_bytes = code.encode("utf8")
+        correct_code_bytes = (
+            hashlib.sha256(
+                (
+                    file_path + config.httpauth_username + config.httpauth_password
+                ).encode("utf-8")
+            )
+            .hexdigest()
+            .encode("utf-8")
+        )
+        is_correct_code = secrets.compare_digest(correct_code_bytes, current_code_bytes)
+        if is_correct_code:
+            return True
+
+    return False
+
+
+range_pattern = re.compile(r"bytes=(\d+)-(\d*)")
+
+
+def safe_redirect(url):
+    url = try_add_access_control_param(config, url)
+    url = url.replace("\\", "")
+    if not urllib.parse.urlparse(url).netloc and not urllib.parse.urlparse(url).scheme:
+        log.debug(f"redirect to {url}")
+        return RedirectResponse(url=url)
+    return None
+
+
+@app.get("/music/{file_path:path}")
+async def music_file(request: Request, file_path: str, key: str = "", code: str = ""):
+    if not access_key_verification(f"/music/{file_path}", key, code):
+        raise HTTPException(status_code=404, detail="File not found")
+
+    absolute_path = os.path.abspath(config.music_path)
+    absolute_file_path = os.path.normpath(os.path.join(absolute_path, file_path))
+    if not absolute_file_path.startswith(absolute_path):
+        raise HTTPException(status_code=404, detail="File not found")
+    if not os.path.exists(absolute_file_path):
+        raise HTTPException(status_code=404, detail="File not found")
+
+    # 移除MP3 ID3 v2标签和填充，减少播放前延迟
+    if config.remove_id3tag and is_mp3(file_path):
+        log.info(f"remove_id3tag:{config.remove_id3tag}, is_mp3:True ")
+        temp_mp3_file = remove_id3_tags(absolute_file_path, config)
+        if temp_mp3_file:
+            log.info(f"ID3 tag removed {absolute_file_path} to {temp_mp3_file}")
+            redirect = safe_redirect(f"/music/{temp_mp3_file}")
+            if redirect:
+                return redirect
+        else:
+            log.info(f"No ID3 tag remove needed: {absolute_file_path}")
+
+    if config.convert_to_mp3 and not is_mp3(file_path):
+        temp_mp3_file = convert_file_to_mp3(absolute_file_path, config)
+        if temp_mp3_file:
+            log.info(f"Converted file: {absolute_file_path} to {temp_mp3_file}")
+            redirect = safe_redirect(f"/music/{temp_mp3_file}")
+            if redirect:
+                return redirect
+        else:
+            log.warning(f"Failed to convert file to MP3 format: {absolute_file_path}")
+
+    file_size = os.path.getsize(absolute_file_path)
+    range_start, range_end = 0, file_size - 1
+
+    range_header = request.headers.get("Range")
+    log.info(f"music_file range_header {range_header}")
+    if range_header:
+        range_match = range_pattern.match(range_header)
+        if range_match:
+            range_start = int(range_match.group(1))
+        if range_match.group(2):
+            range_end = int(range_match.group(2))
+
+        log.info(f"music_file in range {absolute_file_path}")
+
+    log.info(f"music_file {range_start} {range_end} {absolute_file_path}")
+    headers = {
+        "Content-Range": f"bytes {range_start}-{range_end}/{file_size}",
+        "Accept-Ranges": "bytes",
+    }
+    mime_type, _ = mimetypes.guess_type(file_path)
+    if mime_type is None:
+        mime_type = "application/octet-stream"
+    return StreamingResponse(
+        file_iterator(absolute_file_path, range_start, range_end),
+        headers=headers,
+        status_code=206 if range_header else 200,
+        media_type=mime_type,
+    )
+
+
+@app.options("/music/{file_path:path}")
+async def music_options():
+    headers = {
+        "Accept-Ranges": "bytes",
+    }
+    return Response(headers=headers)
+
+
+@app.get("/picture/{file_path:path}")
+async def get_picture(request: Request, file_path: str, key: str = "", code: str = ""):
+    if not access_key_verification(f"/picture/{file_path}", key, code):
+        raise HTTPException(status_code=404, detail="File not found")
+
+    absolute_path = os.path.abspath(config.picture_cache_path)
+    absolute_file_path = os.path.normpath(os.path.join(absolute_path, file_path))
+    if not absolute_file_path.startswith(absolute_path):
+        raise HTTPException(status_code=404, detail="File not found")
+    if not os.path.exists(absolute_file_path):
+        raise HTTPException(status_code=404, detail="File not found")
+
+    mime_type, _ = mimetypes.guess_type(absolute_file_path)
+    if mime_type is None:
+        mime_type = "image/jpeg"
+    return FileResponse(absolute_file_path, media_type=mime_type)
+
+
+@app.get("/docs", include_in_schema=False)
+async def get_swagger_documentation(Verifcation=Depends(verification)):
+    return get_swagger_ui_html(openapi_url="/openapi.json", title="docs")
+
+
+@app.get("/redoc", include_in_schema=False)
+async def get_redoc_documentation(Verifcation=Depends(verification)):
+    return get_redoc_html(openapi_url="/openapi.json", title="docs")
+
+
+@app.get("/openapi.json", include_in_schema=False)
+async def openapi(Verifcation=Depends(verification)):
+    return get_openapi(title=app.title, version=app.version, routes=app.routes)

xiaomusic/static/app.js

@@ -1,270 +0,0 @@
-$(function(){
-  $container=$("#cmds");
-
-  const PLAY_TYPE_ONE = 0; // 单曲循环
-  const PLAY_TYPE_ALL = 1; // 全部循环
-  const PLAY_TYPE_RND = 2; // 随机播放
-  append_op_button("play_type_all", "全部循环", "全部循环");
-  append_op_button("play_type_one", "单曲循环", "单曲循环");
-  append_op_button("play_type_rnd", "随机播放", "随机播放");
-
-  append_op_button_name("刷新列表");
-  append_op_button_name("下一首");
-  append_op_button_name("关机");
-
-  $container.append($("<hr>"));
-
-  append_op_button_name("10分钟后关机");
-  append_op_button_name("30分钟后关机");
-  append_op_button_name("60分钟后关机");
-
-  // 拉取现有配置
-  $.get("/getsetting", function(data, status) {
-    console.log(data, status);
-    localStorage.setItem('mi_did', data.mi_did);
-
-    var did = localStorage.getItem('cur_did');
-    var dids = [];
-    if (data.mi_did != null) {
-      dids = data.mi_did.split(',');
-    }
-    console.log('cur_did', did);
-    console.log('dids', dids);
-    if ((dids.length > 0) && (did == null || did == "" || !dids.includes(did))) {
-      did = dids[0];
-      localStorage.setItem('cur_did', did);
-    }
-
-    window.did = did;
-    $.get(`/getvolume?did=${did}`, function(data, status) {
-      console.log(data, status, data["volume"]);
-      $("#volume").val(data.volume);
-    });
-    refresh_music_list();
-
-    $("#did").empty();
-    var dids = data.mi_did.split(',');
-    $.each(dids, function(index, value) {
-      var cur_device = Object.values(data.devices).find(device => device.did === value);
-      if (cur_device) {
-        var option = $('<option></option>')
-            .val(value)
-            .text(cur_device.name)
-            .prop('selected', value === did);
-        $("#did").append(option);
-
-        if (cur_device.play_type == PLAY_TYPE_ALL) {
-          $("#play_type_all").css('background-color', '#b1a8f3');
-          $("#play_type_all").text('✔️ 全部循环');
-        } else if (cur_device.play_type == PLAY_TYPE_ONE) {
-          $("#play_type_one").css('background-color', '#b1a8f3');
-          $("#play_type_one").text('✔️ 单曲循环');
-        } else if (cur_device.play_type == PLAY_TYPE_RND) {
-          $("#play_type_rnd").css('background-color', '#b1a8f3');
-          $("#play_type_rnd").text('✔️ 随机播放');
-        }
-      }
-    });
-
-    console.log('cur_did', did);
-    $('#did').change(function() {
-      did = $(this).val();
-      localStorage.setItem('cur_did', did);
-      window.did = did;
-      console.log('cur_did', did);
-    })
-  });
-
-  // 拉取版本
-  $.get("/getversion", function(data, status) {
-    console.log(data, status, 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) {
-        $('#music_list').append($('<option></option>').val(key).text(key));
-      });
-
-      $('#music_list').change(function() {
-        const selectedValue = $(this).val();
-        $('#music_name').empty();
-        const sorted_musics = data[selectedValue].sort(custom_sort_key);
-        $.each(sorted_musics, function(index, item) {
-          $('#music_name').append($('<option></option>').val(item).text(item));
-        });
-      });
-
-      $('#music_list').trigger('change');
-
-      // 获取当前播放列表
-      $.get(`curplaylist?did=${did}`, function(data, status) {
-        if (data != "") {
-          $('#music_list').val(data);
-          $('#music_list').trigger('change');
-        }
-      })
-    })
-
-    // 每3秒获取下正在播放的音乐
-    get_playing_music();
-    setInterval(() => {
-      get_playing_music();
-    }, 3000);
-  }
-
-  $("#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}&did=${did}`, function(data, status) {
-      console.log(data);
-    });
-  });
-
-  function append_op_button_name(name) {
-    append_op_button(null, name, name);
-  }
-
-  function append_op_button(id, name, cmd) {
-    // 创建按钮
-    const $button = $("<button>");
-    $button.text(name);
-    $button.attr("type", "button");
-    if (id !== null) {
-      $button.attr("id", id);
-    }
-
-    // 设置按钮点击事件
-    $button.on("click", () => {
-      sendcmd(cmd);
-    });
-
-    // 添加按钮到容器
-    $container.append($button);
-  }
-
-  $("#play").on("click", () => {
-    var search_key = $("#music-name").val();
-    var filename = $("#music-filename").val();
-    let cmd = "播放歌曲" + search_key + "|" + filename;
-    sendcmd(cmd);
-  });
-
-  $("#volume").on('change', function () {
-    var value = $(this).val();
-    $.ajax({
-      type: "POST",
-      url: "/setvolume",
-      contentType: "application/json; charset=utf-8",
-      data: JSON.stringify({did: did, volume: value}),
-      success: () => {
-      },
-      error: () => {
-      }
-    });
-  });
-
-  function sendcmd(cmd) {
-    $.ajax({
-      type: "POST",
-      url: "/cmd",
-      contentType: "application/json; charset=utf-8",
-      data: JSON.stringify({did: did, cmd: cmd}),
-      success: () => {
-        if (cmd == "刷新列表") {
-          setTimeout(refresh_music_list, 3000);
-        }
-        if (["全部循环", "单曲循环", "随机播放"].includes(cmd)) {
-          location.reload();
-        }
-      },
-      error: () => {
-        // 请求失败时执行的操作
-      }
-    });
-  }
-
-  // 监听输入框的输入事件
-  $("#music-name").on('input', function() {
-    var inputValue = $(this).val();
-    // 发送Ajax请求
-    $.ajax({
-      url: "searchmusic", // 服务器端处理脚本
-      type: "GET",
-      dataType: "json",
-      data: {
-        name: inputValue
-      },
-      success: function(data) {
-        // 清空datalist
-        $("#autocomplete-list").empty();
-        // 添加新的option元素
-        $.each(data, function(i, item) {
-          $('<option>').val(item).appendTo("#autocomplete-list");
-        });
-      }
-    });
-  });
-
-  function get_playing_music() {
-    $.get(`/playingmusic?did=${did}`, function(data, status) {
-      console.log(data);
-      if (data.ret == "OK") {
-        if (data.is_playing) {
-          $("#playering-music").text(`【播放中】 ${data.cur_music}`);
-        } else {
-          $("#playering-music").text(`【空闲中】 ${data.cur_music}`);
-        }
-      }
-    });
-  }
-
-  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/default/app.js

@@ -0,0 +1,423 @@
+$(function(){
+  $container=$("#cmds");
+
+  append_op_button_name("加入收藏");
+  append_op_button_name("取消收藏");
+
+  const PLAY_TYPE_ONE = 0; // 单曲循环
+  const PLAY_TYPE_ALL = 1; // 全部循环
+  const PLAY_TYPE_RND = 2; // 随机播放
+  append_op_button("play_type_all", "全部循环", "全部循环");
+  append_op_button("play_type_one", "单曲循环", "单曲循环");
+  append_op_button("play_type_rnd", "随机播放", "随机播放");
+
+  append_op_button_name("上一首");
+  append_op_button_name("关机");
+  append_op_button_name("下一首");
+
+  append_op_button_name("刷新列表");
+
+  $container.append($("<hr>"));
+
+  append_op_button_name("10分钟后关机");
+  append_op_button_name("30分钟后关机");
+  append_op_button_name("60分钟后关机");
+
+  var offset = 0;
+  var duration = 0;
+
+  // 拉取现有配置
+  $.get("/getsetting", function(data, status) {
+    console.log(data, status);
+    localStorage.setItem('mi_did', data.mi_did);
+
+    var did = localStorage.getItem('cur_did');
+    var dids = [];
+    if (data.mi_did != null) {
+      dids = data.mi_did.split(',');
+    }
+    console.log('cur_did', did);
+    console.log('dids', dids);
+    if ((dids.length > 0) && (did == null || did == "" || !dids.includes(did))) {
+      did = dids[0];
+      localStorage.setItem('cur_did', did);
+    }
+
+    window.did = did;
+    $.get(`/getvolume?did=${did}`, function(data, status) {
+      console.log(data, status, data["volume"]);
+      $("#volume").val(data.volume);
+    });
+    refresh_music_list();
+
+    $("#did").empty();
+    var dids = data.mi_did.split(',');
+    $.each(dids, function(index, value) {
+      var cur_device = Object.values(data.devices).find(device => device.did === value);
+      if (cur_device) {
+        var option = $('<option></option>')
+            .val(value)
+            .text(cur_device.name)
+            .prop('selected', value === did);
+        $("#did").append(option);
+
+        if (value === did) {
+          if (cur_device.play_type == PLAY_TYPE_ALL) {
+            $("#play_type_all").css('background-color', '#b1a8f3');
+            $("#play_type_all").text('✔️ 全部循环');
+          } else if (cur_device.play_type == PLAY_TYPE_ONE) {
+            $("#play_type_one").css('background-color', '#b1a8f3');
+            $("#play_type_one").text('✔️ 单曲循环');
+          } else if (cur_device.play_type == PLAY_TYPE_RND) {
+            $("#play_type_rnd").css('background-color', '#b1a8f3');
+            $("#play_type_rnd").text('✔️ 随机播放');
+          }
+        }
+      }
+    });
+
+    console.log('cur_did', did);
+    $('#did').change(function() {
+      did = $(this).val();
+      localStorage.setItem('cur_did', did);
+      window.did = did;
+      console.log('cur_did', did);
+      location.reload();
+    })
+  });
+
+  function compareVersion(version1, version2) {
+    const v1 = version1.split('.').map(Number);
+    const v2 = version2.split('.').map(Number);
+    const len = Math.max(v1.length, v2.length);
+
+    for (let i = 0; i < len; i++) {
+      const num1 = v1[i] || 0;
+      const num2 = v2[i] || 0;
+      if (num1 > num2) return 1;
+      if (num1 < num2) return -1;
+    }
+    return 0;
+  }
+
+  // 拉取版本
+  $.get("/getversion", function(data, status) {
+    console.log(data, status, data["version"]);
+    $("#version").text(`${data.version}`);
+
+    $.get("/latestversion", function(ret, status) {
+      console.log(ret, status);
+      if (ret.ret == "OK") {
+        const result = compareVersion(ret.version, data.version);
+        if (result > 0) {
+          console.log(`${ret.version} is greater than ${data.version}`);
+          $("#versionnew").text("🆕");
+        }
+      }
+    });
+  });
+
+  function _refresh_music_list(callback) {
+    $('#music_list').empty();
+    $.get("/musiclist", function(data, status) {
+      console.log(data, status);
+      $.each(data, function(key, value) {
+        let cnt = value.length;
+        $('#music_list').append($('<option></option>').val(key).text(`${key} (${cnt})`));
+      });
+
+      $('#music_list').change(function() {
+        const selectedValue = $(this).val();
+        localStorage.setItem('cur_playlist', selectedValue);
+        $('#music_name').empty();
+        $.each(data[selectedValue], function(index, item) {
+          $('#music_name').append($('<option></option>').val(item).text(item));
+        });
+      });
+
+      $('#music_list').trigger('change');
+
+      // 获取当前播放列表
+      $.get(`/curplaylist?did=${did}`, function(playlist, status) {
+        if (playlist != "") {
+          $('#music_list').val(playlist);
+          $('#music_list').trigger('change');
+        } else {
+          // 使用本地记录的
+          playlist = localStorage.getItem('cur_playlist');
+          if (data.includes(playlist)) {
+            $('#music_list').val(playlist);
+            $('#music_list').trigger('change');
+          }
+        }
+      })
+      callback();
+    })
+  }
+
+  // 拉取播放列表
+  function refresh_music_list() {
+    // 刷新列表时清空并临时禁用搜索框
+    const searchInput = document.getElementById('search');
+    const oriPlaceHolder = searchInput.placeholder
+    const oriValue = searchInput.value
+    const inputEvent = new Event('input', { bubbles: true });
+    searchInput.value = '';
+    // 分发事件，让其他控件改变状态
+    searchInput.dispatchEvent(inputEvent);
+    searchInput.disabled = true;
+    searchInput.placeholder = '请等待...';
+
+    _refresh_music_list(() => {
+      // 刷新完成再启用
+      searchInput.disabled = false;
+      searchInput.value = oriValue
+      searchInput.dispatchEvent(inputEvent);
+      searchInput.placeholder = oriPlaceHolder;
+      // 每3秒获取下正在播放的音乐
+      get_playing_music();
+      setInterval(() => {
+        get_playing_music();
+      }, 3000);
+    });
+  }
+
+  $("#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);
+  });
+
+  $("#web_play").on("click", () => {
+    const music_name = $("#music_name").val();
+    $.get(`/musicinfo?name=${music_name}`, function(data, status) {
+      console.log(data);
+      if (data.ret == "OK") {
+        $('audio').attr('src',data.url);
+      }
+    });
+  });
+
+  $("#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();
+    const encoded_url = encodeURIComponent(url);
+    $.get(`/playurl?url=${encoded_url}&did=${did}`, function(data, status) {
+      console.log(data);
+    });
+  });
+
+  function append_op_button_name(name) {
+    append_op_button(null, name, name);
+  }
+
+  function append_op_button(id, name, cmd) {
+    // 创建按钮
+    const $button = $("<button>");
+    $button.text(name);
+    $button.attr("type", "button");
+    if (id !== null) {
+      $button.attr("id", id);
+    }
+
+    // 设置按钮点击事件
+    $button.on("click", () => {
+      sendcmd(cmd);
+    });
+
+    // 添加按钮到容器
+    $container.append($button);
+  }
+
+  $("#play").on("click", () => {
+    var search_key = $("#music-name").val();
+    var filename = $("#music-filename").val();
+    let cmd = "播放歌曲" + search_key + "|" + filename;
+    sendcmd(cmd);
+  });
+
+  $("#volume").on('change', function () {
+    var value = $(this).val();
+    $.ajax({
+      type: "POST",
+      url: "/setvolume",
+      contentType: "application/json; charset=utf-8",
+      data: JSON.stringify({did: did, volume: value}),
+      success: () => {
+      },
+      error: () => {
+      }
+    });
+  });
+
+  function check_status_refresh_music_list(retries) {
+    $.get("/cmdstatus", function(data) {
+      if (data.status === "finish") {
+        refresh_music_list();
+      } else if (retries > 0) {
+        setTimeout(function() {
+          check_status_refresh_music_list(retries - 1);
+        }, 1000); // 等待1秒后重试
+      }
+    });
+  }
+
+  function sendcmd(cmd) {
+    $.ajax({
+      type: "POST",
+      url: "/cmd",
+      contentType: "application/json; charset=utf-8",
+      data: JSON.stringify({did: did, cmd: cmd}),
+      success: () => {
+        if (cmd == "刷新列表") {
+          check_status_refresh_music_list(3); // 最多重试3次
+        }
+        if (["全部循环", "单曲循环", "随机播放"].includes(cmd)) {
+          location.reload();
+        }
+      },
+      error: () => {
+        // 请求失败时执行的操作
+      }
+    });
+  }
+
+	// 监听输入框的输入事件
+  function debounce(func, delay) {
+		let timeout;
+		return function(...args) {
+			clearTimeout(timeout);
+			timeout = setTimeout(() => func.apply(this, args), delay);
+		};
+	}
+
+  const searchInput = document.getElementById('search');
+  const musicSelect = document.getElementById('music-name');
+  const musicSelectLabel = document.getElementById('music-name-label');
+
+  searchInput.addEventListener('input', debounce(function() {
+    const query = searchInput.value.trim();
+
+    if (query.length === 0) {
+      musicSelect.innerHTML = '';
+      musicSelect.style.display = 'none'
+      musicSelectLabel.style.display = 'none'
+      return;
+    }
+
+    musicSelect.style.display = 'block'
+    musicSelectLabel.style.display = 'block'
+    fetch(`/searchmusic?name=${encodeURIComponent(query)}`)
+      .then(response => response.json())
+      .then(data => {
+        musicSelect.innerHTML = ''; // 清空现有选项
+
+        // 找到的优先显示
+        if (data.length > 0) {
+          data.forEach(song => {
+            const option = document.createElement('option');
+            option.value = song
+            option.textContent = song
+            musicSelect.appendChild(option);
+          });
+        }
+
+        // 添加用户输入作为一个选项
+        const userOption = document.createElement('option');
+        userOption.value = query;
+        userOption.textContent = `使用关键词播放: ${query}`;
+        musicSelect.appendChild(userOption);
+
+        // 提示没找到
+        if (data.length === 0) {
+          const option = document.createElement('option');
+          option.textContent = '没有匹配的结果';
+          option.disabled = true;
+          musicSelect.appendChild(option);
+        }
+      })
+      .catch(error => {
+          console.error('Error fetching data:', error);
+      });
+  }, 300));
+
+  // 动态显示保存文件名输入框
+  const musicNameSelect = document.getElementById('music-name');
+  const musicFilenameInput = document.getElementById('music-filename');
+  function updateInputVisibility() {
+    const selectedOption = musicNameSelect.options[musicNameSelect.selectedIndex];
+    var startsWithKeyword;
+    if (musicNameSelect.options.length === 0) {
+      startsWithKeyword = false;
+    } else {
+      startsWithKeyword = selectedOption.text.startsWith('使用关键词联网搜索:');
+    }
+    
+    if (startsWithKeyword) {
+      musicFilenameInput.style.display = 'block';
+      musicFilenameInput.placeholder = '请输入保存为的文件名称(默认:' + selectedOption.value + ')';
+    } else {
+      musicFilenameInput.style.display = 'none';
+    }
+  }
+  // 观察元素修改
+  const observer = new MutationObserver((mutationsList) => {
+    for (const mutation of mutationsList) {
+      if (mutation.type === 'childList') {
+        updateInputVisibility()
+      }
+    }
+  });
+  observer.observe(musicNameSelect, { childList: true });
+  // 监听用户输入
+  musicNameSelect.addEventListener('change', updateInputVisibility);
+
+  function get_playing_music() {
+    $.get(`/playingmusic?did=${did}`, function(data, status) {
+      console.log(data);
+      if (data.ret == "OK") {
+        if (data.is_playing) {
+          $("#playering-music").text(`【播放中】 ${data.cur_music}`);
+        } else {
+          $("#playering-music").text(`【空闲中】 ${data.cur_music}`);
+        }
+        offset = data.offset;
+        duration = data.duration;
+      }
+    });
+  }
+  setInterval(()=>{
+      if (duration > 0) {
+        offset++;
+        $("#progress").val(offset / duration * 100);
+        $("#play-time").text(`${formatTime(offset)}/${formatTime(duration)}`)
+      }else{
+        $("#play-time").text(`${formatTime(0)}/${formatTime(0)}`)
+      }
+    },1000)
+  function formatTime(seconds) {
+    var minutes = Math.floor(seconds / 60);
+    var remainingSeconds =Math.floor(seconds % 60);
+    return `${minutes.toString().padStart(2, '0')}:${remainingSeconds.toString().padStart(2, '0')}`;
+}
+});

xiaomusic/static/default/debug.html

@@ -2,12 +2,22 @@
 <html lang="zh-CN">
   <head>
     <meta charset="UTF-8">
+    <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width">
     <title>Debug For XiaoMusic</title>
 
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721828076">
+    <link rel="stylesheet" type="text/css" href="./style.css?version=1729086244">
     <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
-    <script src="/static/jquery-3.7.1.min.js?version=1721828076"></script>
+    <script src="./jquery-3.7.1.min.js?version=1729086244"></script>
+
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
+    <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments)};
+    gtag('js', new Date());
+    gtag('config', 'G-Z09NC1K7ZW');
+    </script>
 
     <script>
 var vConsole = new window.VConsole();

xiaomusic/static/default/downloadtool.html

@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html lang="zh">
+	<head>
+		<meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width">
+		<title>歌曲下载工具</title>
+    <link rel="stylesheet" type="text/css" href="./style.css?version=1729086244">
+    <script src="./jquery-3.7.1.min.js?version=1729086244"></script>
+
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
+    <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments)};
+    gtag('js', new Date());
+    gtag('config', 'G-Z09NC1K7ZW');
+    </script>
+
+	</head>
+	<body>
+
+		<h1>歌曲下载工具</h1>
+
+		<div class="rows">
+			<!-- 歌单的输入 -->
+			<label for="playlistUrl">输入歌单 URL:</label>
+			<input type="text" id="playlistUrl" value="https://m.bilibili.com/video/BV1WUsDezE88">
+
+			<label for="dirname">输入歌单名字:</label>
+			<input type="text" id="dirname" placeholder="流行歌曲">
+
+			<button id="downloadPlaylistBtn">下载歌单</button>
+
+    </div>
+
+		<hr>
+
+		<div class="rows">
+
+			<!-- 单曲的输入 -->
+			<label for="songUrl">输入歌曲 URL:</label>
+			<input type="text" id="songUrl" value="https://m.bilibili.com/video/BV1qD4y1U7fs">
+
+			<label for="songName">输入歌曲名字:</label>
+			<input type="text" id="songName" placeholder="歌曲名">
+
+			<button id="downloadSongBtn">下载单曲</button>
+		</div>
+
+
+		<script>
+		// 下载歌单
+		$('#downloadPlaylistBtn').click(function() {
+			var playlistUrl = $('#playlistUrl').val();
+			var dirname = $('#dirname').val();
+
+			if (!playlistUrl || !dirname) {
+				alert('请填写完整的歌单 URL 和歌单名字');
+				return;
+			}
+
+      var data = {
+				dirname: dirname,
+				url: playlistUrl
+			};
+      $.ajax({
+        type: "POST",
+        url: "/downloadplaylist",
+        contentType: "application/json",
+        data: JSON.stringify(data),
+        success: (msg) => {
+					alert('歌单下载请求已发送!');
+					console.log(response);
+        },
+        error: (msg) => {
+					alert('歌单下载请求失败，请重试。');
+        }
+      });
+    });
+
+		// 下载单曲
+		$('#downloadSongBtn').click(function() {
+			var songName = $('#songName').val();
+			var songUrl = $('#songUrl').val();
+
+			if (!songUrl || !songName) {
+				alert('请填写完整的歌曲 URL 和歌曲名字');
+				return;
+			}
+
+      var data = {
+				name: songName,
+				url: songUrl
+			};
+      $.ajax({
+        type: "POST",
+        url: "/downloadonemusic",
+        contentType: "application/json",
+        data: JSON.stringify(data),
+        success: (msg) => {
+					alert('单曲下载请求已发送!');
+					console.log(response);
+        },
+        error: (msg) => {
+					alert('单曲下载请求失败，请重试。');
+        }
+      });
+		});
+		</script>
+
+	</body>
+</html>
+

xiaomusic/static/default/index.html

@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="icon" href="/favicon.ico">
+    <meta name="viewport" content="width=device-width">
+    <title>小爱音箱操控面板</title>
+    <script src="./jquery-3.7.1.min.js?version=1729086244"></script>
+    <script src="./app.js?version=1729086244"></script>
+    <link rel="stylesheet" type="text/css" href="./style.css?version=1729086244">
+
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
+    <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments)};
+    gtag('js', new Date());
+    gtag('config', 'G-Z09NC1K7ZW');
+    </script>
+
+    <!--
+<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+<script>
+var vConsole = new window.VConsole();
+</script>
+-->
+
+  </head>
+  <body>
+    <h2>小爱音箱操控面板
+      (<a id="version" href="https://github.com/hanxi/xiaomusic/blob/main/CHANGELOG.md">版本未知</a>)
+      <span id="versionnew" class="blink"></span>
+    </h2>
+    <hr>
+
+    <div class="rows">
+      <select id="did">
+      </select>
+    </div>
+
+    <div id="cmds">
+    <a class="button" href="./setting.html">设置</a>
+    </div>
+    <hr>
+
+    <div style="margin: 20px;">
+      <div style="display: flex; align-items: center;">
+        <svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#8e43e7" style="height: 48px; width: 48px;"><path d="M550.826667 154.666667a47.786667 47.786667 0 0 0-19.84 4.48L298.666667 298.666667H186.453333A80 80 0 0 0 106.666667 378.453333v267.093334A80 80 0 0 0 186.453333 725.333333H298.666667l232.32 139.52a47.786667 47.786667 0 0 0 19.84 4.48A46.506667 46.506667 0 0 0 597.333333 822.826667V201.173333a46.506667 46.506667 0 0 0-46.506666-46.506666zM554.666667 822.826667c0 3.413333-3.84 3.84-3.84 3.84L320 688.853333l-9.6-6.186666H186.453333A37.12 37.12 0 0 1 149.333333 645.546667V378.453333A37.12 37.12 0 0 1 186.453333 341.333333h123.946667l10.24-6.186666 229.546667-137.6s3.84 0 3.84 3.84zM667.52 346.026667a21.333333 21.333333 0 0 0 0 30.293333 192 192 0 0 1 0 271.36 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 234.666667 234.666667 0 0 0 0-331.946666 21.333333 21.333333 0 0 0-30.293333 0z"></path><path d="M804.48 219.52a21.333333 21.333333 0 0 0-30.293333 30.293333 370.986667 370.986667 0 0 1 0 524.373334 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 414.08 414.08 0 0 0 0-584.96z"></path></svg>
+        <input id="volume" type="range"></input>
+      </div>
+    </div>
+    <hr>
+    <div class="rows">
+      <label for="search">搜索歌曲:</label>
+      <input type="text" id="search" placeholder="请输入搜索关键词(如:MV高清版 周杰伦 七里香)">
+
+      <label for="music-name" id="music-name-label" style="display: none;">确认选择:</label>
+      <select id="music-name" style="display: none;">
+          <!-- 动态生成选项 -->
+      </select>
+
+      <input id="music-filename" type="text" placeholder="请输入保存为的文件名称(如:周杰伦七里香)" style="display: none;"></input>
+      <div style="display: flex; align-items: center">
+        <progress id="progress" value="0" max="100" style="width: 270px"></progress>
+        <div id="play-time" style="margin-left: 10px">00:00/00:00</div>
+      </div>
+      <div>
+        <button id="play">播放</button>
+        <div id="playering-music" class="text"></div>
+      </div>
+    </div>
+
+    <hr>
+    <div class="rows">
+      <label for="music_list">播放列表:</label>
+      <select id="music_list"></select>
+      <label for="music_name">歌曲:</label>
+      <select id="music_name"></select>
+      <div>
+      <button id="play_music_list">播放选中歌曲</button>
+      <button id="del_music">删除选中歌曲</button>
+      <button id="web_play">网页播放</button>
+      </div>
+      <div class="play_pannel">
+        <audio autoplay controls src=""></audio>
+      </div>
+    </div>
+
+    <hr>
+    <div class="rows">
+      <input id="music-url" type="text" value="https://lhttp.qtfm.cn/live/4915/64k.mp3"></input>
+      <button id="playurl">播放链接</button>
+    </div>
+
+    <footer>
+      <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
+    </footer>
+  </body>
+</html>

xiaomusic/static/default/m3u.html

@@ -2,9 +2,20 @@
 <html lang="zh-CN">
   <head>
     <meta charset="UTF-8">
+    <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width">
     <title>M3U to JSON Converter</title>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721828076">
+    <link rel="stylesheet" type="text/css" href="./style.css?version=1729086244">
+
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
+    <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments)};
+    gtag('js', new Date());
+    gtag('config', 'G-Z09NC1K7ZW');
+    </script>
+
     <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
 <script>

xiaomusic/static/default/setting.html

@@ -1,11 +1,21 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width">
     <title>小爱音箱操控面板</title>
-    <script src="/static/jquery-3.7.1.min.js?version=1721828076"></script>
-    <script src="/static/setting.js?version=1721828076"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721828076">
+    <script src="./jquery-3.7.1.min.js?version=1729086244"></script>
+    <script src="./setting.js?version=1729086244"></script>
+    <link rel="stylesheet" type="text/css" href="./style.css?version=1729086244">
+
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
+    <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments)};
+    gtag('js', new Date());
+    gtag('config', 'G-Z09NC1K7ZW');
+    </script>
 
     <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
@@ -40,21 +50,16 @@ var vConsole = new window.VConsole();
 
         <label for="hostname">*XIAOMUSIC_HOSTNAME(IP或域名):</label>
         <input id="hostname" type="text"></input>
-
+      </div>
+      <hr>
+      <div class="rows">
         <label for="verbose">是否开启调试日志:</label>
         <select id="verbose">
           <option value="true" selected>true</option>
           <option value="false">false</option>
         </select>
 
-        <div>
-          <button class="save-button">保存</button>
-          <button onclick="location.href='/';">返回首页</button>
-        </div>
-      </div>
-      <hr>
-      <div class="rows">
-        <label for="group_list">设备分组配置:</label>
+        <label for="group_list">设备分组配置:<a href="https://github.com/hanxi/xiaomusic/issues/65#issuecomment-2215736529" target="_blank">文档</a></label>
         <input id="group_list" type="text" placeholder="did1:组名1,did2:组名1,did3:组名2"></input>
 
         <label for="music_path">音乐目录:</label>
@@ -66,6 +71,10 @@ var vConsole = new window.VConsole();
         <label for="conf_path">配置文件目录:</label>
         <input id="conf_path" type="text"></input>
 
+
+        <label for="cache_dir">缓存文件目录:</label>
+        <input id="cache_dir" type="text"></input>
+
         <label for="ffmpeg_location">ffmpeg路径:</label>
         <input id="ffmpeg_location" type="text" value="./ffmpeg/bin"></input>
 
@@ -90,21 +99,29 @@ var vConsole = new window.VConsole();
         <label for="proxy">XIAOMUSIC_PROXY(ytsearch需要):</label>
         <input id="proxy" type="text" placeholder="http://192.168.2.5:8080"></input>
 
-        <label for="disable_httpauth">关闭密码验证:</label>
+        <label for="remove_id3tag">去除MP3 ID3v2和填充:</label>
+        <select id="remove_id3tag">
+          <option value="true">true</option>
+          <option value="false" selected>false</option>
+        </select>
+
+        <label for="convert_to_mp3">转换为MP3:</label>
+        <select id="convert_to_mp3">
+          <option value="true">true</option>
+          <option value="false" selected>false</option>
+        </select>
+
+        <label for="miio_tts_command">MiIO tts 指令(解决部分型号没有提示音的问题):</label>
+        <input id="miio_tts_command" type="text" placeholder="如：5 或者 5-3"></input>
+
+        <label for="disable_httpauth">关闭控制台密码验证:</label>
         <select id="disable_httpauth">
           <option value="true" selected>true</option>
           <option value="false">false</option>
         </select>
-
-        <label for="remove_id3tag">去除MP3 ID3v2和填充，减少播放前延迟:</label>
-        <select id="remove_id3tag">
-          <option value="true" >true</option>
-          <option value="false" selected>false</option>
-        </select>
-
-        <label for="httpauth_username">web控制台账户:</label>
+        <label for="httpauth_username">控制台账户:</label>
         <input id="httpauth_username" type="text" value=""></input>
-        <label for="httpauth_password">web控制台密码:</label>
+        <label for="httpauth_password">控制台密码:</label>
         <input id="httpauth_password" type="password" value=""></input>
 
         <label for="disable_download">关闭下载功能:</label>
@@ -127,9 +144,30 @@ var vConsole = new window.VConsole();
           <option value="false">false</option>
         </select>
 
+        <label for="use_music_api">型号兼容模式:</label>
+        <select id="use_music_api">
+          <option value="true">true</option>
+          <option value="false" selected>false</option>
+        </select>
+
+        <label for="continue_play">启用继续播放(可能导致兼容性问题):</label>
+        <select id="continue_play">
+          <option value="true">true</option>
+          <option value="false" selected>false</option>
+        </select>
+
+        <label for="port">监听端口(修改后需要重启):</label>
+        <input id="port" type="number" value="8090"></input>
+
         <label for="public_port">外网访问端口(0表示跟监听端口一致):</label>
         <input id="public_port" type="number" value="0"></input>
 
+        <label for="pull_ask_sec">获取对话记录间隔(秒):</label>
+        <input id="pull_ask_sec" type="number" value="1"></input>
+
+        <label for="delay_sec">下一首歌延迟播放秒数:</label>
+        <input id="delay_sec" type="number" value="3"></input>
+
         <label for="stop_tts_msg">停止提示音:</label>
         <input id="stop_tts_msg" type="text" value="收到,再见"></input>
         <label for="keywords_playlocal">播放本地歌曲口令:</label>
@@ -139,25 +177,60 @@ var vConsole = new window.VConsole();
         <label for="keywords_stop">停止口令:</label>
         <input id="keywords_stop" type="text" value="关机,暂停,停止,停止播放"></input>
 
+        <label for="enable_yt_dlp_cookies">启用yt-dlp-cookies(需要先上传yt-dlp-cookies.txt文件):</label>
+        <select id="enable_yt_dlp_cookies">
+          <option value="true">true</option>
+          <option value="false" selected>false</option>
+        </select>
+
+        <label for="get_ask_by_mina">特殊型号获取对话记录:</label>
+        <select id="get_ask_by_mina">
+          <option value="true">true</option>
+          <option value="false" selected>false</option>
+        </select>
+
         <label for="music_list_url">歌单地址:</label>
         <input id="music_list_url" type="text" value="https://gist.githubusercontent.com/hanxi/dda82d964a28f8110f8fba81c3ff8314/raw/example.json"></input>
 
-        <label for="music_list_json">歌单内容:</label>
+        <label for="music_list_json">歌单内容:<a href="https://github.com/hanxi/xiaomusic/issues/78" target="_blank">格式文档</a></label>
         <textarea id="music_list_json" type="text"></textarea>
 
+        <label for="crontab_json">定时任务:<a href="https://github.com/hanxi/xiaomusic/issues/182" target="_blank">格式文档</a></label>
+        <textarea id="crontab_json" type="text"></textarea>
       </div>
     </div>
     <hr>
-    <button onclick="location.href='/';">返回首页</button>
+
+    <div class="rows">
+      <label for="yt_dlp_cookies_file">上传yt_dlp_cookies.txt文件:<a href="https://github.com/hanxi/xiaomusic/issues/210" target="_blank">文档</a></label>
+      <input id="yt_dlp_cookies_file" name="file" type="file">
+      <button id="upload_yt_dlp_cookie">上传</button>
+    </div>
+    <hr>
+
+    <button onclick="location.href='/static/default/index.html';">返回首页</button>
     <button id="get_music_list">获取歌单</button>
     <button class="save-button">保存</button>
+    <hr>
+
+    <button id="refresh_music_tag">刷新tag</button>
+    <button id="clear_cache">清空缓存</button>
     <a class="button" href="/downloadlog" download="xiaomusic.txt">下载日志文件</a>
+
     <hr>
 
-    <a href="/static/m3u.html" target="_blank">m3u文件转换工具</a>
+    <button onclick="location.href='/docs';">查看接口文档</button>
+    <a class="button" href="./m3u.html" target="_blank">m3u文件转换</a>
+    <a class="button" href="./downloadtool.html" target="_blank">歌曲下载工具</a>
     <hr>
-    <a href="/static/debug.html" target="_blank">调试工具</a>
 
+    <a class="button" href="./debug.html" target="_blank">调试工具</a>
+    <a class="button" href="https://afdian.com/a/imhanxi" target="_blank">💰 爱发电</a>
+    <a class="button" href="https://github.com/hanxi/xiaomusic" target="_blank">点个 Star ⭐</a>
+
+    <div class="rows">
+      <img class="qrcode" src="./qrcode.png" alt="请涵曦喝奶茶🧋">
+    </div>
     <footer>
       <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
     </footer>

xiaomusic/static/default/setting.js

@@ -68,9 +68,8 @@ $(function(){
 
     // 初始化显示
     for (const key in data) {
-      if (data.hasOwnProperty(key)) {
         const $element = $("#" + key);
-        if ($element.length && data[key] !== '') {
+        if ($element.length) {
           if (data[key] === true) {
             $element.val('true');
           } else if (data[key] === false) {
@@ -79,7 +78,6 @@ $(function(){
             $element.val(data[key]);
           }
         }
-      }
     }
 
     autoSelectOne();
@@ -139,4 +137,51 @@ $(function(){
       }
     });
   });
+
+  $("#refresh_music_tag").on("click", () => {
+    $.ajax({
+      type: "POST",
+      url: "/refreshmusictag",
+      contentType: "application/json",
+      success: (res) => {
+        console.log(res);
+        alert(res.ret);
+      },
+      error: (res) => {
+        console.log(res);
+        alert(res);
+      }
+    });
+  });
+
+  $("#upload_yt_dlp_cookie").on("click", () => {
+    var fileInput = document.getElementById('yt_dlp_cookies_file');
+    var file = fileInput.files[0]; // 获取文件对象
+    if (file) {
+      var formData = new FormData();
+      formData.append("file", file);
+      $.ajax({
+        url: "/uploadytdlpcookie",
+        type: "POST",
+        data: formData,
+        processData: false,
+        contentType: false,
+        success: function(res) {
+          console.log(res);
+          alert("上传成功");
+        },
+        error: function(jqXHR, textStatus, errorThrown) {
+          console.log(res);
+          alert("上传失败");
+        }
+      });
+    } else {
+        alert("请选择一个文件");
+    }
+  });
+
+
+  $("#clear_cache").on("click", () => {
+    localStorage.clear();
+  });
 });

xiaomusic/static/default/style.css

@@ -24,16 +24,19 @@ label {
   width: 300px;
 }
 input,select {
-  margin: 10px;
-  width: 300px;
+  margin-left: 5%;
+  margin-right: 5%;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  width: 90%;
+  max-width: 400px;
   height: 40px;
 }
 
 .rows {
   display: flex;
   flex-direction: column;
-  margin-left: 20px;
-  margin-right: 20px;
+  justify-content: center;
 }
 
 footer {
@@ -44,8 +47,12 @@ footer {
 }
 
  textarea{
-  margin: 10px;
-  width: 300px;
+  margin-left: 5%;
+  margin-right: 5%;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  width: 90%;
+  max-width: 400px;
   height: 200px;
 }
 
@@ -77,3 +84,19 @@ footer {
   text-decoration: none;
   display: inline-block;
 }
+
+.qrcode {
+  width: 100%;
+  max-width: 480px;
+  height: auto;
+}
+
+@keyframes blink {
+    0%, 100% { opacity: 1; }
+    50% { opacity: 0; }
+}
+
+.blink {
+    animation: blink 1s infinite;
+}
+

xiaomusic/static/index.html

@@ -1,76 +1,62 @@
 <!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width">
-    <title>小爱音箱操控面板</title>
-    <script src="/static/jquery-3.7.1.min.js?version=1721828076"></script>
-    <script src="/static/app.js?version=1721828076"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1721828076">
+<html lang="en">
 
-    <!--
-<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
-<script>
-var vConsole = new window.VConsole();
-</script>
--->
+<head>
+  <meta charset="UTF-8">
+  <link rel="icon" href="/favicon.ico">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>小爱音箱操控面板</title>
 
-  </head>
-  <body>
-    <h2>小爱音箱操控面板
-      (<a  id="version" href="https://github.com/hanxi/xiaomusic/blob/main/CHANGELOG.md">
-        版本未知
-      </a>)
-    </h2>
-    <hr>
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
+  <script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments)};
+  gtag('js', new Date());
+  gtag('config', 'G-Z09NC1K7ZW');
+  </script>
 
-    <div class="rows">
-      <select id="did">
-      </select>
+</head>
+
+<body>
+  <div class="container_wrapper">
+    <div class="logo">
+      <img src="/static/xiaoai.png" alt="">
     </div>
+    <div class="desc">
+      <h1>谁家灯火夜通明</h1>
+      <p class="call">小爱同学？</p>
+      <p class="answer">哎，我在</p>
+    </div>
+    <div class="options">
+      <!-- 选择主题 /static/[theme] -->
+      <a href="/static/default/index.html" class="href">默认主题</a>
+      <a href="/static/pure/index.html" class="href">Pure主题</a>
+      <a href="/static/xplayer/index.html" class="href">XMusicPlayer</a>
+      <a href="https://afdian.com/a/imhanxi" target="_blank">爱发电</a>
+      <a href="https://github.com/hanxi/xiaomusic" target="_blank">GitHub</a>
+    </div>
+  </div>
+  <footer>
+    power by <a href="https://github.com/hanxi/xiaomusic">XiaoMusic</a>
+  </footer>
+  <style>
+    @font-face{ font-family: "得意黑 斜体"; font-weight: 400; src: url("//at.alicdn.com/wf/webfont/603VmyqiyGMz/gJk2ny0v51vn.woff2") format("woff2"), url("//at.alicdn.com/wf/webfont/603VmyqiyGMz/e2C1wSBHH86h.woff") format("woff"); font-display: swap;} @font-face{ font-family: "阿里妈妈数黑体 Bold"; font-weight: 700; src: url("//at.alicdn.com/wf/webfont/603VmyqiyGMz/4DWYdFK3dz5J.woff2") format("woff2"), url("//at.alicdn.com/wf/webfont/603VmyqiyGMz/V7EBEKlNSdxC.woff") format("woff"); font-display: swap;} body{ background-color: rgb(47, 44, 67); height: 100%; overflow: hidden;}
+    .container_wrapper{display: flex; justify-content: space-around; align-items: center; flex-wrap: wrap; height: 90vh; cursor: default;}
+    h1{ font-weight: bold; color: #a2a9af; max-width: 600px; font-family: '得意黑 斜体', 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; font-size: 2.5em; border-bottom: 1px solid #a2a9af;}
+    .container_wrapper .logo img{ width: 140px; height: auto; filter: drop-shadow(10px 10px 10px rgba(0, 0, 0, 0.5));}
+    .desc{ text-align: center; color: #fff; margin: auto 30px; backdrop-filter: blur(5px);}
+    .desc p{ font-size: 1.2em; margin: 0; padding: 0; font-family: '阿里妈妈数黑体 Bold'; font-weight: 800;}
+    p.call{ letter-spacing: 0.4em; font-size: 2.2em; line-height: 1.5; font-style: normal;}
+    p.answer{ letter-spacing: 0.23em; line-height: 1.5; font-style: normal; color: #a2a9af; margin-top: 10px;}
+    .desc p::before, .desc p::after{ font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; font-size: 1.5em; color: #4c5870;}
+    .desc p::before{ content: "“";} .desc p::after{ content: "”";}
+    .options{ display: flex; flex-direction: column;}
+    .options a{ color: #a2a9af; text-decoration: none; font-size: 1.1em; position: relative; display: inline; margin: 10px auto;}
+    .options a::before{ content: ''; position: absolute; bottom: 0; left: 0; right: 0; height: 2px; background-color: #ebedec; transform-origin: bottom right; transform: scaleX(0); transition: transform 0.3s ease;}
+    .options a:hover::before{ transform-origin: bottom left; transform: scaleX(1);} .options a:hover{ color:#ebedec;}
+    footer{ display: flex; justify-content: center; color: #4c5870;} footer a{ color:inherit; text-decoration: none; margin: auto 10px;}
+  </style>
+</body>
 
-    <div id="cmds">
-    </div>
-    <hr>
-    <div style="margin: 20px;">
-      <div style="display: flex; align-items: center;">
-        <svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#8e43e7" style="height: 48px; width: 48px;"><path d="M550.826667 154.666667a47.786667 47.786667 0 0 0-19.84 4.48L298.666667 298.666667H186.453333A80 80 0 0 0 106.666667 378.453333v267.093334A80 80 0 0 0 186.453333 725.333333H298.666667l232.32 139.52a47.786667 47.786667 0 0 0 19.84 4.48A46.506667 46.506667 0 0 0 597.333333 822.826667V201.173333a46.506667 46.506667 0 0 0-46.506666-46.506666zM554.666667 822.826667c0 3.413333-3.84 3.84-3.84 3.84L320 688.853333l-9.6-6.186666H186.453333A37.12 37.12 0 0 1 149.333333 645.546667V378.453333A37.12 37.12 0 0 1 186.453333 341.333333h123.946667l10.24-6.186666 229.546667-137.6s3.84 0 3.84 3.84zM667.52 346.026667a21.333333 21.333333 0 0 0 0 30.293333 192 192 0 0 1 0 271.36 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 234.666667 234.666667 0 0 0 0-331.946666 21.333333 21.333333 0 0 0-30.293333 0z"></path><path d="M804.48 219.52a21.333333 21.333333 0 0 0-30.293333 30.293333 370.986667 370.986667 0 0 1 0 524.373334 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 414.08 414.08 0 0 0 0-584.96z"></path></svg>
-        <input id="volume" type="range"></input>
-        <a href="/static/setting.html">
-        <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>
-    <hr>
-    <div class="rows">
-      <datalist id="autocomplete-list"></datalist>
-      <input id="music-name" type="text" placeholder="请输入搜索关键词(如:MV高清版 周杰伦 七里香)" list="autocomplete-list"></input>
-      <input id="music-filename" type="text" placeholder="请输入保存为的文件名称(如:周杰伦七里香)"></input>
-      <div>
-        <button id="play">播放</button>
-        <div id="playering-music" class="text"></div>
-      </div>
-    </div>
-
-    <hr>
-    <div class="rows">
-      <label for="music_list">播放列表:</label>
-      <select id="music_list"></select>
-      <label for="music_name">歌曲:</label>
-      <select id="music_name"></select>
-      <div>
-      <button id="play_music_list">播放列表歌曲</button>
-      <button id="del_music">删除选中歌曲</button>
-      </div>
-    </div>
-
-    <hr>
-    <div class="rows">
-      <input id="music-url" type="text" value="https://lhttp.qtfm.cn/live/4915/64k.mp3"></input>
-      <button id="playurl">播放链接</button>
-    </div>
-
-    <footer>
-      <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
-    </footer>
-  </body>
 </html>

xiaomusic/static/pure/index.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <link rel="icon" href="/static/pure/favicon.ico">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>小爱音箱操控面板</title>
+  <script type="module" crossorigin src="/static/pure/assets/index-B19OeAC1.js"></script>
+  <link rel="stylesheet" crossorigin href="/static/pure/assets/index-co2Wfzfa.css">
+</head>
+
+<body>
+  <div id="app"></div>
+  <!-- 作者的统计代码 -->
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() { dataLayer.push(arguments) };
+    gtag('js', new Date());
+    gtag('config', 'G-Z09NC1K7ZW');
+  </script>
+</body>
+
+</html>

xiaomusic/static/xplayer/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/static/xplayer/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>XMusicPlayer</title>
+    <script type="module" crossorigin src="/static/xplayer/assets/index-BhKRZfzz.js"></script>
+    <link rel="stylesheet" crossorigin href="/static/xplayer/assets/index-DZp3LGgk.css">
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

xiaomusic/utils.py

@@ -1,9 +1,13 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
+import asyncio
+import base64
 import copy
 import difflib
+import hashlib
 import io
+import json
 import logging
 import mimetypes
 import os
@@ -11,20 +15,34 @@ import random
 import re
 import shutil
 import string
+import subprocess
 import tempfile
+import urllib.parse
 from collections.abc import AsyncIterator
+from dataclasses import asdict, dataclass
 from http.cookies import SimpleCookie
 from urllib.parse import urlparse
 
-import aiofiles
 import aiohttp
 import mutagen
-from mutagen.id3 import ID3
+from mutagen.asf import ASF
+from mutagen.flac import FLAC
+from mutagen.id3 import APIC, ID3, Encoding, TextFrame, TimeStampTextFrame
 from mutagen.mp3 import MP3
+from mutagen.mp4 import MP4
+from mutagen.oggvorbis import OggVorbis
+from mutagen.wave import WAVE
+from mutagen.wavpack import WavPack
+from opencc import OpenCC
+from PIL import Image
 from requests.utils import cookiejar_from_dict
 
 from xiaomusic.const import SUPPORT_MUSIC_TYPE
 
+log = logging.getLogger(__package__)
+
+cc = OpenCC("t2s")  # convert from Traditional Chinese to Simplified Chinese
+
 
 ### HELP FUNCTION ###
 def parse_cookie_string(cookie_string):
@@ -78,22 +96,68 @@ def validate_proxy(proxy_str: str) -> bool:
 
 
 # 模糊搜索
-def fuzzyfinder(user_input, collection):
-    lower_collection = {item.lower(): item for item in collection}
-    user_input = user_input.lower()
-    matches = difflib.get_close_matches(
-        user_input, lower_collection.keys(), n=10, cutoff=0.1
+def fuzzyfinder(user_input, collection, extra_search_index=None):
+    return find_best_match(
+        user_input, collection, cutoff=0.1, n=10, extra_search_index=extra_search_index
     )
-    return [lower_collection[match] for match in matches]
 
 
-def find_best_match(user_input, collection, cutoff=0.6):
-    lower_collection = {item.lower(): item for item in collection}
-    user_input = user_input.lower()
-    matches = difflib.get_close_matches(
-        user_input, lower_collection.keys(), n=1, cutoff=cutoff
+def traditional_to_simple(to_convert: str):
+    return cc.convert(to_convert)
+
+
+# 关键词检测
+def keyword_detection(user_input, str_list, n):
+    # 过滤包含关键字的字符串
+    matched, remains = [], []
+    for item in str_list:
+        if user_input in item:
+            matched.append(item)
+        else:
+            remains.append(item)
+
+    matched = sorted(
+        matched,
+        key=lambda s: difflib.SequenceMatcher(None, s, user_input).ratio(),
+        reverse=True,  # 降序排序，越相似的越靠前
     )
-    return lower_collection[matches[0]] if matches else None
+
+    # 如果 n 是 -1，如果 n 大于匹配的数量，返回所有匹配的结果
+    if n == -1 or n > len(matched):
+        return matched, remains
+
+    # 选择前 n 个匹配的结果
+    remains = matched[n:] + remains
+    return matched[:n], remains
+
+
+def real_search(prompt, candidates, cutoff, n):
+    matches, remains = keyword_detection(prompt, candidates, n=n)
+    if len(matches) < n:
+        # 如果没有准确关键词匹配，开始模糊匹配
+        matches += difflib.get_close_matches(prompt, remains, n=n, cutoff=cutoff)
+    return matches
+
+
+def find_best_match(user_input, collection, cutoff=0.6, n=1, extra_search_index=None):
+    lower_collection = {
+        traditional_to_simple(item.lower()): item for item in collection
+    }
+    user_input = traditional_to_simple(user_input.lower())
+    matches = real_search(user_input, lower_collection.keys(), cutoff, n)
+    cur_matched_collection = [lower_collection[match] for match in matches]
+    if len(matches) >= n or extra_search_index is None:
+        return cur_matched_collection[:n]
+
+    # 如果数量不满足，继续搜索
+    lower_extra_search_index = {
+        traditional_to_simple(k.lower()): v
+        for k, v in extra_search_index.items()
+        if v not in cur_matched_collection
+    }
+    matches = real_search(user_input, lower_extra_search_index.keys(), cutoff, n)
+    cur_matched_collection += [lower_extra_search_index[match] for match in matches]
+    return cur_matched_collection[:n]
 
 
 # 歌曲排序
@@ -142,9 +206,7 @@ def _append_files_result(result, root, joinpath, files, support_extension):
         result[dir_name].append(os.path.join(joinpath, file))
 
 
-def traverse_music_directory(
-    directory, depth=10, exclude_dirs=None, support_extension=None
-):
+def traverse_music_directory(directory, depth, exclude_dirs, support_extension):
     result = {}
     for root, dirs, files in os.walk(directory, followlinks=True):
         # 忽略排除的目录
@@ -191,7 +253,11 @@ def is_mp3(url):
     return False
 
 
-async def _get_web_music_duration(session, url, start=0, end=500):
+def is_m4a(url):
+    return url.endswith(".m4a")
+
+
+async def _get_web_music_duration(session, url, ffmpeg_location, start=0, end=500):
     duration = 0
     headers = {"Range": f"bytes={start}-{end}"}
     async with session.get(url, headers=headers) as response:
@@ -201,15 +267,17 @@ async def _get_web_music_duration(session, url, start=0, end=500):
         try:
             if is_mp3(url):
                 m = mutagen.mp3.MP3(tmp)
+            elif is_m4a(url):
+                return get_duration_by_ffprobe(tmp, ffmpeg_location)
             else:
                 m = mutagen.File(tmp)
             duration = m.info.length
         except Exception as e:
-            logging.error(f"Error _get_web_music_duration: {e}")
+            log.error(f"Error _get_web_music_duration: {e}")
     return duration
 
 
-async def get_web_music_duration(url):
+async def get_web_music_duration(url, ffmpeg_location="./ffmpeg/bin"):
     duration = 0
     try:
         parsed_url = urlparse(url)
@@ -229,30 +297,60 @@ async def get_web_music_duration(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)
+            duration = await _get_web_music_duration(
+                session, url, ffmpeg_location, start=0, end=500
+            )
             if duration <= 0:
                 duration = await _get_web_music_duration(
-                    session, url, start=0, end=3000
+                    session, url, ffmpeg_location, start=0, end=3000
                 )
     except Exception as e:
-        logging.error(f"Error get_web_music_duration: {e}")
+        log.error(f"Error get_web_music_duration: {e}")
     return duration, url
 
 
 # 获取文件播放时长
-async def get_local_music_duration(filename):
+async def get_local_music_duration(filename, ffmpeg_location="./ffmpeg/bin"):
+    loop = asyncio.get_event_loop()
     duration = 0
     try:
-        async with aiofiles.open(filename, "rb") as f:
-            buffer = io.BytesIO(await f.read())
         if is_mp3(filename):
-            m = mutagen.mp3.MP3(buffer)
+            m = await loop.run_in_executor(None, mutagen.mp3.MP3, filename)
+        elif is_m4a(filename):
+            duration = get_duration_by_ffprobe(filename, ffmpeg_location)
+            return duration
         else:
-            m = mutagen.File(buffer)
-        if m and m.info:
-            duration = m.info.length
+            m = await loop.run_in_executor(None, mutagen.File, filename)
+        duration = m.info.length
     except Exception as e:
-        logging.error(f"Error getting local music duration: {e}")
+        log.error(f"Error getting local music {filename} duration: {e}")
+    return duration
+
+
+def get_duration_by_ffprobe(file_path, ffmpeg_location):
+    # 使用 ffprobe 获取文件的元数据，并以 JSON 格式输出
+    result = subprocess.run(
+        [
+            os.path.join(ffmpeg_location, "ffprobe"),
+            "-v",
+            "error",  # 只输出错误信息，避免混杂在其他输出中
+            "-show_entries",
+            "format=duration",  # 仅显示时长
+            "-of",
+            "json",  # 以 JSON 格式输出
+            file_path,
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        text=True,
+    )
+
+    # 解析 JSON 输出
+    ffprobe_output = json.loads(result.stdout)
+
+    # 获取时长
+    duration = float(ffprobe_output["format"]["duration"])
+
     return duration
 
 
@@ -309,29 +407,450 @@ def no_padding(info):
     return 0
 
 
-def remove_id3_tags(file_path):
-    audio = MP3(file_path, ID3=ID3)
-    change = False
+def get_temp_dir(music_path: str):
+    # 指定临时文件的目录为 music_path 目录下的 tmp 文件夹
+    temp_dir = os.path.join(music_path, "tmp")
+    if not os.path.exists(temp_dir):
+        os.makedirs(temp_dir)  # 确保目录存在
+    return temp_dir
+
+
+def remove_id3_tags(input_file: str, config) -> str:
+    music_path = config.music_path
+    temp_dir = get_temp_dir(music_path)
+
+    # 构造新文件的路径
+    out_file_name = os.path.splitext(os.path.basename(input_file))[0]
+    out_file_path = os.path.join(temp_dir, f"{out_file_name}.mp3")
+    relative_path = os.path.relpath(out_file_path, music_path)
+
+    # 路径相同的情况
+    input_absolute_path = os.path.abspath(input_file)
+    output_absolute_path = os.path.abspath(out_file_path)
+    if input_absolute_path == output_absolute_path:
+        log.info(f"File {input_file} = {out_file_path} . Skipping remove_id3_tags.")
+        return None
+
+    # 检查目标文件是否存在
+    if os.path.exists(out_file_path):
+        log.info(f"File {out_file_path} already exists. Skipping remove_id3_tags.")
+        return relative_path
+
+    audio = MP3(input_file, ID3=ID3)
 
     # 检查是否存在ID3 v2.3或v2.4标签
     if audio.tags and (
         audio.tags.version == (2, 3, 0) or audio.tags.version == (2, 4, 0)
     ):
-        # 构造新文件的路径
-        new_file_path = file_path + ".bak"
-
-        # 备份原始文件为新文件
-        shutil.copy(file_path, new_file_path)
-
+        # 拷贝文件
+        shutil.copy(input_file, out_file_path)
+        outaudio = MP3(out_file_path, ID3=ID3)
         # 删除ID3标签
-        audio.delete()
-
-        # 删除padding
-        audio.save(padding=no_padding)
-
+        outaudio.delete()
         # 保存修改后的文件
-        audio.save()
+        outaudio.save(padding=no_padding)
+        log.info(f"File {out_file_path} remove_id3_tags ok.")
+        return relative_path
 
-        change = True
+    return relative_path
 
-    return change
+
+def convert_file_to_mp3(input_file: str, config) -> str:
+    music_path = config.music_path
+    temp_dir = get_temp_dir(music_path)
+
+    out_file_name = os.path.splitext(os.path.basename(input_file))[0]
+    out_file_path = os.path.join(temp_dir, f"{out_file_name}.mp3")
+    relative_path = os.path.relpath(out_file_path, music_path)
+
+    # 路径相同的情况
+    input_absolute_path = os.path.abspath(input_file)
+    output_absolute_path = os.path.abspath(out_file_path)
+    if input_absolute_path == output_absolute_path:
+        log.info(f"File {input_file} = {out_file_path} . Skipping convert_file_to_mp3.")
+        return None
+
+    absolute_music_path = os.path.abspath(music_path)
+    if not input_absolute_path.startswith(absolute_music_path):
+        log.error(f"Invalid input file path: {input_file}")
+        return None
+
+    # 检查目标文件是否存在
+    if os.path.exists(out_file_path):
+        log.info(f"File {out_file_path} already exists. Skipping convert_file_to_mp3.")
+        return relative_path
+
+    command = [
+        os.path.join(config.ffmpeg_location, "ffmpeg"),
+        "-i",
+        input_absolute_path,
+        "-f",
+        "mp3",
+        "-vn",
+        "-y",
+        out_file_path,
+    ]
+
+    try:
+        subprocess.run(command, check=True)
+    except subprocess.CalledProcessError as e:
+        log.exception(f"Error during conversion: {e}")
+        return None
+
+    log.info(f"File {input_file} to {out_file_path} convert_file_to_mp3 ok.")
+    return relative_path
+
+
+chinese_to_arabic = {
+    "零": 0,
+    "一": 1,
+    "二": 2,
+    "三": 3,
+    "四": 4,
+    "五": 5,
+    "六": 6,
+    "七": 7,
+    "八": 8,
+    "九": 9,
+    "十": 10,
+    "百": 100,
+    "千": 1000,
+    "万": 10000,
+    "亿": 100000000,
+}
+
+
+def chinese_to_number(chinese):
+    result = 0
+    unit = 1
+    num = 0
+    for char in reversed(chinese):
+        if char in chinese_to_arabic:
+            val = chinese_to_arabic[char]
+            if val >= 10:
+                if val > unit:
+                    unit = val
+                else:
+                    unit *= val
+            else:
+                num += val * unit
+        result += num
+        num = 0
+    return result
+
+
+def list2str(li, verbose=False):
+    if len(li) > 5 and not verbose:
+        return f"{li[:2]} ... {li[-2:]} with len: {len(li)}"
+    else:
+        return f"{li}"
+
+
+async def get_latest_version(package_name: str) -> str:
+    url = f"https://pypi.org/pypi/{package_name}/json"
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url) as response:
+            if response.status == 200:
+                data = await response.json()
+                return data["info"]["version"]
+            else:
+                return None
+
+
+@dataclass
+class Metadata:
+    title: str = ""
+    artist: str = ""
+    album: str = ""
+    year: str = ""
+    genre: str = ""
+    picture: str = ""
+    lyrics: str = ""
+
+
+def _get_alltag_value(tags, k):
+    v = tags.getall(k)
+    if len(v) > 0:
+        return _to_utf8(v[0])
+    return ""
+
+
+def _get_tag_value(tags, k):
+    if k not in tags:
+        return ""
+    v = tags[k]
+    return _to_utf8(v)
+
+
+def _to_utf8(v):
+    if isinstance(v, TextFrame) and not isinstance(v, TimeStampTextFrame):
+        old_ts = "".join(v.text)
+        if v.encoding == Encoding.LATIN1:
+            bs = old_ts.encode("latin1")
+            ts = bs.decode("GBK", errors="ignore")
+            return ts
+        return old_ts
+    elif isinstance(v, list):
+        return "".join(v)
+    return str(v)
+
+
+def _save_picture(picture_data, save_root, file_path):
+    # 计算文件名的哈希值
+    file_hash = hashlib.md5(file_path.encode("utf-8")).hexdigest()
+    # 创建目录结构
+    dir_path = os.path.join(save_root, file_hash[-6:])
+    os.makedirs(dir_path, exist_ok=True)
+
+    # 保存图片
+    filename = os.path.basename(file_path)
+    (name, _) = os.path.splitext(filename)
+    picture_path = os.path.join(dir_path, f"{name}.jpg")
+
+    try:
+        _resize_save_image(picture_data, picture_path)
+    except Exception as e:
+        log.exception(f"Error _resize_save_image: {e}")
+    return picture_path
+
+
+def _resize_save_image(image_bytes, save_path, max_size=300):
+    # 将 bytes 转换为 PIL Image 对象
+    image = Image.open(io.BytesIO(image_bytes))
+    image = image.convert("RGB")
+
+    # 获取原始尺寸
+    original_width, original_height = image.size
+
+    # 如果图片的宽度和高度都小于 max_size，则直接保存原始图片
+    if original_width <= max_size and original_height <= max_size:
+        image.save(save_path, format="JPEG")
+        return
+
+    # 计算缩放比例，保持等比缩放
+    scaling_factor = min(max_size / original_width, max_size / original_height)
+
+    # 计算新的尺寸
+    new_width = int(original_width * scaling_factor)
+    new_height = int(original_height * scaling_factor)
+
+    resized_image = image.resize((new_width, new_height), Image.Resampling.LANCZOS)
+    resized_image.save(save_path, format="JPEG")
+    return save_path
+
+
+def extract_audio_metadata(file_path, save_root):
+    audio = mutagen.File(file_path)
+    metadata = Metadata()
+    tags = audio.tags
+    if tags is None:
+        return asdict(metadata)
+
+    if isinstance(audio, MP3):
+        metadata.title = _get_tag_value(tags, "TIT2")
+        metadata.artist = _get_tag_value(tags, "TPE1")
+        metadata.album = _get_tag_value(tags, "TALB")
+        metadata.year = _get_tag_value(tags, "TDRC")
+        metadata.genre = _get_tag_value(tags, "TCON")
+        metadata.lyrics = _get_alltag_value(tags, "USLT")
+        for tag in tags.values():
+            if isinstance(tag, APIC):
+                metadata.picture = _save_picture(tag.data, save_root, file_path)
+                break
+
+    elif isinstance(audio, FLAC):
+        metadata.title = _get_tag_value(tags, "TITLE")
+        metadata.artist = _get_tag_value(tags, "ARTIST")
+        metadata.album = _get_tag_value(tags, "ALBUM")
+        metadata.year = _get_tag_value(tags, "DATE")
+        metadata.genre = _get_tag_value(tags, "GENRE")
+        if audio.pictures:
+            metadata.picture = _save_picture(
+                audio.pictures[0].data, save_root, file_path
+            )
+        if "lyrics" in audio:
+            metadata.lyrics = audio["lyrics"][0]
+
+    elif isinstance(audio, MP4):
+        metadata.title = _get_tag_value(tags, "\xa9nam")
+        metadata.artist = _get_tag_value(tags, "\xa9ART")
+        metadata.album = _get_tag_value(tags, "\xa9alb")
+        metadata.year = _get_tag_value(tags, "\xa9day")
+        metadata.genre = _get_tag_value(tags, "\xa9gen")
+        if "covr" in tags:
+            metadata.picture = _save_picture(tags["covr"][0], save_root, file_path)
+
+    elif isinstance(audio, OggVorbis):
+        metadata.title = _get_tag_value(tags, "TITLE")
+        metadata.artist = _get_tag_value(tags, "ARTIST")
+        metadata.album = _get_tag_value(tags, "ALBUM")
+        metadata.year = _get_tag_value(tags, "DATE")
+        metadata.genre = _get_tag_value(tags, "GENRE")
+        if "metadata_block_picture" in tags:
+            picture = json.loads(base64.b64decode(tags["metadata_block_picture"][0]))
+            metadata.picture = _save_picture(
+                base64.b64decode(picture["data"]), save_root, file_path
+            )
+
+    elif isinstance(audio, ASF):
+        metadata.title = _get_tag_value(tags, "Title")
+        metadata.artist = _get_tag_value(tags, "Author")
+        metadata.album = _get_tag_value(tags, "WM/AlbumTitle")
+        metadata.year = _get_tag_value(tags, "WM/Year")
+        metadata.genre = _get_tag_value(tags, "WM/Genre")
+        if "WM/Picture" in tags:
+            metadata.picture = _save_picture(
+                tags["WM/Picture"][0].value, save_root, file_path
+            )
+
+    elif isinstance(audio, WavPack):
+        metadata.title = _get_tag_value(tags, "Title")
+        metadata.artist = _get_tag_value(tags, "Artist")
+        metadata.album = _get_tag_value(tags, "Album")
+        metadata.year = _get_tag_value(tags, "Year")
+        metadata.genre = _get_tag_value(tags, "Genre")
+        if audio.pictures:
+            metadata.picture = _save_picture(
+                audio.pictures[0].data, save_root, file_path
+            )
+
+    elif isinstance(audio, WAVE):
+        metadata.title = _get_tag_value(tags, "Title")
+        metadata.artist = _get_tag_value(tags, "Artist")
+
+    return asdict(metadata)
+
+
+# 下载播放列表
+async def download_playlist(config, url, dirname):
+    title = f"{dirname}/%(title)s.%(ext)s"
+    sbp_args = (
+        "yt-dlp",
+        "--yes-playlist",
+        "-x",
+        "--audio-format",
+        "mp3",
+        "--paths",
+        config.download_path,
+        "-o",
+        title,
+        "--ffmpeg-location",
+        f"{config.ffmpeg_location}",
+    )
+
+    if config.proxy:
+        sbp_args += ("--proxy", f"{config.proxy}")
+
+    if config.enable_yt_dlp_cookies:
+        sbp_args += ("--cookies", f"{config.yt_dlp_cookies_path}")
+
+    sbp_args += (url,)
+
+    cmd = " ".join(sbp_args)
+    log.info(f"download_playlist: {cmd}")
+    download_proc = await asyncio.create_subprocess_exec(*sbp_args)
+    return download_proc
+
+
+# 下载一首歌曲
+async def download_one_music(config, url, name=""):
+    title = "%(title)s.%(ext)s"
+    if name:
+        title = f"{name}.%(ext)s"
+    sbp_args = (
+        "yt-dlp",
+        "--no-playlist",
+        "-x",
+        "--audio-format",
+        "mp3",
+        "--paths",
+        config.download_path,
+        "-o",
+        title,
+        "--ffmpeg-location",
+        f"{config.ffmpeg_location}",
+    )
+
+    if config.proxy:
+        sbp_args += ("--proxy", f"{config.proxy}")
+
+    if config.enable_yt_dlp_cookies:
+        sbp_args += ("--cookies", f"{config.yt_dlp_cookies_path}")
+
+    sbp_args += (url,)
+
+    cmd = " ".join(sbp_args)
+    log.info(f"download_one_music: {cmd}")
+    download_proc = await asyncio.create_subprocess_exec(*sbp_args)
+    return download_proc
+
+
+def _longest_common_prefix(file_names):
+    if not file_names:
+        return ""
+
+    # 将第一个文件名作为初始前缀
+    prefix = file_names[0]
+
+    for file_name in file_names[1:]:
+        while not file_name.startswith(prefix):
+            # 如果当前文件名不以prefix开头，则缩短prefix
+            prefix = prefix[:-1]
+            if not prefix:
+                return ""
+
+    return prefix
+
+
+# 移除目录下文件名前缀相同的
+def remove_common_prefix(directory):
+    files = os.listdir(directory)
+
+    # 获取所有文件的前缀
+    common_prefix = _longest_common_prefix(files)
+
+    log.info(f'Common prefix identified: "{common_prefix}"')
+
+    for filename in files:
+        if filename == common_prefix:
+            continue
+        # 检查文件名是否以共同前缀开头
+        if filename.startswith(common_prefix):
+            # 构造新的文件名
+            new_filename = filename[len(common_prefix) :]
+            # 生成完整的文件路径
+            old_file_path = os.path.join(directory, filename)
+            new_file_path = os.path.join(directory, new_filename)
+
+            # 重命名文件
+            os.rename(old_file_path, new_file_path)
+            log.debug(f'Renamed: "{filename}" to "{new_filename}"')
+
+
+def try_add_access_control_param(config, url):
+    if config.disable_httpauth:
+        return url
+
+    url_parts = urllib.parse.urlparse(url)
+    file_path = urllib.parse.unquote(url_parts.path)
+    correct_code = hashlib.sha256(
+        (file_path + config.httpauth_username + config.httpauth_password).encode(
+            "utf-8"
+        )
+    ).hexdigest()
+    log.debug(f"rewrite url: [{file_path}, {correct_code}]")
+
+    # make new url
+    parsed_get_args = dict(urllib.parse.parse_qsl(url_parts.query))
+    parsed_get_args.update({"code": correct_code})
+    encoded_get_args = urllib.parse.urlencode(parsed_get_args, doseq=True)
+    new_url = urllib.parse.ParseResult(
+        url_parts.scheme,
+        url_parts.netloc,
+        url_parts.path,
+        url_parts.params,
+        encoded_get_args,
+        url_parts.fragment,
+    ).geturl()
+
+    return new_url