From 662915c81defc6760fc75d1ebe89ec12ca0b9549 Mon Sep 17 00:00:00 2001 From: xuyanling Date: Sun, 17 Sep 2023 22:33:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(filemanager):=20=E4=BB=8E=E6=9C=AA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=BF=87=E7=9B=AE=E5=BD=95=E5=90=8C=E6=AD=A5=E7=9A=84?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E8=AE=BE=E7=BD=AE=EF=BC=8C=E6=8A=A5None=20Ty?= =?UTF-8?q?pe=20no=20restrip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/main.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/web/main.py b/web/main.py index cb69d2f1..b0756e8b 100644 --- a/web/main.py +++ b/web/main.py @@ -1097,7 +1097,20 @@ def get_hardlink_info(folder): result, sync_class, link_path, link_direction = match_sync_dir(folder, dir[1], dir[0], dir[2], '←') if result: break return sync_class, link_path, link_direction - + + def add_paths_to_media_dirs(paths, media_dirs): + """ + 添加路径到媒体目录列表。 + + :param paths: 待添加的路径列表 + :param media_dirs: 媒体目录列表 + """ + if not paths: + return + + valid_paths = [pathElement.rstrip('/') for pathElement in paths if StringUtils.is_string_and_not_empty(pathElement)] + media_dirs.extend(valid_paths) + def get_media_dirs(): """ 获取媒体库目录 @@ -1107,10 +1120,10 @@ def get_media_dirs(): tv_path = Config().get_config('media').get('tv_path') anime_path = Config().get_config('media').get('anime_path') unknown_path = Config().get_config('media').get('unknown_path') - if movie_path is not None: media_dirs.extend([path.rstrip('/') for path in movie_path]) - if tv_path is not None: media_dirs.extend([path.rstrip('/') for path in tv_path]) - if anime_path is not None: media_dirs.extend([path.rstrip('/') for path in anime_path]) - if unknown_path is not None: media_dirs.extend([path.rstrip('/') for path in unknown_path]) + add_paths_to_media_dirs(movie_path, media_dirs) + add_paths_to_media_dirs(tv_path, media_dirs) + add_paths_to_media_dirs(anime_path, media_dirs) + add_paths_to_media_dirs(unknown_path, media_dirs) return list(set(media_dirs)) def get_download_dirs():