From 96d03c5c298496879602dc6b068a1501141b992e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Wed, 17 Jul 2024 14:58:03 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E8=BD=AF=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=9B=B4=E6=8E=A5=E7=94=A8?= =?UTF-8?q?os.walk=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/utils.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/xiaomusic/utils.py b/xiaomusic/utils.py index 5e227fb..8287437 100644 --- a/xiaomusic/utils.py +++ b/xiaomusic/utils.py @@ -136,23 +136,11 @@ def _append_files_result(result, root, joinpath, files, support_extension): result[dir_name].append(os.path.join(joinpath, file)) -def custom_walk(top, followlinks=True): - for root, dirs, files in os.walk(top, followlinks=False): - yield root, dirs, files - - for dir in dirs: - path = os.path.join(root, dir) - if followlinks and os.path.islink(path): - # 如果启用 followlinks 并且是符号链接，获取其实际路径 - real_path = os.readlink(path) - yield from custom_walk(real_path, followlinks=followlinks) - - def traverse_music_directory( directory, depth=10, exclude_dirs=None, support_extension=None ): result = {} - for root, dirs, files in custom_walk(directory): + for root, dirs, files in os.walk(directory, followlinks=True): # 忽略排除的目录 dirs[:] = [d for d in dirs if d not in exclude_dirs]