Add kotlinx.datetime & fix the Java Instant bug

juraj-hrivnak · Oct 14, 2024 · 80ef13c · 80ef13c
1 parent 4539c00
commit 80ef13c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 44 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -79,6 +79,9 @@ kotlin {
                 // AtomicFU
                 implementation("org.jetbrains.kotlinx:atomicfu:0.24.0")
 
+                // Datetime
+                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
+
                 // URL Encoding
                 implementation("net.thauvin.erik.urlencoder:urlencoder-lib:1.4.0")
 

diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/actions/update/Update.kt b/src/commonMain/kotlin/teksturepako/pakku/api/actions/update/Update.kt
@@ -6,6 +6,7 @@ import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.get
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
+import kotlinx.datetime.Instant
 import teksturepako.pakku.api.actions.ActionError
 import teksturepako.pakku.api.data.ConfigFile
 import teksturepako.pakku.api.platforms.GitHub
@@ -14,7 +15,6 @@ import teksturepako.pakku.api.projects.Project
 import teksturepako.pakku.api.projects.UpdateStrategy
 import teksturepako.pakku.api.projects.combineWith
 import teksturepako.pakku.api.projects.inheritPropertiesFrom
-import java.time.Instant
 
 /**
  * Requests new data for provided [projects] from all platforms and updates them based on platform-specific slugs,
@@ -51,18 +51,27 @@ suspend fun updateMultipleProjectsWithFiles(
                     acc.find { accProject ->
                         accProject.slug[platform.serialName] == newProject.slug[platform.serialName]
                     }?.also { accProject ->
-                        // Combine projects
-                        val accFiles = combinedProjectsToOldFiles[accProject]
-                            ?: return@coroutineScope Err(ActionError("Failed to combine project ${accProject.pakkuId} when updating. Report it to Pakku's developer."))
+                        val accFiles = combinedProjectsToOldFiles[accProject] ?: return@coroutineScope Err(
+                            ActionError("Failed to combine project ${accProject.pakkuId} when updating." +
+                                    " Report it to Pakku's developer.")
+                        )
+
                         val accPublished = accFiles.find { it.type == platform.serialName }?.datePublished
-                        if (accPublished != null && accPublished != Instant.MIN)
+
+                        if (accPublished != null && accPublished != Instant.DISTANT_FUTURE)
+                        {
                             newProject.files.removeIf { it.type == platform.serialName && it.datePublished < accPublished }
+                        }
+
+                        // Combine projects
                         (accProject + newProject).get()
                             ?.copy(files = (newProject.files.take(numberOfFiles) + accProject.files).toMutableSet())
                             ?.let x@{ combinedProject ->
                                 if (combinedProject.hasNoFiles()) return@x // Do not update project if files are missing
+
                                 combinedProjectsToOldFiles[combinedProject] = accFiles
                                 combinedProjectsToOldFiles -= accProject
+
                                 acc -= accProject
                                 acc += combinedProject
                             }

diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/data/InstantIso8601Serializer.kt b/src/commonMain/kotlin/teksturepako/pakku/api/data/InstantIso8601Serializer.kt
diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/platforms/CurseForge.kt b/src/commonMain/kotlin/teksturepako/pakku/api/platforms/CurseForge.kt
@@ -1,5 +1,6 @@
 package teksturepako.pakku.api.platforms
 
+import kotlinx.datetime.Instant
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonObject
 import net.thauvin.erik.urlencoder.UrlEncoderUtil.decode
@@ -13,7 +14,6 @@ import teksturepako.pakku.debug
 import teksturepako.pakku.debugIfEmpty
 import teksturepako.pakku.io.getEnvOrNull
 import teksturepako.pakku.io.toMurmur2
-import java.time.Instant
 
 @Suppress("MemberVisibilityCanBePrivate")
 object CurseForge : Platform(

diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/platforms/GitHub.kt b/src/commonMain/kotlin/teksturepako/pakku/api/platforms/GitHub.kt
@@ -1,5 +1,6 @@
 package teksturepako.pakku.api.platforms
 
+import kotlinx.datetime.Instant
 import net.thauvin.erik.urlencoder.UrlEncoderUtil
 import teksturepako.pakku.api.data.json
 import teksturepako.pakku.api.http.Http
@@ -8,7 +9,6 @@ import teksturepako.pakku.api.models.gh.GhRepoModel
 import teksturepako.pakku.api.projects.Project
 import teksturepako.pakku.api.projects.ProjectFile
 import teksturepako.pakku.api.projects.ProjectType
-import java.time.Instant
 
 object GitHub : Http(), Provider
 {

diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/platforms/Modrinth.kt b/src/commonMain/kotlin/teksturepako/pakku/api/platforms/Modrinth.kt
@@ -6,6 +6,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
+import kotlinx.datetime.Instant
 import kotlinx.serialization.json.JsonObject
 import net.thauvin.erik.urlencoder.UrlEncoderUtil
 import net.thauvin.erik.urlencoder.UrlEncoderUtil.encode
@@ -14,9 +15,7 @@ import teksturepako.pakku.api.models.mr.GetVersionsFromHashesRequest
 import teksturepako.pakku.api.models.mr.MrProjectModel
 import teksturepako.pakku.api.models.mr.MrVersionModel
 import teksturepako.pakku.api.projects.*
-import teksturepako.pakku.debug
 import teksturepako.pakku.debugIfEmpty
-import java.time.Instant
 import kotlin.system.exitProcess
 import kotlin.time.Duration.Companion.seconds
 

diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/projects/Project.kt b/src/commonMain/kotlin/teksturepako/pakku/api/projects/Project.kt
@@ -187,7 +187,8 @@ data class Project(
         return this.files.filter { it.type in providers.map { provider -> provider.serialName } }
     }
 
-    fun getLatestFile(providers: Collection<Provider>) = getFilesForProviders(providers).maxByOrNull { it.datePublished }
+    fun getLatestFile(providers: Collection<Provider>): ProjectFile? =
+        getFilesForProviders(providers).maxByOrNull { it.datePublished }
 
     // -- DEPENDENCIES --
 

diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/projects/ProjectFile.kt b/src/commonMain/kotlin/teksturepako/pakku/api/projects/ProjectFile.kt
@@ -1,9 +1,9 @@
 package teksturepako.pakku.api.projects
 
+import kotlinx.datetime.Instant
 import kotlinx.serialization.Required
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import teksturepako.pakku.api.data.InstantIso8601Serializer
 import teksturepako.pakku.api.actions.ActionError
 import teksturepako.pakku.api.actions.ActionError.HashMismatch
 import teksturepako.pakku.api.actions.ActionError.NoHashes
@@ -12,7 +12,6 @@ import teksturepako.pakku.api.data.LockFile
 import teksturepako.pakku.api.data.workingPath
 import teksturepako.pakku.io.createHash
 import java.nio.file.Path
-import java.time.Instant
 import kotlin.io.path.Path
 
 @Serializable
@@ -29,7 +28,7 @@ data class ProjectFile(
     val hashes: MutableMap<String, String>? = null,
     @SerialName("required_dependencies") val requiredDependencies: MutableSet<String>? = null,
     val size: Int = 0,
-    @SerialName("date_published") val datePublished: @Serializable(with = InstantIso8601Serializer::class) Instant = Instant.MIN,
+    @SerialName("date_published") val datePublished: Instant = Instant.DISTANT_PAST,
 )
 {
     // -- PARENT --