more coop fixes

Author: Brutus5000

apps/faf-legacy-deployment/scripts/CoopDeployer.kt

@@ -187,7 +187,7 @@ fun downloadVoAssets(version: String, targetDir: Path): List<Path> {
         val filename = Paths.get(URI.create(u).toURL().path).fileName.toString()
         val dst = VO_DOWNLOAD_TMP.resolve(filename)
         try {
-            log.info("Downloading {} -> {}",u, dst)
+            log.info("Downloading {} -> {}", u, dst)
             downloadFile(u, dst)
             // rename to include .v{version}.nx2 before .nx2
             val newName = filename.replace(Regex("\\.nx2$"), ".v$version.nx2")
@@ -225,21 +225,27 @@ fun downloadVoAssets(version: String, targetDir: Path): List<Path> {
 fun dbConnection() =
     DriverManager.getConnection("jdbc:mariadb://$DB_HOST/$DB_NAME?useSSL=false&serverTimezone=UTC", DB_USER, DB_PASS)
 
-fun readExisting(conn: java.sql.Connection, mod: String): Map<Int, Pair<String?, String?>> {
+data class ExistingFile(val fileId: Int, val name: String, val md5: String, val version: Int)
+
+fun readExisting(conn: java.sql.Connection, mod: String): Map<Int, ExistingFile> {
     val sql = """
-        SELECT uf.fileId, uf.name, uf.md5
+        SELECT uf.fileId, uf.name, uf.md5, t.v
         FROM (
             SELECT fileId, MAX(version) AS v
             FROM updates_${mod}_files
             GROUP BY fileId
         ) t
         JOIN updates_${mod}_files uf ON uf.fileId = t.fileId AND uf.version = t.v
     """.trimIndent()
-    val out = mutableMapOf<Int, Pair<String?, String?>>()
+    val out = mutableMapOf<Int, ExistingFile>()
     conn.prepareStatement(sql).use { stmt ->
         val rs = stmt.executeQuery()
         while (rs.next()) {
-            out[rs.getInt(1)] = rs.getString(2) to rs.getString(3)
+            val fileId = rs.getInt(1)
+            val name = rs.getString(2)
+            val md5 = rs.getString(3)
+            val version = rs.getInt(4)
+            out[fileId] = ExistingFile(fileId = fileId, name = name, md5 = md5, version = version)
         }
     }
     return out
@@ -275,8 +281,7 @@ fun processItem(
     version: Int,
     fileId: Int,
     nameFmt: String,
-    sources: List<Path>?,
-    voDownloadedMap: Map<String, Path>
+    sources: List<Path>?
 ) {
     val name = nameFmt.format(version)
     val outDir = TARGET_DIR.resolve("updates_${mod}_files")
@@ -294,17 +299,17 @@ fun processItem(
             return
         }
         val newMd5 = md5(candidate)
-        val oldMd5 = readExisting(conn, mod)[fileId]?.second
-        if (newMd5 != oldMd5) {
+        val oldFile = readExisting(conn, mod)[fileId]
+        if (newMd5 != oldFile?.md5) {
             updateDb(conn, mod, fileId, version, expectedName, newMd5)
         } else {
-            log.info("VO {} unchanged", expectedName)
+            log.info("VO {} unchanged from version {}", expectedName, oldFile.version)
         }
         return
     }
 
     // sources present -> create zip or copy single file
-    val existing = sources.filter { p -> Files.exists(p) }
+    val existing = sources.filter(Files::exists)
     if (existing.isEmpty()) {
         log.info("Warning: no existing sources for {}, skipping", name)
         return
@@ -314,20 +319,21 @@ fun processItem(
     if (existing.size == 1 && Files.isRegularFile(existing[0])) {
         val src = existing[0]
         log.info("Single file source for {}: copying {} -> {}", name, src, target)
+
+        val newMd5 = md5(src)
+        val oldFile = readExisting(conn, mod)[fileId]
+        if (newMd5 == oldFile?.md5) {
+            log.info("{} unchanged from version {}, skipping", name, oldFile.version)
+            return
+        }
+
         if (!DRYRUN) {
             Files.copy(src, target, StandardCopyOption.REPLACE_EXISTING)
             setPerm664(target)
-        } else {
-            log.info("[DRYRUN] Would copy {} -> {}", src, target)
-        }
-        val newMd5 = md5(target)
-        val oldMd5 = readExisting(conn, mod)[fileId]?.second
-        if (newMd5 != oldMd5) {
             updateDb(conn, mod, fileId, version, name, newMd5)
         } else {
-            log.info("{} unchanged", name)
+            log.info("[DRYRUN] Would copy {} -> {}", src, target)
         }
-        return
     }
 
     // multiple sources -> zip them; determine base as common parent of the directories (so top-level folders like 'mods'/'units' remain)
@@ -340,20 +346,24 @@ fun processItem(
     val tmp = Files.createTempFile("coop", ".zip")
     log.info("Zipping sources with base={} -> {}", base, tmp)
     zipPreserveStructure(existing, tmp, base)
-    log.info("Moving zip to {}", target)
+
+    val newMd5 = md5(tmp)
+    val oldFile = readExisting(conn, mod)[fileId]
+
+    if (newMd5 == oldFile?.md5) {
+        log.info("{} unchanged from version {}, skipping", name, oldFile.version)
+        return
+    }
+
     if (!DRYRUN) {
+        log.info("Moving zip to {}", target)
         Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING)
         setPerm664(target)
-    } else {
-        log.info("[DRYRUN] Would move {} -> {}", tmp, target)
-    }
 
-    val newMd5 = md5(target)
-    val oldMd5 = readExisting(conn, mod)[fileId]?.second
-    if (newMd5 != oldMd5) {
+        log.info("Writing fileId {} with version {} to database", fileId, version)
         updateDb(conn, mod, fileId, version, name, newMd5)
     } else {
-        log.info("{} unchanged", name)
+        log.info("[DRYRUN] Would move {} -> {}", tmp, target)
     }
 }
 
@@ -413,7 +423,7 @@ fun main() {
         )
 
         for ((fileId, fmt, srcs) in filesList) {
-            processItem(conn, "coop", PATCH_VERSION.toInt(), fileId, fmt, srcs?.map { it }, voMap)
+            processItem(conn, "coop", PATCH_VERSION.toInt(), fileId, fmt, srcs?.map { it })
         }
     } finally {
         conn.close()