From 2eb6e8035b301881acdbf80bc57f7e15419222d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Tue, 10 Jun 2025 16:43:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/httpserver.py | 4 ++-- xiaomusic/utils.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xiaomusic/httpserver.py b/xiaomusic/httpserver.py index f80f153..7442717 100644 --- a/xiaomusic/httpserver.py +++ b/xiaomusic/httpserver.py @@ -563,7 +563,7 @@ async def downloadplaylist(data: DownloadPlayList, Verifcation=Depends(verificat dir_path = os.path.join(config.download_path, data.dirname) log.debug(f"Download dir_path: {dir_path}") # 可能只是部分失败，都需要整理下载目录 - remove_common_prefix(dir_path) + remove_common_prefix(config.download_path, dir_path) chmoddir(dir_path) return {"ret": "OK"} else: @@ -577,7 +577,7 @@ async def downloadplaylist(data: DownloadPlayList, Verifcation=Depends(verificat dir_path = os.path.join(config.download_path, data.dirname) log.debug(f"Download dir_path: {dir_path}") # 可能只是部分失败，都需要整理下载目录 - remove_common_prefix(dir_path) + remove_common_prefix(config.download_path, dir_path) chmoddir(dir_path) asyncio.create_task(check_download_proc()) diff --git a/xiaomusic/utils.py b/xiaomusic/utils.py index 58820d3..b4d01ff 100644 --- a/xiaomusic/utils.py +++ b/xiaomusic/utils.py @@ -1108,9 +1108,7 @@ def _longest_common_prefix(file_names): # 移除目录下文件名前缀相同的 -def remove_common_prefix(directory): - # Define the safe root directory - safe_root = config.download_path +def remove_common_prefix(safe_root, directory): # Normalize the directory path normalized_directory = os.path.normpath(directory) # Ensure the directory is within the safe root