From abe234c7ceed6178e8193d3e80d4f967e19081ce Mon Sep 17 00:00:00 2001
From: Huang <32005838+openrz@users.noreply.github.com>
Date: Sun, 23 Mar 2025 10:46:15 +0800
Subject: [PATCH] =?UTF-8?q?update:=E8=A1=A5=E5=85=85=E9=9F=B3=E4=B9=90?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84=E9=85=8D=E7=BD=AE=20(#479)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml                          | 7 +++++++
 main/xiaozhi-server/plugins_func/functions/play_music.py | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index 9221b471..1d977aa1 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -127,6 +127,13 @@ plugins:
       - 卧室,台灯,switch.iot_cn_831898993_socn1_on_p_2_1
     base_url: http://homeassistant.local:8123
     api_key: 你的home assistant api访问令牌
+  play_music:
+    music_dir: "./music"  # 音乐文件存放路径，将从该目录及子目录下搜索音乐文件
+    music_ext: # 音乐文件类型，p3格式效率最高
+      - ".mp3"
+      - ".wav"
+      - ".p3"
+    refresh_time: 300 # 刷新音乐列表的时间间隔，单位为秒
 
 
 Memory:
diff --git a/main/xiaozhi-server/plugins_func/functions/play_music.py b/main/xiaozhi-server/plugins_func/functions/play_music.py
index b78ff252..20148b5f 100644
--- a/main/xiaozhi-server/plugins_func/functions/play_music.py
+++ b/main/xiaozhi-server/plugins_func/functions/play_music.py
@@ -112,8 +112,8 @@ def get_music_files(music_dir, music_ext):
 def initialize_music_handler(conn):
     global MUSIC_CACHE
     if MUSIC_CACHE == {}:
-        if "music" in conn.config:
-            MUSIC_CACHE["music_config"] = conn.config["music"]
+        if "play_music" in conn.config["plugins"]:
+            MUSIC_CACHE["music_config"] = conn.config["plugins"]["play_music"]
             MUSIC_CACHE["music_dir"] = os.path.abspath(
                 MUSIC_CACHE["music_config"].get("music_dir", "./music")  # 默认路径修改
             )