diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index 10039cf4..c85168aa 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -255,28 +255,9 @@ class AliPan(StorageBase, metaclass=Singleton): return [] # 根目录处理 if not fileitem or not fileitem.drive_id: - return [ - schemas.FileItem( - storage=self.schema.value, - fileid="root", - drive_id=self.__auth_params.get("resourceDriveId"), - parent_fileid="root", - type="dir", - path="/", - name="资源库", - basename="资源库" - ), - schemas.FileItem( - storage=self.schema.value, - fileid="root", - drive_id=self.__auth_params.get("backDriveId"), - parent_fileid="root", - type="dir", - path="/", - name="备份盘", - basename="备份盘" - ) - ] + items = self.aligo.get_file_list() + if items: + return [self.__get_fileitem(item) for item in items] elif fileitem.type == "file": # 文件处理 file = self.detail(fileitem) @@ -396,8 +377,8 @@ class AliPan(StorageBase, metaclass=Singleton): """ 上传文件,并标记完成 :param fileitem: 上传目录项 - :param path: 目标目录 - :param new_name: 新文件名 + :param path: 本地文件路径 + :param new_name: 上传后文件名 """ if not self.aligo: return None diff --git a/app/modules/filemanager/storages/local.py b/app/modules/filemanager/storages/local.py index 38cd059f..0dbe52bd 100644 --- a/app/modules/filemanager/storages/local.py +++ b/app/modules/filemanager/storages/local.py @@ -194,6 +194,9 @@ class LocalStorage(StorageBase): def upload(self, fileitem: schemas.FileItem, path: Path, new_name: str = None) -> Optional[schemas.FileItem]: """ 上传文件 + :param fileitem: 上传目录项 + :param path: 本地文件路径 + :param new_name: 上传后文件名 """ dir_path = Path(fileitem.path) target_path = dir_path / (new_name or path.name) diff --git a/app/modules/filemanager/storages/rclone.py b/app/modules/filemanager/storages/rclone.py index 1cbfe46b..642b983d 100644 --- a/app/modules/filemanager/storages/rclone.py +++ b/app/modules/filemanager/storages/rclone.py @@ -272,6 +272,9 @@ class Rclone(StorageBase): def upload(self, fileitem: schemas.FileItem, path: Path, new_name: str = None) -> Optional[schemas.FileItem]: """ 上传文件 + :param fileitem: 上传目录项 + :param path: 本地文件路径 + :param new_name: 上传后文件名 """ try: new_path = Path(fileitem.path) / (new_name or path.name) diff --git a/app/modules/filemanager/storages/u115.py b/app/modules/filemanager/storages/u115.py index 38cde2ed..7cdee6b7 100644 --- a/app/modules/filemanager/storages/u115.py +++ b/app/modules/filemanager/storages/u115.py @@ -339,6 +339,9 @@ class U115Pan(StorageBase, metaclass=Singleton): def upload(self, fileitem: schemas.FileItem, path: Path, new_name: str = None) -> Optional[schemas.FileItem]: """ 上传文件 + :param fileitem: 上传目录项 + :param path: 本地文件路径 + :param new_name: 上传后文件名 """ if not self.client: return None