Don't download file with version info

Author: Su5eD

core/src/main/kotlin/org/sinytra/probe/core/platform/ModrinthPlatform.kt

@@ -17,14 +17,22 @@ import kotlin.io.path.*
 
 private const val REQUIRED_DEP: String = "required"
 
+@Serializable
+data class ModrinthProjectVersion(
+    override val projectId: String,
+    override val versionId: String,
+    override val versionNumber: String,
+    override val dependencies: List<String>
+) : ProjectVersion
+
 @Serializable
 data class ModrinthResolvedVersion(
     override val projectId: String,
     override val versionId: String,
     override val versionNumber: String,
     override val path: String,
     override val dependencies: List<String>
-) : ProjectVersion
+) : ProjectResolvedVersion
 
 class ModrinthPlatform(
     private val storagePath: Path,
@@ -64,21 +72,33 @@ class ModrinthPlatform(
     }
 
     override suspend fun getVersion(slug: String, versionId: String): ProjectVersion? {
-        val key = versionKey(versionId)
-
-        cache.getObject<ModrinthResolvedVersion>(key)
-            ?.let { return it }
+        val version = getCachedMRVersion(slug, versionId) ?: return null
+        val dependencies = version.dependencies
+            .filter { it.dependencyType == REQUIRED_DEP && it.projectId != FAPI_ID }
+            .map(ModrinthVersionDependency::projectId)
+        val projectVersion = ModrinthProjectVersion(version.projectId, version.id, version.versionNumber, dependencies)
 
-        LOGGER.info("Fetching '{}' version {}", slug, versionId)
+        return projectVersion
+    }
 
-        val version = ModrinthAPI.getVersion(versionId) ?: return null
+    override suspend fun getResolvedVersion(slug: String, versionId: String): ProjectResolvedVersion? {
+        val version = getCachedMRVersion(slug, versionId) ?: return null
         val resolved = downloadVersionFile(version)
-
-        cache.setObject(key, resolved)
-
         return resolved
     }
 
+    suspend fun getCachedMRVersion(slug: String, versionId: String): ModrinthVersion? {
+        val key = versionKey(versionId)
+        val version = cache.getObject<ModrinthVersion>(key)
+            ?: coroutineScope {
+                LOGGER.info("Fetching '{}' version {}", slug, versionId)
+                ModrinthAPI.getVersion(versionId)
+            }
+            ?: return null
+        cache.setObject(key, version)
+        return version
+    }
+
     suspend fun hasVersion(versionId: String): Boolean {
         val key = versionKey(versionId)
         return cache.exists(key)
@@ -114,7 +134,7 @@ class ModrinthPlatform(
         return resolveProjectInternal(project.id, gameVersions.first(), gameVersions, fallbackLoader)
     }
 
-    override suspend fun resolveProjectVersion(slug: String, gameVersion: String, loader: String): ProjectVersion? =
+    override suspend fun resolveProjectVersion(slug: String, gameVersion: String, loader: String): ProjectResolvedVersion? =
         getOrComputeVersion(slug, gameVersion, listOf(gameVersion), loader, false)
 
     suspend fun searchProjects(limit: Int, offset: Int, gameVersion: String, loader: String, excludeLoader: String?): List<ProjectSearchResult>? =

core/src/main/kotlin/org/sinytra/probe/core/platform/PlatformService.kt

@@ -15,6 +15,13 @@ interface PlatformProject {
 }
 
 interface ProjectVersion {
+    val projectId: String // Uniquely distinguishable ID
+    val versionId: String
+    val versionNumber: String
+    val dependencies: List<String>
+}
+
+interface ProjectResolvedVersion {
     val projectId: String // Uniquely distinguishable ID
     val versionId: String
     val versionNumber: String
@@ -23,17 +30,19 @@ interface ProjectVersion {
 }
 
 data class ResolvedProject(
-    val version: ProjectVersion,
+    val version: ProjectResolvedVersion,
     val dependencies: List<ResolvedProject>
 )
 
 interface PlatformService {
     suspend fun getProject(slug: String): PlatformProject?
+
     // Does not guarantee that the version file exists
     suspend fun getVersion(slug: String, versionId: String): ProjectVersion?
+    suspend fun getResolvedVersion(slug: String, versionId: String): ProjectResolvedVersion?
     suspend fun isNeoForgeAvailable(project: PlatformProject, gameVersion: String): Boolean
     suspend fun resolveProject(project: PlatformProject, gameVersion: String): ResolvedProject?
-    suspend fun resolveProjectVersion(slug: String, gameVersion: String, loader: String): ProjectVersion?
+    suspend fun resolveProjectVersion(slug: String, gameVersion: String, loader: String): ProjectResolvedVersion?
 }
 
 class GlobalPlatformService(private val platforms: Map<ProjectPlatform, PlatformService>) {
@@ -50,13 +59,16 @@ class GlobalPlatformService(private val platforms: Map<ProjectPlatform, Platform
     suspend fun getVersion(project: PlatformProject, versionId: String): ProjectVersion? =
         getPlatform(project.platform).getVersion(project.id, versionId)
 
+    suspend fun getResolvedVersion(project: PlatformProject, versionId: String): ProjectResolvedVersion? =
+        getPlatform(project.platform).getResolvedVersion(project.id, versionId)
+
     suspend fun resolveProject(project: PlatformProject, gameVersion: String): ResolvedProject? =
         getPlatform(project.platform).resolveProject(project, gameVersion)
 
-    suspend fun resolveProjectVersion(platform: ProjectPlatform, id: String, gameVersion: String, loader: String): ProjectVersion? =
+    suspend fun resolveProjectVersion(platform: ProjectPlatform, id: String, gameVersion: String, loader: String): ProjectResolvedVersion? =
         getPlatform(platform).resolveProjectVersion(id, gameVersion, loader)
 }
 
-fun ProjectVersion.getFilePath(basePath: Path): Path {
+fun ProjectResolvedVersion.getFilePath(basePath: Path): Path {
     return basePath / path
 }

core/src/main/kotlin/org/sinytra/probe/core/service/TransformationService.kt

@@ -60,7 +60,7 @@ class TransformationService(
         return TransformationResult(
             project.version.projectId,
             project.version.versionId,
-            otherFiles.map(ProjectVersion::projectId),
+            otherFiles.map(ProjectResolvedVersion::projectId),
             result?.success ?: false,
             result?.primaryModid
         )
@@ -73,7 +73,7 @@ class TransformationService(
         return listOf(ffapi.getFilePath(storagePath))
     }
 
-    private fun ResolvedProject.flattenDependencies(): List<ProjectVersion> =
+    private fun ResolvedProject.flattenDependencies(): List<ProjectResolvedVersion> =
         generateSequence(dependencies) { projects ->
             projects.flatMap { it.dependencies }.takeIf { it.isNotEmpty() }
         }

gatherer/src/main/kotlin/org/sinytra/probe/gatherer/internal/ModTestRunner.kt

@@ -123,7 +123,7 @@ class ModTestRunner(
             val results = candidates.map { proj ->
                 async(dispatcher) {
                     semaphore.withPermit {
-                        val version = modrinth.getVersion(proj.slug, proj.versionId)
+                        val version = modrinth.getResolvedVersion(proj.slug, proj.versionId)
                             ?: throw IllegalStateException("Missing version for ${proj.slug}")
                         val versionFile = modsDir / version.path