fix transfer

app/modules/filetransfer/storage/__init__.py

@@ -9,7 +9,21 @@ class StorageBase(metaclass=ABCMeta):
     """
     存储基类
     """
-    
+
+    transtype = {}
+
+    def support_transtype(self) -> dict:
+        """
+        支持的整理方式
+        """
+        return self.transtype
+
+    def is_support_transtype(self, transtype: str) -> bool:
+        """
+        是否支持整理方式
+        """
+        return transtype in self.transtype
+
     @abstractmethod
     def check(self) -> bool:
         """
@@ -52,13 +66,6 @@ class StorageBase(metaclass=ABCMeta):
         """
         pass
 
-    @abstractmethod
-    def move(self, fileitm: schemas.FileItem, target_dir: schemas.FileItem) -> bool:
-        """
-        移动文件
-        """
-        pass
-
     @abstractmethod
     def upload(self, fileitm: schemas.FileItem, path: Path) -> Optional[schemas.FileItem]:
         """
@@ -72,4 +79,32 @@ class StorageBase(metaclass=ABCMeta):
         获取文件详情
         """
         pass
+
+    @abstractmethod
+    def copy(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        """
+        复制文件
+        """
+        pass
+
+    @abstractmethod
+    def move(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        """
+        移动文件
+        """
+        pass
+
+    @abstractmethod
+    def link(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        """
+        硬链接文件
+        """
+        pass
+
+    @abstractmethod
+    def softlink(self, fileitm: schemas.FileItem, target_file: schemas.FileItem) -> bool:
+        """
+        软链接文件
+        """
+        pass
     

app/modules/filetransfer/storage/alipan.py

@@ -12,7 +12,7 @@ from app.core.config import settings
 from app.db.systemconfig_oper import SystemConfigOper
 from app.log import logger
 from app.modules.filetransfer.storage import StorageBase
-from app.schemas.types import SystemConfigKey
+from app.schemas.types import SystemConfigKey, StorageSchema
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils
 from app.utils.system import SystemUtils
@@ -23,6 +23,13 @@ class AliPan(StorageBase):
     阿里云相关操作
     """
 
+    # 存储类型
+    schema = StorageSchema.Alipan
+    # 支持的整理方式
+    transtype = {
+        "move": "移动"
+    }
+
     _X_SIGNATURE = ('f4b7bed5d8524a04051bd2da876dd79afe922b8205226d65855d02b267422adb1'
                     'e0d8a816b021eaf5c36d101892180f79df655c5712b348c2a540ca136e6b22001')
 
@@ -531,26 +538,6 @@ class AliPan(StorageBase):
             self.__handle_error(res, "获取下载链接")
         return None
 
-    def move(self, fileitem: schemas.FileItem, target_dir: schemas.FileItem) -> bool:
-        """
-        移动文件
-        """
-        params = self.__access_params
-        if not params:
-            return False
-        headers = self.__get_headers(params)
-        res = RequestUtils(headers=headers, timeout=10).post_res(self.move_file_url, json={
-            "drive_id": fileitem.drive_id,
-            "file_id": fileitem.fileid,
-            "to_parent_file_id": target_dir.fileid,
-            "check_name_mode": "refuse"
-        })
-        if res:
-            return True
-        else:
-            self.__handle_error(res, "移动文件")
-        return False
-
     def upload(self, fileitem: schemas.FileItem, path: Path) -> Optional[schemas.FileItem]:
         """
         上传文件，并标记完成
@@ -625,3 +612,32 @@ class AliPan(StorageBase):
         else:
             logger.warn("上传文件失败：无法获取上传地址！")
         return None
+
+    def move(self, fileitem: schemas.FileItem, target_dir: schemas.FileItem) -> bool:
+        """
+        移动文件
+        """
+        params = self.__access_params
+        if not params:
+            return False
+        headers = self.__get_headers(params)
+        res = RequestUtils(headers=headers, timeout=10).post_res(self.move_file_url, json={
+            "drive_id": fileitem.drive_id,
+            "file_id": fileitem.fileid,
+            "to_parent_file_id": target_dir.fileid,
+            "check_name_mode": "refuse"
+        })
+        if res:
+            return True
+        else:
+            self.__handle_error(res, "移动文件")
+        return False
+
+    def copy(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        pass
+
+    def link(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        pass
+
+    def softlink(self, fileitm: schemas.FileItem, target_file: schemas.FileItem) -> bool:
+        pass

app/modules/filetransfer/storage/local.py

@@ -7,6 +7,7 @@ from starlette.responses import FileResponse, Response
 from app import schemas
 from app.log import logger
 from app.modules.filetransfer.storage import StorageBase
+from app.schemas.types import StorageSchema
 from app.utils.system import SystemUtils
 
 
@@ -15,6 +16,16 @@ class LocalStorage(StorageBase):
     本地文件操作
     """
 
+    # 存储类型
+    schema = StorageSchema.Local
+    # 支持的整理方式
+    transtype = {
+        "copy": "复制",
+        "move": "移动",
+        "link": "硬链接",
+        "softlink": "软链接"
+    }
+
     def check(self) -> bool:
         """
         检查存储是否可用
@@ -96,9 +107,8 @@ class LocalStorage(StorageBase):
         if not fileitem.path:
             return None
         path_obj = Path(fileitem.path) / name
-        if path_obj.exists():
-            return None
-        path_obj.mkdir(parents=True, exist_ok=True)
+        if not path_obj.exists():
+            path_obj.mkdir(parents=True, exist_ok=True)
         return schemas.FileItem(
             type="dir",
             path=str(path_obj).replace("\\", "/") + "/",
@@ -166,19 +176,6 @@ class LocalStorage(StorageBase):
             Path(f"{path_obj.stem}.zip").unlink()
             return reponse
 
-    def move(self, fileitem: schemas.FileItem, target_dir: schemas.FileItem) -> bool:
-        """
-        移动文件
-        """
-        if not fileitem.path or not target_dir.path:
-            return False
-        path_obj = Path(fileitem.path)
-        target_obj = Path(target_dir.path)
-        if not path_obj.exists() or not target_obj.exists():
-            return False
-        path_obj.rename(target_obj / path_obj.name)
-        return True
-
     def upload(self, fileitem: schemas.FileItem, path: Path) -> Optional[schemas.FileItem]:
         """
         上传文件
@@ -198,3 +195,47 @@ class LocalStorage(StorageBase):
             size=path.stat().st_size,
             modify_time=path.stat().st_mtime,
         )
+
+    def copy(self, fileitem: schemas.FileItem, target_file: Path) -> bool:
+        """
+        复制文件
+        """
+        file_path = Path(fileitem.path)
+        code, message = SystemUtils.copy(file_path, target_file)
+        if code != 0:
+            logger.error(f"复制文件失败：{message}")
+            return False
+        return True
+
+    def link(self, fileitem: schemas.FileItem, target_file: Path) -> bool:
+        """
+        硬链接文件
+        """
+        file_path = Path(fileitem.path)
+        code, message = SystemUtils.link(file_path, target_file)
+        if code != 0:
+            logger.error(f"硬链接文件失败：{message}")
+            return False
+        return True
+
+    def softlink(self, fileitem: schemas.FileItem, target_file: Path) -> bool:
+        """
+        软链接文件
+        """
+        file_path = Path(fileitem.path)
+        code, message = SystemUtils.copy(file_path, target_file)
+        if code != 0:
+            logger.error(f"软链接文件失败：{message}")
+            return False
+        return True
+
+    def move(self, fileitem: schemas.FileItem, target_file: Path) -> bool:
+        """
+        移动文件
+        """
+        file_path = Path(fileitem.path)
+        code, message = SystemUtils.move(file_path, target_file)
+        if code != 0:
+            logger.error(f"移动文件失败：{message}")
+            return False
+        return True

app/modules/filetransfer/storage/rclone.py

@@ -0,0 +1,56 @@
+from pathlib import Path
+from typing import Optional, Any, List
+
+from app import schemas
+from app.modules.filetransfer.storage import StorageBase
+from app.schemas.types import StorageSchema
+
+
+class Rclone(StorageBase):
+    """
+    rclone相关操作
+    """
+
+    # 存储类型
+    schema = StorageSchema.Rclone
+    # 支持的整理方式
+    transtype = {
+        "move": "移动",
+        "copy": "复制"
+    }
+
+    def check(self) -> bool:
+        pass
+
+    def list(self, fileitm: schemas.FileItem) -> Optional[List[schemas.FileItem]]:
+        pass
+
+    def create_folder(self, fileitm: schemas.FileItem, name: str) -> Optional[schemas.FileItem]:
+        pass
+
+    def delete(self, fileitm: schemas.FileItem) -> bool:
+        pass
+
+    def rename(self, fileitm: schemas.FileItem, name: str) -> bool:
+        pass
+
+    def download(self, fileitm: schemas.FileItem) -> Any:
+        pass
+
+    def upload(self, fileitm: schemas.FileItem, path: Path) -> Optional[schemas.FileItem]:
+        pass
+
+    def detail(self, fileitm: schemas.FileItem) -> Optional[schemas.FileItem]:
+        pass
+
+    def move(self, fileitm: schemas.FileItem, target_dir: schemas.FileItem) -> bool:
+        pass
+
+    def copy(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        pass
+
+    def link(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        pass
+
+    def softlink(self, fileitm: schemas.FileItem, target_file: schemas.FileItem) -> bool:
+        pass

app/modules/filetransfer/storage/u115.py

@@ -11,7 +11,7 @@ from app import schemas
 from app.db.systemconfig_oper import SystemConfigOper
 from app.log import logger
 from app.modules.filetransfer.storage import StorageBase
-from app.schemas.types import SystemConfigKey
+from app.schemas.types import SystemConfigKey, StorageSchema
 from app.utils.singleton import Singleton
 
 
@@ -20,6 +20,13 @@ class U115Pan(StorageBase, metaclass=Singleton):
     115相关操作
     """
 
+    # 存储类型
+    schema = StorageSchema.U115
+    # 支持的整理方式
+    transtype = {
+        "move": "移动"
+    }
+
     cloud: Optional[Cloud] = None
     _session: QrcodeSession = None
 
@@ -233,19 +240,6 @@ class U115Pan(StorageBase, metaclass=Singleton):
             logger.error(f"115下载失败：{str(e)}")
         return None
 
-    def move(self, fileitem: schemas.FileItem, target_dir: schemas.FileItem) -> bool:
-        """
-        移动文件
-        """
-        if not self.__init_cloud():
-            return False
-        try:
-            self.cloud.storage().move(fileitem.fileid, target_dir.fileid)
-            return True
-        except Exception as e:
-            logger.error(f"移动115文件失败：{str(e)}")
-        return False
-
     def upload(self, fileitem: schemas.FileItem, path: Path) -> Optional[schemas.FileItem]:
         """
         上传文件
@@ -292,3 +286,25 @@ class U115Pan(StorageBase, metaclass=Singleton):
         except Exception as e:
             logger.error(f"上传115文件失败：{str(e)}")
         return None
+
+    def move(self, fileitem: schemas.FileItem, target_dir: schemas.FileItem) -> bool:
+        """
+        移动文件
+        """
+        if not self.__init_cloud():
+            return False
+        try:
+            self.cloud.storage().move(fileitem.fileid, target_dir.fileid)
+            return True
+        except Exception as e:
+            logger.error(f"移动115文件失败：{str(e)}")
+        return False
+
+    def copy(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        pass
+
+    def link(self, fileitm: schemas.FileItem, target_file: Path) -> bool:
+        pass
+
+    def softlink(self, fileitm: schemas.FileItem, target_file: schemas.FileItem) -> bool:
+        pass