diff --git a/app/modules/filemanager/storages/__init__.py b/app/modules/filemanager/storages/__init__.py index ccd76c3c..43f11a49 100644 --- a/app/modules/filemanager/storages/__init__.py +++ b/app/modules/filemanager/storages/__init__.py @@ -128,7 +128,7 @@ class StorageBase(metaclass=ABCMeta): pass @abstractmethod - def upload(self, fileitem: schemas.FileItem, path: Path, new_name: str = None) -> Optional[schemas.FileItem]: + def upload(self, fileitem: schemas.FileItem, path: Path, new_name: Optional[str] = None) -> Optional[schemas.FileItem]: """ 上传文件 :param fileitem: 上传目录项 diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index 67671c6d..ecd98736 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -209,7 +209,7 @@ class AliPan(StorageBase, metaclass=Singleton): elif driver.category == "backup": self.__update_params({"backDriveId": driver.drive_id}) - def __get_fileitem(self, fileinfo: BaseFile, parent: str = "/") -> schemas.FileItem: + def __get_fileitem(self, fileinfo: BaseFile, parent: Optional[str] = "/") -> schemas.FileItem: """ 获取文件信息 """ @@ -374,7 +374,8 @@ class AliPan(StorageBase, metaclass=Singleton): return Path(local_path) return None - def upload(self, fileitem: schemas.FileItem, path: Path, new_name: str = None) -> Optional[schemas.FileItem]: + def upload(self, fileitem: schemas.FileItem, path: Path, + new_name: Optional[str] = None) -> Optional[schemas.FileItem]: """ 上传文件,并标记完成 :param fileitem: 上传目录项 diff --git a/app/modules/filemanager/storages/alist.py b/app/modules/filemanager/storages/alist.py index 70f4a9f3..74c083a7 100644 --- a/app/modules/filemanager/storages/alist.py +++ b/app/modules/filemanager/storages/alist.py @@ -133,7 +133,7 @@ class Alist(StorageBase, metaclass=Singleton): def list( self, fileitem: schemas.FileItem, - password: str = "", + password: Optional[str] = "", page: int = 1, per_page: int = 0, refresh: bool = False, @@ -291,7 +291,7 @@ class Alist(StorageBase, metaclass=Singleton): def get_item( self, path: Path, - password: str = "", + password: Optional[str] = "", page: int = 1, per_page: int = 0, refresh: bool = False, @@ -468,7 +468,7 @@ class Alist(StorageBase, metaclass=Singleton): self, fileitem: schemas.FileItem, path: Path = None, - password: str = "", + password: Optional[str] = "", ) -> Optional[Path]: """ 下载文件,保存到本地,返回本地临时文件地址 @@ -547,7 +547,7 @@ class Alist(StorageBase, metaclass=Singleton): return None def upload( - self, fileitem: schemas.FileItem, path: Path, new_name: str = None, task: bool = False + self, fileitem: schemas.FileItem, path: Path, new_name: Optional[str] = None, task: bool = False ) -> Optional[schemas.FileItem]: """ 上传文件 diff --git a/app/modules/filemanager/storages/local.py b/app/modules/filemanager/storages/local.py index 0ddd637b..5e6713ad 100644 --- a/app/modules/filemanager/storages/local.py +++ b/app/modules/filemanager/storages/local.py @@ -191,7 +191,7 @@ class LocalStorage(StorageBase): """ return Path(fileitem.path) - def upload(self, fileitem: schemas.FileItem, path: Path, new_name: str = None) -> Optional[schemas.FileItem]: + def upload(self, fileitem: schemas.FileItem, path: Path, new_name: Optional[str] = None) -> Optional[schemas.FileItem]: """ 上传文件 :param fileitem: 上传目录项 diff --git a/app/modules/filemanager/storages/rclone.py b/app/modules/filemanager/storages/rclone.py index 255b0ed9..ec91b311 100644 --- a/app/modules/filemanager/storages/rclone.py +++ b/app/modules/filemanager/storages/rclone.py @@ -56,7 +56,7 @@ class Rclone(StorageBase): else: return None - def __get_rcloneitem(self, item: dict, parent: str = "/") -> schemas.FileItem: + def __get_rcloneitem(self, item: dict, parent: Optional[str] = "/") -> schemas.FileItem: """ 获取rclone文件项 """ @@ -254,7 +254,8 @@ class Rclone(StorageBase): logger.error(f"rclone复制文件失败:{err}") return None - def upload(self, fileitem: schemas.FileItem, path: Path, new_name: str = None) -> Optional[schemas.FileItem]: + def upload(self, fileitem: schemas.FileItem, path: Path, + new_name: Optional[str] = None) -> Optional[schemas.FileItem]: """ 上传文件 :param fileitem: 上传目录项 diff --git a/app/modules/filemanager/storages/u115.py b/app/modules/filemanager/storages/u115.py index f4b7abbe..a1dd5cac 100644 --- a/app/modules/filemanager/storages/u115.py +++ b/app/modules/filemanager/storages/u115.py @@ -150,7 +150,7 @@ class U115Pan(StorageBase, metaclass=Singleton): return result.get("data") def _request_api(self, method: str, endpoint: str, - result_key: str = None, **kwargs) -> Optional[Union[dict, list]]: + result_key: Optional[str] = None, **kwargs) -> Optional[Union[dict, list]]: """ 带错误处理和速率限制的API请求 """ @@ -395,7 +395,7 @@ class U115Pan(StorageBase, metaclass=Singleton): modify_time=int(time.time()) ) - def upload(self, target_dir: schemas.FileItem, local_path: Path, new_name: str = None) -> schemas.FileItem: + def upload(self, target_dir: schemas.FileItem, local_path: Path, new_name: Optional[str] = None) -> schemas.FileItem: """ 实现带秒传、断点续传和二次认证的文件上传 """