From 90b0fecd3b3763b2a20311ca3f73e2a1ad838e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Sun, 14 Jul 2024 13:45:11 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BB=BA=E8=AE=AE=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=92=8C=E9=85=8D=E7=BD=AE=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=88=86=E5=BC=80=E4=B8=8D=E5=90=8C=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/config.py | 2 +- xiaomusic/xiaomusic.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xiaomusic/config.py b/xiaomusic/config.py index a14bbbd..11ba665 100644 --- a/xiaomusic/config.py +++ b/xiaomusic/config.py @@ -75,7 +75,7 @@ class Config: "XIAOMUSIC_MUSIC_PATH", "music" ) # 只能是music目录下的子目录 download_path: str = os.getenv("XIAOMUSIC_DOWNLOAD_PATH", "") - conf_path: str = os.getenv("XIAOMUSIC_CONF_PATH", None) + 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")) # 监听端口 public_port: int = int(os.getenv("XIAOMUSIC_PUBLIC_PORT", 0)) # 歌曲访问端口 diff --git a/xiaomusic/xiaomusic.py b/xiaomusic/xiaomusic.py index 881cc36..f72377c 100644 --- a/xiaomusic/xiaomusic.py +++ b/xiaomusic/xiaomusic.py @@ -81,11 +81,12 @@ class XiaoMusic: debug_config = deepcopy_data_no_sensitive_info(self.config) self.log.info(f"Startup OK. {debug_config}") + if self.conf_path == self.music_path: + self.log.warning("配置文件目录和音乐目录建议设置为不同的目录") + def init_config(self): self.music_path = self.config.music_path self.conf_path = self.config.conf_path - if not self.conf_path: - self.conf_path = self.config.music_path self.download_path = self.config.download_path if not self.download_path: self.download_path = self.music_path