bump: version 0.3.26 → 0.3.27

build: update static version
refactor: 处理 code review 问题'
2025-12-06 14:52:50 +08:00 · 2024-09-02 00:37:48 +00:00 · 2024-09-02 00:37:47 +00:00 · 2024-09-01 16:09:33 +00:00 · 2024-09-01 16:09:20 +00:00 · 2024-08-18 02:39:22 +00:00
12 changed files with 87 additions and 16 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 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
--- a/config-example.json
+++ b/config-example.json
@@ -77,5 +77,6 @@
  },
  "enable_force_stop": false,
  "devices": {},
-  "group_list": ""
-}
+  "group_list": "",
+  "convert_to_mp3": false
+}
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "xiaomusic"
-version = "0.3.26"
+version = "0.3.27"
 description = "Play Music with xiaomi AI speaker"
 authors = [
 {name = "涵曦", email = "im.hanxi@gmail.com"},
--- a/xiaomusic/init.py
+++ b/xiaomusic/init.py
@@ -1 +1 @@
-__version__ = "0.3.26"
+__version__ = "0.3.27"
--- a/xiaomusic/cli.py
+++ b/xiaomusic/cli.py
@@ -3,7 +3,6 @@ import argparse
 import json
 import os
 import signal
-import subprocess

 import uvicorn

--- a/xiaomusic/config.py
+++ b/xiaomusic/config.py
@@ -74,7 +74,7 @@ class Config:
    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")
    hostname: str = os.getenv("XIAOMUSIC_HOSTNAME", "192.168.2.5")
    port: int = int(os.getenv("XIAOMUSIC_PORT", "8090"))  # 监听端口
@@ -136,6 +136,7 @@ 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))  # 下一首歌延迟播放秒数

    def append_keyword(self, keys, action):
--- a/xiaomusic/static/debug.html
+++ b/xiaomusic/static/debug.html
@@ -5,9 +5,9 @@
    <meta name="viewport" content="width=device-width">
    <title>Debug For XiaoMusic</title>

-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1723906810">
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1725237467">
    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
-    <script src="/static/jquery-3.7.1.min.js?version=1723906810"></script>
+    <script src="/static/jquery-3.7.1.min.js?version=1725237467"></script>

    <script>
 var vConsole = new window.VConsole();
--- a/xiaomusic/static/index.html
+++ b/xiaomusic/static/index.html
@@ -3,9 +3,9 @@
  <head>
    <meta name="viewport" content="width=device-width">
    <title>小爱音箱操控面板</title>
-    <script src="/static/jquery-3.7.1.min.js?version=1723906810"></script>
-    <script src="/static/app.js?version=1723906810"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1723906810">
+    <script src="/static/jquery-3.7.1.min.js?version=1725237467"></script>
+    <script src="/static/app.js?version=1725237467"></script>
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1725237467">

    <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
--- a/xiaomusic/static/m3u.html
+++ b/xiaomusic/static/m3u.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width">
    <title>M3U to JSON Converter</title>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1723906810">
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1725237467">
    <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
 <script>
--- a/xiaomusic/static/setting.html
+++ b/xiaomusic/static/setting.html
@@ -3,9 +3,9 @@
  <head>
    <meta name="viewport" content="width=device-width">
    <title>小爱音箱操控面板</title>
-    <script src="/static/jquery-3.7.1.min.js?version=1723906810"></script>
-    <script src="/static/setting.js?version=1723906810"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1723906810">
+    <script src="/static/jquery-3.7.1.min.js?version=1725237467"></script>
+    <script src="/static/setting.js?version=1725237467"></script>
+    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1725237467">

    <!--
 <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
@@ -98,7 +98,13 @@ var vConsole = new window.VConsole();

        <label for="remove_id3tag">去除MP3 ID3v2和填充，减少播放前延迟:</label>
        <select id="remove_id3tag">
-          <option value="true" >true</option>
+          <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>

--- a/xiaomusic/utils.py
+++ b/xiaomusic/utils.py
@@ -11,6 +11,7 @@ import random
 import re
 import shutil
 import string
+import subprocess
 import tempfile
 from collections.abc import AsyncIterator
 from http.cookies import SimpleCookie
@@ -330,3 +331,35 @@ def remove_id3_tags(file_path):
        change = True

    return change
+
+
+def convert_file_to_mp3(input_file: str, ffmpeg_location: str, music_path: str) -> str:
+    """
+    Convert the music file to MP3 format and return the path of the temporary MP3 file.
+    """
+    # 指定临时文件的目录为 music_path 目录下的 tmp 文件夹
+    temp_dir = os.path.join(music_path, "tmp")
+    if not os.path.exists(temp_dir):
+        os.makedirs(temp_dir)  # 确保目录存在
+
+    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")
+
+    command = [
+        os.path.join(ffmpeg_location, "ffmpeg"),
+        "-i",
+        input_file,
+        "-f",
+        "mp3",
+        "-y",
+        out_file_path,
+    ]
+
+    try:
+        subprocess.run(command, check=True)
+    except subprocess.CalledProcessError as e:
+        print(f"Error during conversion: {e}")
+        return None
+
+    relative_path = os.path.relpath(out_file_path, music_path)
+    return relative_path
--- a/xiaomusic/xiaomusic.py
+++ b/xiaomusic/xiaomusic.py
@@ -32,6 +32,7 @@ from xiaomusic.const import (
 )
 from xiaomusic.plugin import PluginManager
 from xiaomusic.utils import (
+    convert_file_to_mp3,
    custom_sort_key,
    deepcopy_data_no_sensitive_info,
    find_best_match,
@@ -107,6 +108,7 @@ class XiaoMusic:
        self.exclude_dirs = set(self.config.exclude_dirs.split(","))
        self.music_path_depth = self.config.music_path_depth
        self.remove_id3tag = self.config.remove_id3tag
+        self.convert_to_mp3 = self.config.convert_to_mp3

    def update_devices(self):
        self.device_id_did = {}  # key 为 device_id
@@ -381,12 +383,27 @@ class XiaoMusic:
            else:
                self.log.info("No ID3 tag remove needed")

+        # 如果开启了MP3转换功能，且文件不是MP3格式，则进行转换
+        if self.convert_to_mp3 and not is_mp3(filename):
+            self.log.info(f"convert_to_mp3 is enabled. Checking file: {filename}")
+            temp_mp3_file = convert_file_to_mp3(
+                filename, self.config.ffmpeg_location, self.config.music_path
+            )
+            if temp_mp3_file:
+                self.log.info(f"Converted file: {filename} to {temp_mp3_file}")
+                filename = temp_mp3_file
+            else:
+                self.log.warning(f"Failed to convert file to MP3 format: {filename}")
+
+        # 构造音乐文件的URL
        filename = filename.replace("\\", "/")
        if filename.startswith(self.config.music_path):
            filename = filename[len(self.config.music_path) :]
        if filename.startswith("/"):
            filename = filename[1:]
+
        self.log.info(f"get_music_url local music. name:{name}, filename:{filename}")
+
        encoded_name = urllib.parse.quote(filename)
        return f"http://{self.hostname}:{self.public_port}/music/{encoded_name}"
Author	SHA1	Message	Date
涵曦	3c232505f8	bump: version 0.3.26 → 0.3.27	2024-09-02 00:37:48 +00:00
涵曦	44177db9b6	build: update static version	2024-09-02 00:37:47 +00:00
涵曦	e72ae973bc	refactor: 处理 code review 问题'	2024-09-01 16:09:33 +00:00
Hi-Jiajun	4ab3c5cbee	feat: Add feature as requested in issue #143	2024-09-01 16:09:20 +00:00
涵曦	4e532d298d	fix: 默认下载目录修改	2024-08-18 02:39:22 +00:00