new version v0.1.87

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

Dockerfile

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

README.md

@@ -13,6 +13,8 @@
 
 <https://github.com/hanxi/xiaomusic>
 
+> 初次安装遇到问题请查阅 <https://github.com/hanxi/xiaomusic/issues/99> 上是否已经有解决办法。
+
 ## 最简配置运行
 
 已经支持在 web 页面配置其他参数，docker compose 配置如下：
@@ -48,7 +50,10 @@ docker run -e MI_USER='小米账号' \
 
 启动成功后，在 web 页面可以配置 MI_DID, MI_HARDWARE, XIAOMUSIC_SEARCH, XIAOMUSIC_PROXY 参数。
 
-如果需要修改 8090 端口为其他端口，比如 5678，需要这样配，3个数字都需要是 5678 
+### ✨ 修改8090端口
+
+如果需要修改 8090 端口为其他端口，比如 5678，需要这样配，3个数字都需要是 5678 。见 <https://github.com/hanxi/xiaomusic/issues/19>
+
 ```yaml
 services:
   xiaomusic:
@@ -69,6 +74,37 @@ services:
 
 其中 XIAOMUSIC_VERBOSE 设置为 'true' 时表示开启 debug 日志，遇到问题可以去 web 设置页面底部【下载日志文件】按钮，然后搜索一下日志文件内容确保里面没有账号密码信息后(有就删除这些敏感信息)，然后在提 issues 反馈问题时把下载的日志文件带上。
 
+## pip 方式安装运行
+
+```shell
+> pip install xiaomusic
+> xiaomusic --help
+ __  __  _                   __  __                 _
+ \ \/ / (_)   __ _    ___   |  \/  |  _   _   ___  (_)   ___
+  \  /  | |  / _` |  / _ \  | |\/| | | | | | / __| | |  / __|
+  /  \  | | | (_| | | (_) | | |  | | | |_| | \__ \ | | | (__
+ /_/\_\ |_|  \__,_|  \___/  |_|  |_|  \__,_| |___/ |_|  \___|
+          XiaoMusic v0.1.81 by: github.com/hanxi
+
+usage: xiaomusic.py [-h] [--hardware HARDWARE] [--account ACCOUNT]
+                    [--password PASSWORD] [--cookie COOKIE] [--verbose]
+                    [--config CONFIG] [--ffmpeg_location FFMPEG_LOCATION]
+
+options:
+  -h, --help            show this help message and exit
+  --hardware HARDWARE   小爱 hardware
+  --account ACCOUNT     xiaomi account
+  --password PASSWORD   xiaomi password
+  --cookie COOKIE       xiaomi cookie
+  --verbose             show info
+  --config CONFIG       config file path
+  --ffmpeg_location FFMPEG_LOCATION
+                        ffmpeg bin path
+> xiaomusic --config config.json
+```
+
+其中 `config.json` 文件可以参考 `config-example.json` 文件配置。见 <https://github.com/hanxi/xiaomusic/issues/94>
+
 ## 开发环境运行
 
 - 使用 install_dependencies.sh 下载依赖
@@ -105,20 +141,20 @@ pdm run xiaomusic.py
 
 ## 已测试支持的设备
 
-```txt
-- L06A
-- L07A
-- S12
-- S12A
-- LX5A
-- LX05
-- L16A
-- L17A
-- LX06
-- LX01
-- L05B
-- L05C
-````
+| 型号   | 名称                                                                                             |
+| ---- | ---------------------------------------------------------------------------------------------- |
+| L06A | [小爱音箱](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l06a)             |
+| L07A | [Redmi小爱音箱 Play](https://home.mi.com/webapp/content/baike/product/index.html?model=xiaomi.wifispeaker.l7a)                     |
+| S12  | [小米AI音箱](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.s12)            |
+| S12A | -                                                                                              |
+| LX5A | [小爱音箱 万能遥控版](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.lx5a)       |
+| LX05 | [小爱音箱Play（2019款）](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.lx05)  |
+| L16A | [Xiaomi Sound](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l16a)     |
+| L17A | [Xiaomi Sound Pro](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l17a) |
+| LX06 | [小爱音箱Pro](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.lx06)          |
+| LX01 | [小爱音箱mini](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.lx01)         |
+| L05B | [小爱音箱Play](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l05b)         |
+| L05C | [小米小爱音箱Play 增强版](https://home.mi.com/baike/index.html#/detail?model=xiaomi.wifispeaker.l05c)   |
 
 型号与产品名称对照可以在这里查询 <https://home.miot-spec.com/s/xiaomi.wifispeaker>
 
@@ -287,7 +323,7 @@ services:
 - XIAOMUSIC_HTTPAUTH_PASSWORD 配置 web 控制台密码
 - XIAOMUSIC_CONF_PATH 用来存放配置文件的目录，记得把目录映射到主机，默认情况会把配置存放在music目录，具体见 <https://github.com/hanxi/xiaomusic/issues/74>
 - XIAOMUSIC_DISABLE_DOWNLOAD 设为 true 时关闭下载功能，见 <https://github.com/hanxi/xiaomusic/issues/82>
-- XIAOMUSIC_USE_MUSIC_API 设为 true 时使用 player_play_music 接口播放音乐，用于兼容不能播放的型号
+- XIAOMUSIC_USE_MUSIC_API 设为 true 时使用 player_play_music 接口播放音乐，用于兼容不能播放的型号，v0.1.86 之后的版本可以不用设置。
 - XIAOMUSIC_KEYWORDS_PLAY 用来播放歌曲的口令前缀，默认是 "播放歌曲,放歌曲" ，可以用英文逗号分割配置多个
 - XIAOMUSIC_KEYWORDS_STOP 用来关机的口令，默认是 "关机,暂停,停止" ，可以用英文逗号分割配置多个。
 - XIAOMUSIC_KEYWORDS_PLAYLOCAL 用来播放本地歌曲的口令前缀，本地找不到时不会下载歌曲，默认是 "播放本地歌曲,本地播放歌曲" ，可以用英文逗号分割配置多个。

config-example.json

@@ -0,0 +1,32 @@
+{
+    "hardware": "L07A",
+    "account": "",
+    "password": "",
+    "mi_did": "",
+    "cookie": "",
+    "verbose": false,
+    "music_path": "music",
+    "conf_path": null,
+    "hostname": "192.168.2.5",
+    "port": 8090,
+    "proxy": null,
+    "search_prefix": "ytsearch:",
+    "ffmpeg_location": "./ffmpeg/bin",
+    "active_cmd": "play,random_play,playlocal,play_music_list,stop",
+    "exclude_dirs": "@eaDir",
+    "music_path_depth": 10,
+    "disable_httpauth": true,
+    "httpauth_username": "admin",
+    "httpauth_password": "admin",
+    "music_list_url": "",
+    "music_list_json": "",
+    "disable_download": false,
+    "use_music_api": false,
+    "log_file": "/tmp/xiaomusic.txt",
+    "fuzzy_match_cutoff": 0.6,
+    "enable_fuzzy_match": true,
+    "stop_tts_msg": "收到,再见",
+    "keywords_playlocal": "播放本地歌曲,本地播放歌曲",
+    "keywords_play": "播放歌曲,放歌曲",
+    "keywords_stop": "关机,暂停,停止,停止播放"
+}

install_dependencies.sh

@@ -4,14 +4,41 @@
 # https://github.com/yt-dlp/yt-dlp#dependencies
 
 # 判断系统架构
-arch=$(arch)
+arch=$(uname -m)
 
-pkg=ffmpeg-master-latest-linuxarm64-gpl
-if [[ "${arch}" == "x86_64" ]]; then
+# 输出架构信息
+echo "当前系统架构是：$arch"
+
+install_from_build() {
+	pkg=$1
+	wget https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/$pkg.tar.xz
+	tar -xvJf $pkg.tar.xz
+	mv $pkg ffmpeg
+}
+
+install_from_apt() {
+	apt-get update
+	apt-get install -y ffmpeg
+	rm -rf /var/lib/apt/lists/*
+	mkdir -p /app/ffmpeg/bin
+	ln -s /usr/bin/ffmpeg /app/ffmpeg/bin/ffmpeg
+	ln -s /usr/bin/ffprobe /app/ffmpeg/bin/ffprobe
+}
+
+# 基于架构执行不同的操作
+case "$arch" in
+x86_64)
+	echo "64位 x86 架构"
 	pkg=ffmpeg-master-latest-linux64-gpl
-fi
-
-#export ALL_PROXY=http://192.168.2.5:8080
-wget https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/$pkg.tar.xz
-tar -xvJf $pkg.tar.xz
-mv $pkg ffmpeg
+	install_from_build "$pkg"
+	;;
+arm64 | aarch64)
+	echo "64位 ARM 架构"
+	pkg=ffmpeg-master-latest-linuxarm64-gpl
+	install_from_build "$pkg"
+	;;
+*)
+	echo "未知架构 $arch"
+	install_from_apt
+	;;
+esac

pdm.lock

@@ -5,7 +5,7 @@
 groups = ["default", "lint"]
 strategy = ["cross_platform"]
 lock_version = "4.4.1"
-content_hash = "sha256:813253734c7d7835a76cd87fe8fe0329e02ad067f535aee6a9e11cb106569dd2"
+content_hash = "sha256:e7455b13bf13306ccf5ad11781191edb62991d9fbe8f8ce1e61a2f35c713cc2a"
 
 [[package]]
 name = "aiohttp"
@@ -519,7 +519,7 @@ files = [
 
 [[package]]
 name = "miservice-fork"
-version = "2.6.0"
+version = "2.6.1"
 requires_python = ">=3.8"
 summary = "XiaoMi Cloud Service fork from https://github.com/Yonsm/MiService"
 dependencies = [
@@ -528,8 +528,8 @@ dependencies = [
     "rich",
 ]
 files = [
-    {file = "miservice_fork-2.6.0-py3-none-any.whl", hash = "sha256:98169a77ea41a7b9392e1b1fab8cb80a4165fed8a9e882d9ada9a16dd1120347"},
-    {file = "miservice_fork-2.6.0.tar.gz", hash = "sha256:a59d337d1f7a92566aa147e96595a8d2f5bf3f7000ae5e7dd9ed451f18d6e2fd"},
+    {file = "miservice_fork-2.6.1-py3-none-any.whl", hash = "sha256:9b2cc4208486bbbf788d1bde6e2cbc70f241ce10db4dca6f918076a2d2942a39"},
+    {file = "miservice_fork-2.6.1.tar.gz", hash = "sha256:1702281e1e9827958eb3e82bc3242cd013c018e9aa1de8509b4805b5ccf5e60c"},
 ]
 
 [[package]]
@@ -632,8 +632,8 @@ files = [
 
 [[package]]
 name = "requests"
-version = "2.32.3"
-requires_python = ">=3.8"
+version = "2.31.0"
+requires_python = ">=3.7"
 summary = "Python HTTP for Humans."
 dependencies = [
     "certifi>=2017.4.17",
@@ -642,8 +642,8 @@ dependencies = [
     "urllib3<3,>=1.21.1",
 ]
 files = [
-    {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"},
-    {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"},
+    {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
+    {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
 ]
 
 [[package]]
@@ -832,7 +832,7 @@ files = [
 
 [[package]]
 name = "yt-dlp"
-version = "2024.6.24.232830.dev0"
+version = "2024.5.30.232720.dev0"
 requires_python = ">=3.8"
 summary = "A feature-rich command-line audio/video downloader"
 dependencies = [
@@ -841,11 +841,11 @@ dependencies = [
     "certifi",
     "mutagen",
     "pycryptodomex",
-    "requests<3,>=2.32.2",
+    "requests<3,>=2.31.0",
     "urllib3<3,>=1.26.17",
     "websockets>=12.0",
 ]
 files = [
-    {file = "yt_dlp-2024.6.24.232830.dev0-py3-none-any.whl", hash = "sha256:efffecef44ce688e9ee3c02226eb1ba4ad64b37744726e9e4df5c2bd04ea93c5"},
-    {file = "yt_dlp-2024.6.24.232830.dev0.tar.gz", hash = "sha256:0e89b46958984954393692a8c41e0f6d76a773be2df381c3d3a4ff24ce89aa32"},
+    {file = "yt_dlp-2024.5.30.232720.dev0-py3-none-any.whl", hash = "sha256:d6e563a2923807392325722028e7792e35affb694a505617b008195d0d212d2c"},
+    {file = "yt_dlp-2024.5.30.232720.dev0.tar.gz", hash = "sha256:9e2b177c5b13ea6f54cee1c56a69dd7832d506fba73a2247c6470e7d1952f959"},
 ]

pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "xiaomusic"
-version = "0.1.80"
+version = "0.1.87"
 description = "Play Music with xiaomi AI speaker"
 authors = [
     {name = "涵曦", email = "im.hanxi@gmail.com"},
 ]
 dependencies = [
-    "requests>=2.31.0",
+    "requests==2.31.0",
     "aiohttp>=3.8.6",
     "miservice-fork>=2.5.0",
     "mutagen>=1.47.0",
@@ -19,6 +19,12 @@ requires-python = ">=3.10"
 readme = "README.md"
 license = {text = "MIT"}
 
+[project.urls]
+Homepage = "https://github.com/hanxi/xiaomusic"
+
+[project.scripts]
+xiaomusic = "xiaomusic.cli:main"
+
 [build-system]
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"

requirements.txt

@@ -305,9 +305,9 @@ MarkupSafe==2.1.4 \
 mdurl==0.1.2 \
     --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
     --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
-miservice-fork==2.6.0 \
-    --hash=sha256:98169a77ea41a7b9392e1b1fab8cb80a4165fed8a9e882d9ada9a16dd1120347 \
-    --hash=sha256:a59d337d1f7a92566aa147e96595a8d2f5bf3f7000ae5e7dd9ed451f18d6e2fd
+miservice-fork==2.6.1 \
+    --hash=sha256:1702281e1e9827958eb3e82bc3242cd013c018e9aa1de8509b4805b5ccf5e60c \
+    --hash=sha256:9b2cc4208486bbbf788d1bde6e2cbc70f241ce10db4dca6f918076a2d2942a39
 multidict==6.0.4 \
     --hash=sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9 \
     --hash=sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8 \
@@ -371,9 +371,9 @@ pycryptodomex==3.19.0 \
 pygments==2.16.1 \
     --hash=sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692 \
     --hash=sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29
-requests==2.32.3 \
-    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
-    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
+requests==2.31.0 \
+    --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
+    --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
 rich==13.7.1 \
     --hash=sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222 \
     --hash=sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432
@@ -472,6 +472,6 @@ yarl==1.9.2 \
     --hash=sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9 \
     --hash=sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3 \
     --hash=sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560
-yt-dlp==2024.6.24.232830.dev0 \
-    --hash=sha256:0e89b46958984954393692a8c41e0f6d76a773be2df381c3d3a4ff24ce89aa32 \
-    --hash=sha256:efffecef44ce688e9ee3c02226eb1ba4ad64b37744726e9e4df5c2bd04ea93c5
+yt-dlp==2024.5.30.232720.dev0 \
+    --hash=sha256:9e2b177c5b13ea6f54cee1c56a69dd7832d506fba73a2247c6470e7d1952f959 \
+    --hash=sha256:d6e563a2923807392325722028e7792e35affb694a505617b008195d0d212d2c

xiaomusic/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.80"
+__version__ = "0.1.87"

xiaomusic/cli.py

@@ -1,9 +1,21 @@
 import argparse
 import asyncio
 
+from xiaomusic import (
+    __version__,
+)
 from xiaomusic.config import Config
 from xiaomusic.xiaomusic import XiaoMusic
 
+LOGO = r"""
+ __  __  _                   __  __                 _
+ \ \/ / (_)   __ _    ___   |  \/  |  _   _   ___  (_)   ___
+  \  /  | |  / _` |  / _ \  | |\/| | | | | | / __| | |  / __|
+  /  \  | | | (_| | | (_) | | |  | | | |_| | \__ \ | | | (__
+ /_/\_\ |_|  \__,_|  \___/  |_|  |_|  \__,_| |___/ |_|  \___|
+          {}
+"""
+
 
 def main():
     parser = argparse.ArgumentParser()
@@ -45,6 +57,8 @@ def main():
         help="ffmpeg bin path",
     )
 
+    print(LOGO.format(f"XiaoMusic v{__version__} by: github.com/hanxi"))
+
     options = parser.parse_args()
     config = Config.from_options(options)
 

xiaomusic/config.py

@@ -88,6 +88,13 @@ class Config:
     enable_fuzzy_match: bool = (
         os.getenv("XIAOMUSIC_ENABLE_FUZZY_MATCH", "true").lower() == "true"
     )
+    stop_tts_msg: str = os.getenv("XIAOMUSIC_STOP_TTS_MSG", "收到,再见")
+
+    keywords_playlocal: str = os.getenv(
+        "XIAOMUSIC_KEYWORDS_PLAYLOCAL", "播放本地歌曲,本地播放歌曲"
+    )
+    keywords_play: str = os.getenv("XIAOMUSIC_KEYWORDS_PLAY", "播放歌曲,放歌曲")
+    keywords_stop: str = os.getenv("XIAOMUSIC_KEYWORDS_STOP", "关机,暂停,停止,停止播放")
 
     def append_keyword(self, keys, action):
         for key in keys.split(","):
@@ -98,14 +105,14 @@ class Config:
     def __post_init__(self) -> None:
         if self.proxy:
             validate_proxy(self.proxy)
-        keywords_playlocal = os.getenv(
-            "XIAOMUSIC_KEYWORDS_PLAYLOCAL", "播放本地歌曲,本地播放歌曲"
-        )
-        self.append_keyword(keywords_playlocal, "playlocal")
-        keywords_play = os.getenv("XIAOMUSIC_KEYWORDS_PLAY", "播放歌曲,放歌曲")
-        self.append_keyword(keywords_play, "play")
-        keywords_stop = os.getenv("XIAOMUSIC_KEYWORDS_STOP", "关机,暂停,停止")
-        self.append_keyword(keywords_stop, "stop")
+        self.append_keyword(self.keywords_playlocal, "playlocal")
+        self.append_keyword(self.keywords_play, "play")
+        self.append_keyword(self.keywords_stop, "stop")
+
+        # 保存配置到 config-example.json 文件
+        # with open("config-example.json", "w") as f:
+        #    data = asdict(self)
+        #    json.dump(data, f, ensure_ascii=False, indent=4)
 
     @classmethod
     def from_options(cls, options: argparse.Namespace) -> Config:

xiaomusic/httpserver.py

@@ -177,6 +177,16 @@ async def playurl():
     return await xiaomusic.call_main_thread_function(xiaomusic.play_url, arg1=url)
 
 
+@app.route("/debug_play_by_music_url", methods=["POST"])
+@auth.login_required
+async def debug_play_by_music_url():
+    data = request.get_json()
+    log.info(f"data:{data}")
+    return await xiaomusic.call_main_thread_function(
+        xiaomusic.debug_play_by_music_url, arg1=data
+    )
+
+
 def static_path_handler(filename):
     log.debug(filename)
     log.debug(static_path)

xiaomusic/static/app.js

@@ -23,7 +23,7 @@ $(function(){
   // 拉取版本
   $.get("/getversion", function(data, status) {
     console.log(data, status, data["version"]);
-    $("#version").text(`(${data.version})`);
+    $("#version").text(`${data.version}`);
   });
 
   // 拉取播放列表

xiaomusic/static/debug.html

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

xiaomusic/static/index.html

@@ -8,7 +8,11 @@
     <link rel="stylesheet" type="text/css" href="/static/style.css">
   </head>
   <body>
-    <h2>小爱音箱操控面板<span id="version">(版本未知)</span></h2>
+    <h2>小爱音箱操控面板
+      (<a  id="version" href="https://github.com/hanxi/xiaomusic/releases">
+        版本未知
+      </a>)
+    </h2>
     <hr>
     <div id="cmds">
     </div>

xiaomusic/static/setting.html

@@ -8,7 +8,11 @@
     <link rel="stylesheet" type="text/css" href="/static/style.css">
   </head>
   <body>
-    <h2>小爱音箱设置面板<span id="version">(版本未知)</span></h2>
+    <h2>小爱音箱设置面板
+      (<a  id="version" href="https://github.com/hanxi/xiaomusic/releases">
+        版本未知
+      </a>)
+    </h2>
     <hr>
     <div class="rows">
       <label for="mi_did">MI_DID:</label>
@@ -35,6 +39,8 @@
     <hr>
 
     <a href="/static/m3u.html" target="_blank">m3u文件转换工具</a>
+    <hr>
+    <a href="/static/debug.html" target="_blank">调试工具</a>
 
     <footer>
       <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>

xiaomusic/static/setting.js

@@ -2,7 +2,7 @@ $(function(){
   // 拉取版本
   $.get("/getversion", function(data, status) {
     console.log(data, status, data["version"]);
-    $("#version").text(`(${data.version})`);
+    $("#version").text(`${data.version}`);
   });
 
   const updateSelectOptions = (selectId, optionsList, selectedOption) => {

xiaomusic/xiaomusic.py

@@ -34,7 +34,6 @@ from xiaomusic.utils import (
     find_best_match,
     fuzzyfinder,
     get_local_music_duration,
-    get_random,
     get_web_music_duration,
     parse_cookie_string,
     walk_to_depth,
@@ -291,7 +290,7 @@ class XiaoMusic:
         except Exception as e:
             self.log.error(f"Execption {e}")
         # 最大等8秒
-        sec = min(8, int(len(value) / 3.3))
+        sec = min(8, int(len(value) / 3))
         await asyncio.sleep(sec)
         self.log.debug(f"do_tts. cur_music:{self.cur_music}")
         if self._playing and not self.is_downloading():
@@ -308,11 +307,25 @@ class XiaoMusic:
         except Exception as e:
             self.log.error(f"Execption {e}")
 
+    async def get_if_xiaoai_is_playing(self):
+        playing_info = await self.mina_service.player_get_status(self.device_id)
+        # WTF xiaomi api
+        is_playing = (
+            json.loads(playing_info.get("data", {}).get("info", "{}")).get("status", -1)
+            == 1
+        )
+        return is_playing
+
+    async def stop_if_xiaoai_is_playing(self):
+        is_playing = await self.get_if_xiaoai_is_playing()
+        if is_playing:
+            # stop it
+            ret = await self.mina_service.player_stop(self.device_id)
+            self.log.debug(f"force_stop_xiaoai player_stop ret:{ret}")
+
     async def force_stop_xiaoai(self):
         ret = await self.mina_service.player_pause(self.device_id)
         self.log.debug(f"force_stop_xiaoai player_pause ret:{ret}")
-        # ret = await self.mina_service.player_stop(self.device_id)
-        # self.log.debug(f"force_stop_xiaoai player_stop ret:{ret}")
 
     # 是否在下载中
     def is_downloading(self):
@@ -476,6 +489,7 @@ class XiaoMusic:
         if not self.config.music_list_json:
             return
 
+        self._all_radio = {}
         music_list = json.loads(self.config.music_list_json)
         try:
             for item in music_list:
@@ -610,8 +624,26 @@ class XiaoMusic:
                 except Exception as e:
                     self.log.warning(f"执行出错 {str(e)}\n{traceback.format_exc()}")
 
+    # 检查是否匹配到完全一样的指令
+    def check_full_match_cmd(self, query, ctrl_panel):
+        if query in self.config.key_match_order:
+            opkey = query
+            opvalue = self.config.key_word_dict.get(opkey)
+            if ctrl_panel or self._playing:
+                return opvalue
+            else:
+                if not self.active_cmd or opvalue in self.active_cmd:
+                    return opvalue
+        return None
+
     # 匹配命令
     def match_cmd(self, query, ctrl_panel):
+        # 优先处理完全匹配
+        opvalue = self.check_full_match_cmd(query, ctrl_panel)
+        if opvalue:
+            self.log.info(f"完全匹配指令. query:{query} opvalue:{opvalue}")
+            return (opvalue, "")
+
         for opkey in self.config.key_match_order:
             patternarg = rf"(.*){opkey}(.*)"
             # 匹配参数
@@ -629,16 +661,14 @@ class XiaoMusic:
                 argafter,
             )
             oparg = argafter
+            if opkey in KEY_WORD_ARG_BEFORE_DICT:
+                oparg = argpre
             opvalue = self.config.key_word_dict.get(opkey)
             if not ctrl_panel and not self._playing:
                 if self.active_cmd and opvalue not in self.active_cmd:
-                    self.log.debug(f"不在激活命令中 {opvalue}")
+                    self.log.ifno(f"不在激活命令中 {opvalue}")
                     continue
-            if opkey in KEY_WORD_ARG_BEFORE_DICT:
-                oparg = argpre
-            self.log.info(
-                "匹配到指令. opkey:%s opvalue:%s oparg:%s", opkey, opvalue, oparg
-            )
+            self.log.info(f"匹配到指令. opkey:{opkey} opvalue:{opvalue} oparg:{oparg}")
             return (opvalue, oparg)
         if self._playing:
             self.log.info("未匹配到指令，自动停止")
@@ -656,30 +686,10 @@ class XiaoMusic:
                 return True
         return False
 
-    async def _play_by_music_url(self, device_id, url):
-        audio_id = get_random(30)
-        audio_type = ""
-        if self.config.hardware in ["LX04", "X10A", "X08A"]:
-            audio_type = "MUSIC"
-        music = {
-            "payload": {
-                "audio_items": [
-                    {"item_id": {"audio_id": audio_id}, "stream": {"url": url}}
-                ],
-                "audio_type": audio_type,
-            }
-        }
-        return await self.mina_service.ubus_request(
-            device_id,
-            "player_play_music",
-            "mediaplayer",
-            {"startaudioid": audio_id, "music": json.dumps(music)},
-        )
-
     async def play_url(self, **kwargs):
         url = kwargs.get("arg1", "")
         if self.config.use_music_api:
-            ret = await self._play_by_music_url(self.device_id, url)
+            ret = await self.mina_service.play_by_music_url(self.device_id, url, _type=2)
             self.log.debug(
                 f"play_url play_by_music_url {self.config.hardware}. ret:{ret} url:{url}"
             )
@@ -855,7 +865,8 @@ class XiaoMusic:
     async def stop(self, **kwargs):
         self._playing = False
         if kwargs.get("arg1", "") != "notts":
-            await self.do_tts("收到关机口令,再见")
+            if self.config.stop_tts_msg:
+                await self.do_tts(self.config.stop_tts_msg)
         if self._next_timer:
             self._next_timer.cancel()
             self.log.info("定时器已取消")
@@ -1000,3 +1011,15 @@ class XiaoMusic:
         self.new_record_event.set()
         result = await future
         return result
+
+    async def debug_play_by_music_url(self, arg1=None):
+        if arg1 is None:
+            arg1 = {}
+        data = arg1
+        self.log.info(f"debug_play_by_music_url: {data}")
+        return await self.mina_service.ubus_request(
+            self.device_id,
+            "player_play_music",
+            "mediaplayer",
+            data,
+        )