From 6f593beeedd20c9c7c76e8b0a15d58859950e91c Mon Sep 17 00:00:00 2001 From: jxxghp Date: Tue, 7 Jan 2025 20:58:27 +0800 Subject: [PATCH] fix #3687 --- app/chain/storage.py | 2 +- app/modules/filemanager/__init__.py | 2 +- app/modules/filemanager/storages/alipan.py | 1 + app/monitor.py | 2 +- app/schemas/file.py | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/chain/storage.py b/app/chain/storage.py index b2d3171e..a1ec8708 100644 --- a/app/chain/storage.py +++ b/app/chain/storage.py @@ -114,7 +114,7 @@ class StorageChain(ChainBase): """ return self.run_module("storage_usage", storage=storage) - def support_transtype(self, storage: str) -> Optional[str]: + def support_transtype(self, storage: str) -> Optional[dict]: """ 获取支持的整理方式 """ diff --git a/app/modules/filemanager/__init__.py b/app/modules/filemanager/__init__.py index b8089695..df0010f7 100644 --- a/app/modules/filemanager/__init__.py +++ b/app/modules/filemanager/__init__.py @@ -109,7 +109,7 @@ class FileManagerModule(_ModuleBase): def init_setting(self) -> Tuple[str, Union[str, bool]]: pass - def support_transtype(self, storage: str) -> Optional[Dict[str, str]]: + def support_transtype(self, storage: str) -> Optional[dict]: """ 支持的整理方式 """ diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py index cbe82bb4..9ffd29fc 100644 --- a/app/modules/filemanager/storages/alipan.py +++ b/app/modules/filemanager/storages/alipan.py @@ -30,6 +30,7 @@ class AliPan(StorageBase, metaclass=Singleton): # 支持的整理方式 transtype = { + "copy": "复制", "move": "移动", } diff --git a/app/monitor.py b/app/monitor.py index 05a52808..24007afd 100644 --- a/app/monitor.py +++ b/app/monitor.py @@ -252,7 +252,7 @@ class Monitor(metaclass=Singleton): self.transferchain.do_transfer( fileitem=FileItem( storage=storage, - path=str(event_path), + path=str(event_path).replace("\\", "/"), type="file", name=event_path.name, basename=event_path.stem, diff --git a/app/schemas/file.py b/app/schemas/file.py index 2fb7bb27..4e941e3d 100644 --- a/app/schemas/file.py +++ b/app/schemas/file.py @@ -45,4 +45,4 @@ class StorageUsage(BaseModel): class StorageTransType(BaseModel): # 传输类型 - transtype: Optional[str] = None + transtype: Optional[dict] = Field(default_factory=dict)