feat: Proxy支持删除未同步的文件存储 #1836

TencentBlueKing · Mar 8, 2024 · f801e9f · f801e9f
1 parent 5be36a0
commit f801e9f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/...age-service/src/main/kotlin/com/tencent/bkrepo/common/storage/core/AbstractFileStorage.kt b/...age-service/src/main/kotlin/com/tencent/bkrepo/common/storage/core/AbstractFileStorage.kt
@@ -177,6 +177,17 @@ abstract class AbstractFileStorage<Credentials : StorageCredentials, Client> : F
         throw UnsupportedOperationException("Copy operation unsupported")
     }
 
+    open fun move(
+        fromPath: String,
+        fromName: String,
+        toPath: String,
+        toName: String,
+        fromClient: Client,
+        toClient: Client
+    ) {
+        throw UnsupportedOperationException("Move operation unsupported")
+    }
+
     companion object {
         private val logger = LoggerFactory.getLogger(AbstractFileStorage::class.java)
         private const val MAX_CACHE_CLIENT = 10L

diff --git a/...-service/src/main/kotlin/com/tencent/bkrepo/common/storage/filesystem/FileSystemClient.kt b/...-service/src/main/kotlin/com/tencent/bkrepo/common/storage/filesystem/FileSystemClient.kt
@@ -43,7 +43,7 @@ import java.nio.file.Paths
 /**
  * 本地文件存储客户端
  */
-class FileSystemClient(private val root: String) {
+class FileSystemClient(val root: String) {
 
     constructor(path: Path) : this(path.toString())
 

diff --git a/...service/src/main/kotlin/com/tencent/bkrepo/common/storage/filesystem/FileSystemStorage.kt b/...service/src/main/kotlin/com/tencent/bkrepo/common/storage/filesystem/FileSystemStorage.kt
@@ -39,7 +39,9 @@ import com.tencent.bkrepo.common.storage.credentials.FileSystemCredentials
 import com.tencent.bkrepo.common.storage.credentials.StorageCredentials
 import java.io.File
 import java.io.InputStream
+import java.nio.file.Files
 import java.nio.file.Paths
+import java.nio.file.StandardCopyOption
 
 /**
  * 文件系统存储
@@ -76,4 +78,17 @@ open class FileSystemStorage : AbstractEncryptorFileStorage<FileSystemCredential
         require(storageCredentials is FileSystemCredentials)
         return Paths.get(storageCredentials.path, TEMP).toString()
     }
+
+    override fun move(
+        fromPath: String,
+        fromName: String,
+        toPath: String,
+        toName: String,
+        fromClient: FileSystemClient,
+        toClient: FileSystemClient
+    ) {
+        val fromFullPath = Paths.get(fromClient.root, fromPath, fromName)
+        val toFullPath = Paths.get(toClient.root, toPath, toName)
+        Files.move(fromFullPath, toFullPath, StandardCopyOption.REPLACE_EXISTING)
+    }
 }