new version v0.1.54

.github/workflows/ci.yml

@@ -25,6 +25,6 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/xiaomusic:${{ github.ref_name }}

.github/workflows/release.yml

@@ -61,6 +61,6 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/xiaomusic:${{ github.ref_name }}, ${{ secrets.DOCKERHUB_USERNAME }}/xiaomusic:latest, ${{ secrets.DOCKERHUB_USERNAME }}/xiaomusic:stable

README.md

@@ -2,7 +2,28 @@
 
 使用小爱/红米音箱播放音乐，音乐使用 yt-dlp 下载。
 
-## 运行
+## 最简配置运行
+
+已经支持在 web 页面配置其他参数，docker compose 配置如下：
+
+```yaml
+services:
+  xiaomusic:
+    image: hanxi/xiaomusic
+    container_name: xiaomusic
+    restart: unless-stopped
+    ports:
+      - 8090:8090
+    volumes:
+      - ./music:/app/music
+    environment:
+      MI_USER: '小米账号'
+      MI_PASS: '小米密码'
+      XIAOMUSIC_HOSTNAME: 'docker 主机 ip'
+```
+启动成功后，在 web 页面可以配置 MI_DID, MI_HARDWARE, XIAOMUSIC_SEARCH, XIAOMUSIC_PROXY 参数。
+
+## 开发环境运行
 
 - 使用 install_dependencies.sh 下载依赖
 - 使用 pdm 安装环境
@@ -28,6 +49,11 @@ pdm run xiaomusic.py
 - 下一首
 - 单曲循环
 - 全部循环
+- 随机播放
+- 关机
+- 停止播放
+- 刷新列表
+- 播放列表+列表名 比如：播放列表其他
 
 > 隐藏玩法: 对小爱同学说播放歌曲小猪佩奇的故事，会播放小猪佩奇的故事。
 
@@ -50,8 +76,17 @@ pdm run xiaomusic.py
 ## 在 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
+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 用于配置代理，默认为空;

pdm.lock

@@ -2,10 +2,10 @@
 # It is not intended for manual editing.
 
 [metadata]
-groups = ["default"]
+groups = ["default", "lint"]
 strategy = ["cross_platform"]
 lock_version = "4.4.1"
-content_hash = "sha256:d771311a452ca58665efe3b74af341cb202d75d83a250896c293ea9c696e5696"
+content_hash = "sha256:38bae754be83ffca7d688fc4e1daf0964709d202d651c6c865ff56c1b8332caa"
 
 [[package]]
 name = "aiohttp"
@@ -620,8 +620,8 @@ files = [
 
 [[package]]
 name = "requests"
-version = "2.31.0"
-requires_python = ">=3.7"
+version = "2.32.3"
+requires_python = ">=3.8"
 summary = "Python HTTP for Humans."
 dependencies = [
     "certifi>=2017.4.17",
@@ -630,8 +630,8 @@ dependencies = [
     "urllib3<3,>=1.21.1",
 ]
 files = [
-    {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
-    {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
+    {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"},
+    {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"},
 ]
 
 [[package]]
@@ -648,6 +648,31 @@ files = [
     {file = "rich-13.7.1.tar.gz", hash = "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"},
 ]
 
+[[package]]
+name = "ruff"
+version = "0.4.9"
+requires_python = ">=3.7"
+summary = "An extremely fast Python linter and code formatter, written in Rust."
+files = [
+    {file = "ruff-0.4.9-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b262ed08d036ebe162123170b35703aaf9daffecb698cd367a8d585157732991"},
+    {file = "ruff-0.4.9-py3-none-macosx_11_0_arm64.whl", hash = "sha256:98ec2775fd2d856dc405635e5ee4ff177920f2141b8e2d9eb5bd6efd50e80317"},
+    {file = "ruff-0.4.9-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4555056049d46d8a381f746680db1c46e67ac3b00d714606304077682832998e"},
+    {file = "ruff-0.4.9-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e91175fbe48f8a2174c9aad70438fe9cb0a5732c4159b2a10a3565fea2d94cde"},
+    {file = "ruff-0.4.9-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e8e7b95673f22e0efd3571fb5b0cf71a5eaaa3cc8a776584f3b2cc878e46bff"},
+    {file = "ruff-0.4.9-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:2d45ddc6d82e1190ea737341326ecbc9a61447ba331b0a8962869fcada758505"},
+    {file = "ruff-0.4.9-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:78de3fdb95c4af084087628132336772b1c5044f6e710739d440fc0bccf4d321"},
+    {file = "ruff-0.4.9-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:06b60f91bfa5514bb689b500a25ba48e897d18fea14dce14b48a0c40d1635893"},
+    {file = "ruff-0.4.9-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88bffe9c6a454bf8529f9ab9091c99490578a593cc9f9822b7fc065ee0712a06"},
+    {file = "ruff-0.4.9-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:673bddb893f21ab47a8334c8e0ea7fd6598ecc8e698da75bcd12a7b9d0a3206e"},
+    {file = "ruff-0.4.9-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8c1aff58c31948cc66d0b22951aa19edb5af0a3af40c936340cd32a8b1ab7438"},
+    {file = "ruff-0.4.9-py3-none-musllinux_1_2_i686.whl", hash = "sha256:784d3ec9bd6493c3b720a0b76f741e6c2d7d44f6b2be87f5eef1ae8cc1d54c84"},
+    {file = "ruff-0.4.9-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:732dd550bfa5d85af8c3c6cbc47ba5b67c6aed8a89e2f011b908fc88f87649db"},
+    {file = "ruff-0.4.9-py3-none-win32.whl", hash = "sha256:8064590fd1a50dcf4909c268b0e7c2498253273309ad3d97e4a752bb9df4f521"},
+    {file = "ruff-0.4.9-py3-none-win_amd64.whl", hash = "sha256:e0a22c4157e53d006530c902107c7f550b9233e9706313ab57b892d7197d8e52"},
+    {file = "ruff-0.4.9-py3-none-win_arm64.whl", hash = "sha256:5d5460f789ccf4efd43f265a58538a2c24dbce15dbf560676e430375f20a8198"},
+    {file = "ruff-0.4.9.tar.gz", hash = "sha256:f1cb0828ac9533ba0135d148d214e284711ede33640465e706772645483427e3"},
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.9.0"
@@ -794,7 +819,7 @@ files = [
 
 [[package]]
 name = "yt-dlp"
-version = "2024.5.16.232713.dev0"
+version = "2024.6.17.232743.dev0"
 requires_python = ">=3.8"
 summary = "A feature-rich command-line audio/video downloader"
 dependencies = [
@@ -803,11 +828,11 @@ dependencies = [
     "certifi",
     "mutagen",
     "pycryptodomex",
-    "requests<3,>=2.31.0",
+    "requests<3,>=2.32.2",
     "urllib3<3,>=1.26.17",
     "websockets>=12.0",
 ]
 files = [
-    {file = "yt_dlp-2024.5.16.232713.dev0-py3-none-any.whl", hash = "sha256:42d3c27ab77583ff67ee2ddc94e376ea2a76a561ed8b1836ee04fd1cd23ad88c"},
-    {file = "yt_dlp-2024.5.16.232713.dev0.tar.gz", hash = "sha256:d431187fa703c9f52225080ae56471272679e44d9363f97b7b3187d37a5e6480"},
+    {file = "yt_dlp-2024.6.17.232743.dev0-py3-none-any.whl", hash = "sha256:dd6e7e194b96e778691f58a0cb6b42956cf956b22f6bb1a12bdef5ab3ac0c9ad"},
+    {file = "yt_dlp-2024.6.17.232743.dev0.tar.gz", hash = "sha256:2f6f44eff755a7b051cdcd3c4375771033dbeb64d6164351022efdc67cce0c52"},
 ]

pyproject.toml

@@ -1,12 +1,11 @@
 [project]
 name = "xiaomusic"
-version = "0.1.34"
+version = "0.1.54"
 description = "Play Music with xiaomi AI speaker"
 authors = [
     {name = "涵曦", email = "im.hanxi@gmail.com"},
 ]
 dependencies = [
-    "rich>=13.6.0",
     "requests>=2.31.0",
     "aiohttp>=3.8.6",
     "miservice-fork>=2.5.0",
@@ -24,3 +23,29 @@ requires = ["pdm-backend"]
 build-backend = "pdm.backend"
 
 [tool.pdm]
+[tool.pdm.dev-dependencies]
+lint = [
+    "ruff>=0.4.8",
+]
+[tool.ruff]
+lint.select = [
+        "B", # flake8-bugbear
+        "C4", # flake8-comprehensions
+        "E", # pycodestyle - Error
+        "F", # Pyflakes
+        "I", # isort
+        "W", # pycodestyle - Warning
+        "UP", # pyupgrade
+]
+lint.ignore = [
+        "E501", # line-too-long
+        "W191", # tab-indentation
+]
+include = ["**/*.py", "**/*.pyi", "**/pyproject.toml"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.pdm.scripts]
+lint = "ruff check ."
+fmt = "ruff format ."

requirements.txt

@@ -368,9 +368,9 @@ pycryptodomex==3.19.0 \
 pygments==2.16.1 \
     --hash=sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692 \
     --hash=sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29
-requests==2.31.0 \
-    --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
-    --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
+requests==2.32.3 \
+    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
+    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
 rich==13.7.1 \
     --hash=sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222 \
     --hash=sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432
@@ -469,6 +469,6 @@ yarl==1.9.2 \
     --hash=sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9 \
     --hash=sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3 \
     --hash=sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560
-yt-dlp==2024.5.16.232713.dev0 \
-    --hash=sha256:42d3c27ab77583ff67ee2ddc94e376ea2a76a561ed8b1836ee04fd1cd23ad88c \
-    --hash=sha256:d431187fa703c9f52225080ae56471272679e44d9363f97b7b3187d37a5e6480
+yt-dlp==2024.6.17.232743.dev0 \
+    --hash=sha256:2f6f44eff755a7b051cdcd3c4375771033dbeb64d6164351022efdc67cce0c52 \
+    --hash=sha256:dd6e7e194b96e778691f58a0cb6b42956cf956b22f6bb1a12bdef5ab3ac0c9ad

update-requirements.sh

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

xiaomusic/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.34"
+__version__ = "0.1.54"

xiaomusic/config.py

@@ -3,8 +3,7 @@ from __future__ import annotations
 import argparse
 import json
 import os
-from dataclasses import dataclass, field
-from typing import Any, Iterable
+from dataclasses import dataclass
 
 from xiaomusic.utils import validate_proxy
 
@@ -13,7 +12,7 @@ COOKIE_TEMPLATE = "deviceId={device_id}; serviceToken={service_token}; userId={u
 HARDWARE_COMMAND_DICT = {
     # hardware: (tts_command, wakeup_command, volume_command)
     "LX06": ("5-1", "5-5", "2-1"),
-    "L05B": ("5-3", "5-4", "2-1"),    
+    "L05B": ("5-3", "5-4", "2-1"),
     "S12": ("5-1", "5-5", "2-1"),  # 第一代小爱，型号MDZ-25-DA
     "S12A": ("5-1", "5-5", "2-1"),
     "LX01": ("5-1", "5-5", "2-1"),
@@ -43,6 +42,8 @@ KEY_WORD_DICT = {
     "关机": "stop",
     "停止播放": "stop",
     "分钟后关机": "stop_after_minute",
+    "播放列表": "play_music_list",
+    "刷新列表": "gen_music_list",
     "set_volume#": "set_volume",
     "get_volume#": "get_volume",
 }
@@ -65,6 +66,8 @@ KEY_MATCH_ORDER = [
     "随机播放",
     "关机",
     "停止播放",
+    "刷新列表",
+    "播放列表",
 ]
 
 SUPPORT_MUSIC_TYPE = [
@@ -82,8 +85,9 @@ class Config:
     mute_xiaoai: bool = True
     cookie: str = ""
     use_command: bool = False
-    verbose: bool = False
+    verbose: bool = os.getenv("XIAOMUSIC_VERBOSE", "").lower() == "true"
     music_path: str = os.getenv("XIAOMUSIC_MUSIC_PATH", "music")
+    conf_path: str = os.getenv("XIAOMUSIC_CONF_PATH", None)
     hostname: str = os.getenv("XIAOMUSIC_HOSTNAME", "192.168.2.5")
     port: int = int(os.getenv("XIAOMUSIC_PORT", "8090"))
     proxy: str | None = os.getenv("XIAOMUSIC_PROXY", None)
@@ -92,6 +96,8 @@ class Config:
     )  # "bilisearch:" or "ytsearch:"
     ffmpeg_location: str = os.getenv("XIAOMUSIC_FFMPEG_LOCATION", "./ffmpeg/bin")
     active_cmd: str = os.getenv("XIAOMUSIC_ACTIVE_CMD", "play,random_play")
+    exclude_dirs: str = os.getenv("XIAOMUSIC_EXCLUDE_DIRS", "@eaDir")
+    music_path_depth: int = int(os.getenv("XIAOMUSIC_MUSIC_PATH_DEPTH", "10"))
 
     def __post_init__(self) -> None:
         if self.proxy:

xiaomusic/httpserver.py

@@ -1,25 +1,21 @@
 #!/usr/bin/env python3
 import os
-import sys
-import traceback
-import asyncio
+from threading import Thread
 
 from flask import Flask, request, send_from_directory
 from waitress import serve
-from threading import Thread
-
-from xiaomusic.config import (
-    KEY_WORD_DICT,
-)
 
 from xiaomusic import (
     __version__,
 )
+from xiaomusic.config import (
+    KEY_WORD_DICT,
+)
 
 # 隐藏 flask 启动告警
 # https://gist.github.com/jerblack/735b9953ba1ab6234abb43174210d356
-#from flask import cli
-#cli.show_server_banner = lambda *_: None
+# from flask import cli
+# cli.show_server_banner = lambda *_: None
 
 app = Flask(__name__)
 host = "0.0.0.0"
@@ -33,6 +29,7 @@ log = None
 def allcmds():
     return KEY_WORD_DICT
 
+
 @app.route("/getversion", methods=["GET"])
 def getversion():
     log.debug("getversion %s", __version__)
@@ -40,6 +37,7 @@ def getversion():
         "version": __version__,
     }
 
+
 @app.route("/getvolume", methods=["GET"])
 def getvolume():
     volume = xiaomusic.get_volume_ret()
@@ -47,15 +45,18 @@ def getvolume():
         "volume": volume,
     }
 
+
 @app.route("/searchmusic", methods=["GET"])
 def searchmusic():
-    name = request.args.get('name')
+    name = request.args.get("name")
     return xiaomusic.searchmusic(name)
 
+
 @app.route("/playingmusic", methods=["GET"])
 def playingmusic():
     return xiaomusic.playingmusic()
 
+
 @app.route("/", methods=["GET"])
 def redirect_to_index():
     return send_from_directory("static", "index.html")
@@ -71,6 +72,7 @@ async def do_cmd():
         return {"ret": "OK"}
     return {"ret": "Unknow cmd"}
 
+
 @app.route("/getsetting", methods=["GET"])
 async def getsetting():
     config = xiaomusic.getconfig()
@@ -88,6 +90,7 @@ async def getsetting():
     }
     return data
 
+
 @app.route("/savesetting", methods=["POST"])
 async def savesetting():
     data = request.get_json()
@@ -95,6 +98,25 @@ async def savesetting():
     await xiaomusic.saveconfig(data)
     return "save success"
 
+
+@app.route("/musiclist", methods=["GET"])
+async def musiclist():
+    return xiaomusic.get_music_list()
+
+
+@app.route("/curplaylist", methods=["GET"])
+async def curplaylist():
+    return xiaomusic.get_cur_play_list()
+
+
+@app.route("/delmusic", methods=["POST"])
+def delmusic():
+    data = request.get_json()
+    log.info(data)
+    xiaomusic.del_music(data["name"])
+    return "success"
+
+
 def static_path_handler(filename):
     log.debug(filename)
     log.debug(static_path)
@@ -102,9 +124,11 @@ def static_path_handler(filename):
     log.debug(absolute_path)
     return send_from_directory(absolute_path, filename)
 
+
 def run_app():
     serve(app, host=host, port=port)
 
+
 def StartHTTPServer(_port, _static_path, _xiaomusic):
     global port, static_path, xiaomusic, log
     port = _port

xiaomusic/static/app.js

@@ -1,11 +1,11 @@
 $(function(){
   $container=$("#cmds");
-  append_op_button_name("下一首");
   append_op_button_name("全部循环");
-  append_op_button_name("关机");
   append_op_button_name("单曲循环");
-  append_op_button_name("播放歌曲");
   append_op_button_name("随机播放");
+  append_op_button_name("刷新列表");
+  append_op_button_name("下一首");
+  append_op_button_name("关机");
 
   $container.append($("<hr>"));
 
@@ -26,6 +26,61 @@ $(function(){
     $("#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", function(data, status) {
+        $('#music_list').val(data);
+        $('#music_list').trigger('change');
+      })
+    })
+  }
+  refresh_music_list();
+
+  $("#play_music_list").on("click", () => {
+    var music_list = $("#music_list").val();
+    var music_name = $("#music_name").val();
+    let cmd = "播放列表" + music_list + "|" + music_name;
+    sendcmd(cmd);
+  });
+
+  $("#del_music").on("click", () => {
+    var del_music_name = $("#music_name").val();
+    if (confirm(`确定删除歌曲 ${del_music_name} 吗？`)) {
+      console.log(`删除歌曲 ${del_music_name}`);
+      $.ajax({
+        type: 'POST',
+        url: '/delmusic',
+        data: JSON.stringify({"name": del_music_name}),
+        contentType: "application/json; charset=utf-8",
+        success: () => {
+          alert(`删除 ${del_music_name} 成功`);
+          refresh_music_list();
+        },
+        error: () => {
+          alert(`删除 ${del_music_name} 失败`);
+        }
+      });
+    }
+  });
 
   function append_op_button_name(name) {
     append_op_button(name, name);
@@ -48,8 +103,8 @@ $(function(){
 
   $("#play").on("click", () => {
     var search_key = $("#music-name").val();
-    var filename=$("#music-filename").val();
-    let cmd = "播放歌曲"+search_key+"|"+filename;
+    var filename = $("#music-filename").val();
+    let cmd = "播放歌曲" + search_key + "|" + filename;
     sendcmd(cmd);
   });
 
@@ -62,10 +117,12 @@ $(function(){
     $.ajax({
       type: "POST",
       url: "/cmd",
-      contentType: "application/json",
+      contentType: "application/json; charset=utf-8",
       data: JSON.stringify({cmd: cmd}),
       success: () => {
-        // 请求成功时执行的操作
+        if (cmd == "刷新列表") {
+          setTimeout(refresh_music_list, 3000);
+        }
       },
       error: () => {
         // 请求失败时执行的操作
@@ -107,4 +164,23 @@ $(function(){
   setInterval(() => {
     get_playing_music();
   }, 3000);
+
+  function custom_sort_key(a, b) {
+    // 使用正则表达式提取数字前缀
+    const numericPrefixA = a.match(/^(\d+)/) ? parseInt(a.match(/^(\d+)/)[1], 10) : null;
+    const numericPrefixB = b.match(/^(\d+)/) ? parseInt(b.match(/^(\d+)/)[1], 10) : null;
+
+    // 如果两个键都有数字前缀，则按数字大小排序
+    if (numericPrefixA !== null && numericPrefixB !== null) {
+      return numericPrefixA - numericPrefixB;
+    }
+
+    // 如果一个键有数字前缀而另一个没有，则有数字前缀的键排在前面
+    if (numericPrefixA !== null) return -1;
+    if (numericPrefixB !== null) return 1;
+
+    // 如果两个键都没有数字前缀，则按照常规字符串排序
+    return a.localeCompare(b);
+  }
+
 });

xiaomusic/static/index.html

@@ -33,6 +33,16 @@
       <div id="playering-music" class="text"></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>
+
     <footer>
       <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
     </footer>

xiaomusic/static/style.css

@@ -62,7 +62,6 @@ input,select {
 }
 
 footer {
-  position: fixed;
   bottom: 0;
   width: 100%;
   text-align: center;

xiaomusic/utils.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
+import difflib
 import os
 import re
-import socket
+from collections.abc import AsyncIterator
 from http.cookies import SimpleCookie
-from typing import AsyncIterator
 from urllib.parse import urlparse
-import difflib
 
 from requests.utils import cookiejar_from_dict
 
@@ -62,6 +61,86 @@ def validate_proxy(proxy_str: str) -> bool:
 
     return True
 
+
 # 模糊搜索
 def fuzzyfinder(user_input, collection):
     return difflib.get_close_matches(user_input, collection, 10, cutoff=0.1)
+
+
+# 歌曲排序
+def custom_sort_key(s):
+    # 使用正则表达式分别提取字符串的数字前缀和数字后缀
+    prefix_match = re.match(r"^(\d+)", s)
+    suffix_match = re.search(r"(\d+)$", s)
+
+    numeric_prefix = int(prefix_match.group(0)) if prefix_match else None
+    numeric_suffix = int(suffix_match.group(0)) if suffix_match else None
+
+    if numeric_prefix is not None:
+        # 如果前缀是数字，先按前缀数字排序，再按整个字符串排序
+        return (0, numeric_prefix, s)
+    elif numeric_suffix is not None:
+        # 如果后缀是数字，先按前缀字符排序，再按后缀数字排序
+        return (1, s[: suffix_match.start()], numeric_suffix)
+    else:
+        # 如果前缀和后缀都不是数字，按字典序排序
+        return (2, s)
+
+
+# fork from https://gist.github.com/dougthor42/001355248518bc64d2f8
+def walk_to_depth(root, depth=None, *args, **kwargs):
+    """
+    Wrapper around os.walk that stops after going down `depth` folders.
+    I had my own version, but it wasn't as efficient as
+    http://stackoverflow.com/a/234329/1354930, so I modified to be more
+    similar to nosklo's answer.
+    However, nosklo's answer doesn't work if topdown=False, so I kept my
+    version.
+    """
+    # Let people use this as a standard `os.walk` function.
+    if depth is None:
+        return os.walk(root, *args, **kwargs)
+
+    # remove any trailing separators so that our counts are correct.
+    root = root.rstrip(os.path.sep)
+
+    def main_func(root, depth, *args, **kwargs):
+        """Faster because it skips traversing dirs that are too deep."""
+        root_depth = root.count(os.path.sep)
+        for dirpath, dirnames, filenames in os.walk(root, *args, **kwargs):
+            yield (dirpath, dirnames, filenames)
+
+            # calculate how far down we are.
+            current_folder_depth = dirpath.count(os.path.sep)
+            if current_folder_depth >= root_depth + depth:
+                del dirnames[:]
+
+    def fallback_func(root, depth, *args, **kwargs):
+        """Slower, but works when topdown is False"""
+        root_depth = root.count(os.path.sep)
+        for dirpath, dirnames, filenames in os.walk(root, *args, **kwargs):
+            current_folder_depth = dirpath.count(os.path.sep)
+            if current_folder_depth <= root_depth + depth:
+                yield (dirpath, dirnames, filenames)
+
+    # there's gotta be a better way do do this...
+    try:
+        if args[0] is False:
+            yield from fallback_func(root, depth, *args, **kwargs)
+            return
+        else:
+            yield from main_func(root, depth, *args, **kwargs)
+            return
+    except IndexError:
+        pass
+
+    try:
+        if kwargs["topdown"] is False:
+            yield from fallback_func(root, depth, *args, **kwargs)
+            return
+        else:
+            yield from main_func(root, depth, *args, **kwargs)
+            return
+    except KeyError:
+        yield from main_func(root, depth, *args, **kwargs)
+        return

xiaomusic/xiaomusic.py

@@ -3,44 +3,44 @@ import asyncio
 import json
 import logging
 import os
+import queue
 import random
 import re
 import time
-import urllib.parse
 import traceback
-import mutagen
-import queue
-from xiaomusic.httpserver import StartHTTPServer
-
+import urllib.parse
 from pathlib import Path
 
+import mutagen
 from aiohttp import ClientSession, ClientTimeout
 from miservice import MiAccount, MiIOService, MiNAService, miio_command
-from rich import print
-from rich.logging import RichHandler
-
-from xiaomusic.config import (
-    COOKIE_TEMPLATE,
-    LATEST_ASK_API,
-    KEY_WORD_DICT,
-    KEY_WORD_ARG_BEFORE_DICT,
-    KEY_MATCH_ORDER,
-    SUPPORT_MUSIC_TYPE,
-    Config,
-)
-from xiaomusic.utils import (
-    parse_cookie_string,
-    fuzzyfinder,
-)
 
 from xiaomusic import (
     __version__,
 )
+from xiaomusic.config import (
+    COOKIE_TEMPLATE,
+    KEY_MATCH_ORDER,
+    KEY_WORD_ARG_BEFORE_DICT,
+    KEY_WORD_DICT,
+    LATEST_ASK_API,
+    SUPPORT_MUSIC_TYPE,
+    Config,
+)
+from xiaomusic.httpserver import StartHTTPServer
+from xiaomusic.utils import (
+    custom_sort_key,
+    fuzzyfinder,
+    parse_cookie_string,
+    walk_to_depth,
+)
 
 EOF = object()
 
 PLAY_TYPE_ONE = 0  # 单曲循环
 PLAY_TYPE_ALL = 1  # 全部循环
+PLAY_TYPE_RND = 2  # 随机播放
+
 
 class XiaoMusic:
     def __init__(self, config: Config):
@@ -58,23 +58,31 @@ class XiaoMusic:
         self.queue = queue.Queue()
 
         self.music_path = config.music_path
+        self.conf_path = config.conf_path
+        if not self.conf_path:
+            self.conf_path = config.music_path
+
         self.hostname = config.hostname
         self.port = config.port
         self.proxy = config.proxy
         self.search_prefix = config.search_prefix
         self.ffmpeg_location = config.ffmpeg_location
         self.active_cmd = config.active_cmd.split(",")
+        self.exclude_dirs = set(config.exclude_dirs.split(","))
+        self.music_path_depth = config.music_path_depth
 
         # 下载对象
         self.download_proc = None
         # 单曲循环，全部循环
-        self.play_type = PLAY_TYPE_ALL
+        self.play_type = PLAY_TYPE_RND
         self.cur_music = ""
         self._next_timer = None
         self._timeout = 0
         self._volume = 0
         self._all_music = {}
         self._play_list = []
+        self._cur_play_list = ""
+        self._music_list = {}  # 播放列表 key 为目录名, value 为 play_list
         self._playing = False
 
         # 关机定时器
@@ -82,9 +90,8 @@ class XiaoMusic:
 
         # setup logger
         logging.basicConfig(
-            format=f"[{__version__}]\t%(message)s",
+            format=f"%(asctime)s [{__version__}] [%(levelname)s] %(message)s",
             datefmt="[%X]",
-            handlers=[RichHandler(rich_tracebacks=True)]
         )
         self.log = logging.getLogger("xiaomusic")
         self.log.setLevel(logging.DEBUG if config.verbose else logging.INFO)
@@ -94,7 +101,7 @@ class XiaoMusic:
         self.try_init_setting()
 
         # 启动时重新生成一次播放列表
-        self.gen_all_music_list()
+        self._gen_all_music_list()
 
         # 启动时初始化获取声音
         self.set_last_record("get_volume#")
@@ -154,7 +161,7 @@ class XiaoMusic:
                 self.device_id = h.get("deviceID")
                 break
         else:
-            raise Exception(
+            self.log.error(
                 f"we have no hardware: {self.config.hardware} please use `micli mina` to check"
             )
 
@@ -172,10 +179,12 @@ class XiaoMusic:
                     if d["model"].endswith(self.config.hardware.lower())
                 )
             except StopIteration:
-                raise Exception(
+                self.log.error(
                     f"cannot find did for hardware: {self.config.hardware} "
                     "please set it via MI_DID env"
                 )
+            except Exception as e:
+                self.log.error(f"Execption init hardware {e}")
 
     def get_cookie(self):
         if self.config.cookie:
@@ -199,13 +208,12 @@ class XiaoMusic:
         for i in range(retries):
             try:
                 timeout = ClientTimeout(total=15)
-                r = await session.get(
-                    LATEST_ASK_API.format(
-                        hardware=self.config.hardware,
-                        timestamp=str(int(time.time() * 1000)),
-                    ),
-                    timeout=timeout,
+                url = LATEST_ASK_API.format(
+                    hardware=self.config.hardware,
+                    timestamp=str(int(time.time() * 1000)),
                 )
+                self.log.debug(f"url:{url}")
+                r = await session.get(url, timeout=timeout)
             except Exception as e:
                 self.log.warning(
                     "Execption when get latest ask from xiaoai: %s", str(e)
@@ -223,6 +231,7 @@ class XiaoMusic:
                 return self._get_last_query(data)
 
     def _get_last_query(self, data):
+        self.log.debug(f"_get_last_query:{data}")
         if d := data.get("data"):
             records = json.loads(d).get("records")
             if not records:
@@ -288,7 +297,10 @@ class XiaoMusic:
     def is_downloading(self):
         if not self.download_proc:
             return False
-        if self.download_proc.returncode != None and self.download_proc.returncode < 0:
+        if (
+            self.download_proc.returncode is not None
+            and self.download_proc.returncode < 0
+        ):
             return False
         return True
 
@@ -318,6 +330,7 @@ class XiaoMusic:
         if self.proxy:
             sbp_args += ("--proxy", f"{self.proxy}")
 
+        self.log.debug(f"download: {sbp_args}")
         self.download_proc = await asyncio.create_subprocess_exec(*sbp_args)
         await self.do_tts(f"正在下载歌曲{search_key}")
 
@@ -340,9 +353,19 @@ class XiaoMusic:
         return f"http://{self.hostname}:{self.port}/{encoded_name}"
 
     # 递归获取目录下所有歌曲,生成随机播放列表
-    def gen_all_music_list(self):
+    def _gen_all_music_list(self):
         self._all_music = {}
-        for root, dirs, filenames in os.walk(self.music_path):
+        all_music_by_dir = {}
+        for root, dirs, filenames in walk_to_depth(
+            self.music_path, depth=self.music_path_depth
+        ):
+            dirs[:] = [d for d in dirs if d not in self.exclude_dirs]
+            self.log.debug("root:%s dirs:%s music_path:%s", root, dirs, self.music_path)
+            dir_name = os.path.basename(root)
+            if self.music_path == root:
+                dir_name = "其他"
+            if dir_name not in all_music_by_dir:
+                all_music_by_dir[dir_name] = {}
             for filename in filenames:
                 self.log.debug("gen_all_music_list. filename:%s", filename)
                 # 过滤隐藏文件
@@ -361,10 +384,28 @@ class XiaoMusic:
 
                 # 歌曲名字相同会覆盖
                 self._all_music[name] = os.path.join(root, filename)
+                all_music_by_dir[dir_name][name] = True
+            pass
         self._play_list = list(self._all_music.keys())
-        random.shuffle(self._play_list)
+        self._cur_play_list = "全部"
+        self._gen_play_list()
         self.log.debug(self._all_music)
 
+        self._music_list = {}
+        self._music_list["全部"] = self._play_list
+        for dir_name, musics in all_music_by_dir.items():
+            self._music_list[dir_name] = list(musics.keys())
+            self.log.debug("dir_name:%s, list:%s", dir_name, self._music_list[dir_name])
+        pass
+
+    # 歌曲排序或者打乱顺序
+    def _gen_play_list(self):
+        if self.play_type == PLAY_TYPE_RND:
+            random.shuffle(self._play_list)
+        else:
+            self._play_list.sort(key=custom_sort_key)
+            self.log.debug("play_list:%s", self._play_list)
+
     # 把下载的音乐加入播放列表
     def add_download_music(self, name):
         self._all_music[name] = os.path.join(self.music_path, f"{name}.mp3")
@@ -377,7 +418,7 @@ class XiaoMusic:
     def get_next_music(self):
         play_list_len = len(self._play_list)
         if play_list_len == 0:
-            self.log.warning(f"没有随机到歌曲")
+            self.log.warning("没有随机到歌曲")
             return ""
         # 随机选择一个文件
         index = 0
@@ -388,8 +429,13 @@ class XiaoMusic:
         next_index = index + 1
         if next_index >= play_list_len:
             next_index = 0
-        filename = self._play_list[next_index]
-        return filename
+        name = self._play_list[next_index]
+        filename = self.get_filename(name)
+        if len(filename) <= 0:
+            self._play_list.pop(next_index)
+            self.log.info(f"pop not exist music:{name}")
+            return self.get_next_music()
+        return name
 
     # 获取文件播放时长
     def get_file_duration(self, filename):
@@ -406,7 +452,7 @@ class XiaoMusic:
         self.log.info(f"歌曲 {self.cur_music} : {filename} 的时长 {sec} 秒")
         if self._next_timer:
             self._next_timer.cancel()
-            self.log.info(f"定时器已取消")
+            self.log.info("定时器已取消")
         self._timeout = sec
 
         async def _do_next():
@@ -426,11 +472,11 @@ class XiaoMusic:
             await self.init_all_data(session)
             task = asyncio.create_task(self.poll_latest_ask())
             assert task is not None  # to keep the reference to task, do not remove this
-            filtered_keywords = [keyword for keyword in KEY_MATCH_ORDER if "#" not in keyword]
+            filtered_keywords = [
+                keyword for keyword in KEY_MATCH_ORDER if "#" not in keyword
+            ]
             joined_keywords = "/".join(filtered_keywords)
-            self.log.info(
-                f"Running xiaomusic now, 用`{joined_keywords}`开头来控制"
-            )
+            self.log.info(f"Running xiaomusic now, 用`{joined_keywords}`开头来控制")
 
             while True:
                 self.polling_event.set()
@@ -498,17 +544,35 @@ class XiaoMusic:
             return ("stop", {})
         return (None, None)
 
+    # 判断是否播放一下私募歌曲
+    def check_play_next(self):
+        # 当前没我在播放的歌曲
+        if self.cur_music == "":
+            return True
+        else:
+            filename = self.get_filename(self.cur_music)
+            # 当前播放的歌曲不存在了
+            if len(filename) <= 0:
+                return True
+            pass
+        return False
+
     # 播放歌曲
     async def play(self, **kwargs):
         self._playing = True
         parts = kwargs["arg1"].split("|")
         search_key = parts[0]
         name = parts[1] if len(parts) > 1 else search_key
-        if search_key == "" and name == "":
-            await self.play_next()
-            return
         if name == "":
             name = search_key
+
+        if search_key == "" and name == "":
+            if self.check_play_next():
+                await self.play_next()
+                return
+            else:
+                name = self.cur_music
+
         self.log.debug("play. search_key:%s name:%s", search_key, name)
         filename = self.get_filename(name)
 
@@ -534,42 +598,83 @@ class XiaoMusic:
         self.log.info("下一首")
         name = self.cur_music
         self.log.debug("play_next. name:%s, cur_music:%s", name, self.cur_music)
-        if self.play_type == PLAY_TYPE_ALL or name == "":
+        if (
+            self.play_type == PLAY_TYPE_ALL
+            or self.play_type == PLAY_TYPE_RND
+            or name == ""
+        ):
             name = self.get_next_music()
         if name == "":
-            await self.do_tts(f"本地没有歌曲")
+            await self.do_tts("本地没有歌曲")
             return
         await self.play(arg1=name)
 
     # 单曲循环
     async def set_play_type_one(self, **kwargs):
         self.play_type = PLAY_TYPE_ONE
-        await self.do_tts(f"已经设置为单曲循环")
+        await self.do_tts("已经设置为单曲循环")
 
     # 全部循环
     async def set_play_type_all(self, **kwargs):
         self.play_type = PLAY_TYPE_ALL
-        await self.do_tts(f"已经设置为全部循环")
+        self._gen_play_list()
+        await self.do_tts("已经设置为全部循环")
 
     # 随机播放
     async def random_play(self, **kwargs):
-        self.play_type = PLAY_TYPE_ALL
-        await self.do_tts(f"已经设置为全部循环并随机播放")
-        # 重新生成随机播放列表
-        self.gen_all_music_list()
-        await self.play_next()
+        self.play_type = PLAY_TYPE_RND
+        self._gen_play_list()
+        await self.do_tts("已经设置为随机播放")
+
+    # 刷新列表
+    async def gen_music_list(self, **kwargs):
+        self._gen_all_music_list()
+        await self.do_tts("生成播放列表完毕")
+
+    # 删除歌曲
+    def del_music(self, name):
+        filename = self.get_filename(name)
+        if filename == "":
+            self.log.info(f"${name} not exist")
+            return
+        try:
+            os.remove(filename)
+            self.log.info(f"del ${filename} success")
+        except OSError:
+            self.log.error(f"del ${filename} failed")
+            pass
+        self._gen_all_music_list()
+
+    # 播放一个播放列表
+    async def play_music_list(self, **kwargs):
+        parts = kwargs["arg1"].split("|")
+        list_name = parts[0]
+        if list_name not in self._music_list:
+            await self.do_tts(f"播放列表{list_name}不存在")
+            return
+        self._play_list = self._music_list[list_name]
+        self._cur_play_list = list_name
+        self._gen_play_list()
+        self.log.info(f"开始播放列表{list_name}")
+
+        music_name = ""
+        if len(parts) > 1:
+            music_name = parts[1]
+        else:
+            music_name = self.get_next_music()
+        await self.play(arg1=music_name)
 
     async def stop(self, **kwargs):
         self._playing = False
         if self._next_timer:
             self._next_timer.cancel()
-            self.log.info(f"定时器已取消")
+            self.log.info("定时器已取消")
         await self.force_stop_xiaoai()
 
     async def stop_after_minute(self, **kwargs):
         if self._stop_timer:
             self._stop_timer.cancel()
-            self.log.info(f"关机定时器已取消")
+            self.log.info("关机定时器已取消")
         minute = int(kwargs["arg1"])
 
         async def _do_stop():
@@ -589,7 +694,9 @@ class XiaoMusic:
     async def get_volume(self, **kwargs):
         playing_info = await self.mina_service.player_get_status(self.device_id)
         self.log.debug("get_volume. playing_info:%s", playing_info)
-        self._volume = json.loads(playing_info.get("data", {}).get("info", "{}")).get("volume", 5)
+        self._volume = json.loads(playing_info.get("data", {}).get("info", "{}")).get(
+            "volume", 5
+        )
         self.log.info("get_volume. volume:%s", self._volume)
 
     def get_volume_ret(self):
@@ -597,10 +704,19 @@ class XiaoMusic:
 
     # 搜索音乐
     def searchmusic(self, name):
-        search_list = fuzzyfinder(name, self._play_list)
+        all_music_list = list(self._all_music.keys())
+        search_list = fuzzyfinder(name, all_music_list)
         self.log.debug("searchmusic. name:%s search_list:%s", name, search_list)
         return search_list
 
+    # 获取播放列表
+    def get_music_list(self):
+        return self._music_list
+
+    # 获取当前的播放列表
+    def get_cur_play_list(self):
+        return self._cur_play_list
+
     # 正在播放中的音乐
     def playingmusic(self):
         self.log.debug("playingmusic. cur_music:%s", self.cur_music)
@@ -610,9 +726,16 @@ class XiaoMusic:
     def getconfig(self):
         return self.config
 
+    # 获取设置文件
+    def getsettingfile(self):
+        if not os.path.exists(self.conf_path):
+            os.makedirs(self.conf_path)
+        filename = os.path.join(self.conf_path, "setting.json")
+        return filename
+
     def try_init_setting(self):
         try:
-            filename = os.path.join(self.music_path, "setting.json")
+            filename = self.getsettingfile()
             with open(filename) as f:
                 data = json.loads(f.read())
                 self.update_config_from_setting(data)
@@ -620,12 +743,14 @@ class XiaoMusic:
             self.log.info(f"The file {filename} does not exist.")
         except json.JSONDecodeError:
             self.log.warning(f"The file {filename} contains invalid JSON.")
+        except Exception as e:
+            self.log.error(f"Execption init setting {e}")
 
     # 保存配置并重新启动
     async def saveconfig(self, data):
         # 默认暂时配置保存到 music 目录下
-        filename = os.path.join(self.music_path, "setting.json")
-        with open(filename, 'w', encoding='utf-8') as f:
+        filename = self.getsettingfile()
+        with open(filename, "w", encoding="utf-8") as f:
             json.dump(data, f, ensure_ascii=False, indent=4)
         self.update_config_from_setting(data)
         await self.call_main_thread_function(self.reinit)
@@ -670,12 +795,13 @@ class XiaoMusic:
     async def call_main_thread_function(self, func, arg1=None):
         loop = asyncio.get_event_loop()
         future = loop.create_future()
+
         def callback(ret):
             nonlocal future
             loop.call_soon_threadsafe(future.set_result, ret)
+
         self.queue.put((func, callback, arg1))
         self.last_record = None
         self.new_record_event.set()
         result = await future
         return result
-