From 15602ff149535de68b0570bf2ad03bf6c46fdc77 Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Fri, 7 Jun 2024 17:15:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BC=93=E5=AD=98=E9=A2=9D=E5=A4=96?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=8E=E7=BC=80=20#2002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/BasedRepositoryFileExpireResolver.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/file/BasedRepositoryFileExpireResolver.kt b/src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/file/BasedRepositoryFileExpireResolver.kt index c55818449d..8573da1ded 100644 --- a/src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/file/BasedRepositoryFileExpireResolver.kt +++ b/src/backend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/file/BasedRepositoryFileExpireResolver.kt @@ -94,11 +94,7 @@ class BasedRepositoryFileExpireResolver( val sha256 = ret[SHA256].toString() val fullPath = ret[FULL_PATH].toString() var fileExtensionCheck = true - it.fileExtension?.let { - if (!it.contains("/") && !it.any { fullPath.endsWith(it) }) { - fileExtensionCheck = false - } - } + it.fileExtension?.let { fileExtensionCheck = checkFileExtension(it, fullPath) } if (fileExtensionCheck) { temp.add(sha256) logger.info("Retain node $projectId/$repoName$fullPath, $sha256.") @@ -108,6 +104,14 @@ class BasedRepositoryFileExpireResolver( return temp } + private fun checkFileExtension(fileExtension: List , fullPath: String ) : Boolean { + var fileExtensionCheck = true + if (!fileExtension.contains("/") && !fileExtension.any { fullPath.endsWith(it) }) { + fileExtensionCheck = false + } + return fileExtensionCheck + } + private fun convertRepoConfigToFileCache(repoConfig: RepoConfig):TFileCache { return TFileCache( id = null,