From 8d737f9e376d3f238846da830b9548ec77f11f44 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 23 Nov 2024 21:43:53 +0800 Subject: [PATCH] fix alipan && rclone get_folder --- app/modules/filemanager/storages/alipan.py | 12 ++++-------- app/modules/filemanager/storages/rclone.py | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index 450561e2..c3816fa5 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -319,14 +319,10 @@ class AliPan(StorageBase, metaclass=Singleton): return sub_folder return None - if not self.aligo: - return None - item = self.aligo.get_folder_by_path(path=str(path), create_folder=True) - if item: - # 已存在 - if isinstance(item, CreateFileResponse): - item = self.aligo.get_file(file_id=item.file_id, drive_id=item.drive_id) - return self.__get_fileitem(item) + # 是否已存在 + folder = self.get_item(path) + if folder: + return folder # 逐级查找和创建目录 fileitem = schemas.FileItem(path="/") for part in path.parts: diff --git a/app/modules/filemanager/storages/rclone.py b/app/modules/filemanager/storages/rclone.py index e38efa67..1cbfe46b 100644 --- a/app/modules/filemanager/storages/rclone.py +++ b/app/modules/filemanager/storages/rclone.py @@ -172,6 +172,10 @@ class Rclone(StorageBase): return sub_folder return None + # 是否已存在 + folder = self.get_item(path) + if folder: + return folder # 逐级查找和创建目录 fileitem = schemas.FileItem(path="/") for part in path.parts: