mods folder lock

PlumyGames · Dec 26, 2023 · 8e716b0 · 8e716b0
1 parent d27ce0b
commit 8e716b0
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 5 deletions.
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    kotlin("plugin.serialization") version "1.9.21"
     groovy
     `java-gradle-plugin`
     id("maven-publish")
@@ -65,11 +66,12 @@ val arcVersion: String by project
 val jarIncluding = configurations.create("including")
 dependencies {
     jarIncluding("com.github.anuken.arc:arc-core:$arcVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
     compileOnly("com.github.anuken.arc:arc-core:$arcVersion")
-    implementation("org.hjson:hjson:3.0.0")
+    implementation("org.hjson:hjson:3.0.1")
     implementation("com.google.code.gson:gson:2.9.0")
     testCompileOnly("com.github.anuken.arc:arc-core:$arcVersion")
-    testImplementation("org.hjson:hjson:3.0.0")
+    testImplementation("org.hjson:hjson:3.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
     dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.8.22")

diff --git a/main/src/task/ResolveModpack.kt b/main/src/task/ResolveModpack.kt
@@ -82,6 +82,6 @@ open class ResolveModpack : DefaultTask() {
     }
 }
 
-data class ModLock(
+private data class ModLock(
     val path: String,
 )
diff --git a/main/src/task/RunMindustryAbstract.kt b/main/src/task/RunMindustryAbstract.kt
@@ -3,9 +3,15 @@ package io.github.liplum.mindustry
 import io.github.liplum.dsl.*
 import io.github.liplum.dsl.fileProp
 import io.github.liplum.dsl.stringsProp
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import org.gradle.api.tasks.*
 import java.io.File
 
+private
+const val lockFile = ".lock.json"
+
 abstract class RunMindustryAbstract : JavaExec() {
     val gameFile = project.fileProp()
         @InputFile get
@@ -20,12 +26,15 @@ abstract class RunMindustryAbstract : JavaExec() {
         mainClass.set("-jar")
     }
 
-    fun loadMods(modsDir: File) {
+    protected fun loadMods(modsDir: File) {
         modsDir.mkdirs()
+        val lastLock = readLock(modsDir)
+        // parse lock
         if (modsDir.isDirectory) {
             // TODO: Record the mod signature, and don't always delete all.
             modsDir.deleteRecursively()
         }
+
         for (modFile in mods) {
             if (modFile.isFile) {
                 createSymbolicLinkOrCopy(link = modsDir.resolve(modFile.name), target = modFile)
@@ -34,4 +43,39 @@ abstract class RunMindustryAbstract : JavaExec() {
             }
         }
     }
-}
+
+    /**
+     * @return (existing, missing)
+     */
+    private fun restoreLastLock(modsDir: File): Pair<List<File>, List<File>> {
+        val lastLock = readLock(modsDir)
+        val files = modsDir.listFiles() ?: arrayOf()
+        val restored = files.groupBy { lastLock.mods[it.name] != null }
+        return Pair(restored[true]!!, restored[false]!!)
+    }
+
+    private fun readLock(modsDir: File): Mods4LoadLock {
+        val lockFile = modsDir.resolve(lockFile)
+        return runCatching {
+            val text = lockFile.readText(charset = Charsets.UTF_8)
+            return Json.decodeFromString(text)
+        }.getOrNull() ?: Mods4LoadLock()
+    }
+
+    private fun writeLock(modsDir: File, lock: Mods4LoadLock) {
+        val lockFile = modsDir.resolve(lockFile)
+        val json = Json.encodeToString(lock)
+        lockFile.writeText(json, charset = Charsets.UTF_8)
+    }
+}
+
+@Serializable
+private data class Mod4LoadLock(
+    val fileName: String,
+)
+
+@Serializable
+private data class Mods4LoadLock(
+    /** [Mod4LoadLock.fileName] to [Mod4LoadLock]*/
+    val mods: Map<String, Mod4LoadLock> = mapOf(),
+)