feat: recipe index文件生成调整TencentBlueKing#2316

zacYL · Sep 11, 2024 · 7a0c8f4 · 7a0c8f4
1 parent 2eceb2a
commit 7a0c8f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/...onan/src/main/kotlin/com/tencent/bkrepo/conan/artifact/repository/ConanLocalRepository.kt b/...onan/src/main/kotlin/com/tencent/bkrepo/conan/artifact/repository/ConanLocalRepository.kt
@@ -33,6 +33,7 @@ import com.tencent.bkrepo.common.artifact.repository.local.LocalRepository
 import com.tencent.bkrepo.common.artifact.resolve.response.ArtifactChannel
 import com.tencent.bkrepo.common.artifact.resolve.response.ArtifactResource
 import com.tencent.bkrepo.common.service.util.SpringContextUtils.Companion.publishEvent
+import com.tencent.bkrepo.conan.constant.CONANFILE
 import com.tencent.bkrepo.conan.constant.EXPORT_SOURCES_TGZ_NAME
 import com.tencent.bkrepo.conan.constant.NAME
 import com.tencent.bkrepo.conan.constant.PACKAGE_TGZ_NAME
@@ -77,7 +78,7 @@ class ConanLocalRepository : LocalRepository() {
     override fun onUploadSuccess(context: ArtifactUploadContext) {
         super.onUploadSuccess(context)
         val fullPath = generateFullPath(context.artifactInfo as ConanArtifactInfo)
-        if (fullPath.endsWith(EXPORT_SOURCES_TGZ_NAME)) {
+        if (fullPath.endsWith(CONANFILE)) {
             // TODO package version size 如何计算
             createVersion(
                 artifactInfo = context.artifactInfo as ConanArtifactInfo,

diff --git a/src/backend/conan/biz-conan/src/main/kotlin/com/tencent/bkrepo/conan/pojo/IndexInfo.kt b/src/backend/conan/biz-conan/src/main/kotlin/com/tencent/bkrepo/conan/pojo/IndexInfo.kt
@@ -27,9 +27,11 @@
 
 package com.tencent.bkrepo.conan.pojo
 
+import java.util.SortedSet
+
 class IndexInfo(
     var reference: String,
-    var revisions: MutableList<RevisionInfo> = mutableListOf()
+    var revisions: SortedSet<RevisionInfo> = sortedSetOf()
 ) {
     fun addRevision(revisionInfo: RevisionInfo) {
         val exist = revisions.firstOrNull { revisionInfo.revision == it.revision }

diff --git a/...conan/biz-conan/src/main/kotlin/com/tencent/bkrepo/conan/service/impl/ConanServiceImpl.kt b/...conan/biz-conan/src/main/kotlin/com/tencent/bkrepo/conan/service/impl/ConanServiceImpl.kt
@@ -142,7 +142,7 @@ class ConanServiceImpl : ConanService {
     override fun getRecipeRevisions(conanArtifactInfo: ConanArtifactInfo): IndexInfo {
         with(conanArtifactInfo) {
             val conanFileReference = convertToConanFileReference(conanArtifactInfo)
-            commonService.checkNodeExist(projectId, repoName, buildReference(conanFileReference))
+            commonService.checkNodeExist(projectId, repoName, buildPackagePath(conanFileReference))
             return commonService.getRecipeRevisions(projectId, repoName, conanFileReference)
         }
     }