gradle

Author: Brutus5000

…-deployment/scripts/deploy-coop.main.kts …egacy-deployment/scripts/CoopDeployer.ktapps/faf-legacy-deployment/scripts/deploy-coop.main.kts renamed to apps/faf-legacy-deployment/scripts/CoopDeployer.kt apps/faf-legacy-deployment/scripts/deploy-coop.main.kts renamed to apps/faf-legacy-deployment/scripts/CoopDeployer.kt

@@ -1,13 +1,8 @@
-#!/usr/bin/env kotlin
-
-@file:DependsOn("com.mysql:mysql-connector-j:9.5.0")
-@file:DependsOn("org.eclipse.jgit:org.eclipse.jgit:7.4.0.202509020913-r")
-@file:DependsOn("com.squareup.okio:okio:3.16.4")
-
 import org.eclipse.jgit.api.Git
+import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.net.HttpURLConnection
-import java.net.URL
+import java.net.URI
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -20,6 +15,9 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 import kotlin.io.path.inputStream
 
+private val log = LoggerFactory.getLogger("CoopDeployer")
+
+
 // --------------------------- CONFIG ---------------------------
 
 val PATCH_VERSION = System.getenv("PATCH_VERSION") ?: error("PATCH_VERSION required")
@@ -68,7 +66,7 @@ fun setPerm664(path: Path) {
         }
         Files.setPosixFilePermissions(path, perms)
     } catch (e: Exception) {
-        println("Warning: couldn't set perms on $path: ${e.message}")
+        log.warn("Warning: couldn't set perms on {}", path, e)
     }
 }
 
@@ -111,13 +109,13 @@ fun zipPreserveStructure(sources: List<Path>, outputFile: Path, base: Path) {
 fun prepareRepo(): Path {
     val dir = Paths.get(WORKDIR)
     if (Files.exists(dir.resolve(".git"))) {
-        println("Repo exists — fetching and checking out $GIT_REF...")
+        log.info("Repo exists — fetching and checking out $GIT_REF...")
         Git.open(dir.toFile()).use { git ->
             git.fetch().call()
             git.checkout().setName(GIT_REF).call()
         }
     } else {
-        println("Cloning $REPO_URL -> $dir ...")
+        log.info("Cloning $REPO_URL -> $dir ...")
         Git.cloneRepository()
             .setURI(REPO_URL)
             .setDirectory(dir.toFile())
@@ -132,7 +130,7 @@ fun prepareRepo(): Path {
 // --------------------------- GITHUB RELEASE ASSET DOWNLOAD ---------------------------
 
 fun httpGet(url: String): String {
-    val conn = URL(url).openConnection() as HttpURLConnection
+    val conn = URI.create(url).toURL().openConnection() as HttpURLConnection
     conn.requestMethod = "GET"
     conn.setRequestProperty("Accept", "application/vnd.github.v3+json")
     conn.connectTimeout = 15000
@@ -143,7 +141,7 @@ fun httpGet(url: String): String {
 }
 
 fun downloadFile(url: String, dest: Path) {
-    val u = URL(url)
+    val u = URI.create(url).toURL()
     val conn = u.openConnection() as HttpURLConnection
     conn.requestMethod = "GET"
     conn.connectTimeout = 20000
@@ -168,36 +166,36 @@ fun findNx2UrlsFromReleaseJson(json: String): List<String> {
 }
 
 fun downloadVoAssets(version: String, targetDir: Path): List<Path> {
-    println("Downloading VO assets for version $version from GitHub releases...")
+    log.info("Downloading VO assets for version $version from GitHub releases...")
     Files.createDirectories(VO_DOWNLOAD_TMP)
     val apiUrl = "https://api.github.com/repos/FAForever/fa-coop/releases/tags/v$version"
     val json = try {
         httpGet(apiUrl)
     } catch (e: Exception) {
-        println("Warning: failed to fetch release JSON: ${e.message}")
+        log.warn("Warning: failed to fetch release JSON", e)
         return emptyList()
     }
 
     val urls = findNx2UrlsFromReleaseJson(json)
     if (urls.isEmpty()) {
-        println("No .nx2 assets found in release v$version")
+        log.info("No .nx2 assets found in release v{}", version)
         return emptyList()
     }
 
     val downloaded = mutableListOf<Path>()
     for (u in urls) {
-        val filename = Paths.get(URL(u).path).fileName.toString()
+        val filename = Paths.get(URI.create(u).toURL().path).fileName.toString()
         val dst = VO_DOWNLOAD_TMP.resolve(filename)
         try {
-            println("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")
             val newPath = VO_DOWNLOAD_TMP.resolve(newName)
             Files.move(dst, newPath, StandardCopyOption.REPLACE_EXISTING)
             downloaded.add(newPath)
         } catch (e: Exception) {
-            println("Warning: failed to download $u: ${e.message}")
+            log.warn("Warning: failed to download {}", u, e)
         }
     }
 
@@ -206,16 +204,16 @@ fun downloadVoAssets(version: String, targetDir: Path): List<Path> {
     Files.createDirectories(outDir)
     for (p in downloaded) {
         val dest = outDir.resolve(p.fileName.toString())
-        println("Copying VO $p -> $dest")
+        log.info("Copying VO {} -> {}", p, dest)
         try {
             if (!DRYRUN) {
                 Files.copy(p, dest, StandardCopyOption.REPLACE_EXISTING)
                 setPerm664(dest)
             } else {
-                println("[DRYRUN] Would copy $p -> $dest")
+                log.info("[DRYRUN] Would copy {} -> {}", p, dest)
             }
         } catch (e: Exception) {
-            println("Warning: copying failed: ${e.message}")
+            log.warn("Warning: copying failed", e)
         }
     }
 
@@ -225,7 +223,7 @@ fun downloadVoAssets(version: String, targetDir: Path): List<Path> {
 // --------------------------- DATABASE ---------------------------
 
 fun dbConnection() =
-    DriverManager.getConnection("jdbc:mysql://$DB_HOST/$DB_NAME?useSSL=false&serverTimezone=UTC", DB_USER, DB_PASS)
+    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?>> {
     val sql = """
@@ -248,9 +246,9 @@ fun readExisting(conn: java.sql.Connection, mod: String): Map<Int, Pair<String?,
 }
 
 fun updateDb(conn: java.sql.Connection, mod: String, fileId: Int, version: Int, name: String, md5: String) {
-    println("Updating DB: $name (fileId=$fileId, version=$version) md5=$md5")
+    log.info("Updating DB: {} (fileId={}, version={}) md5={}", name, fileId, version, md5)
     if (DRYRUN) {
-        println("[DRYRUN] DB: would delete/insert for $fileId,$version")
+        log.info("[DRYRUN] DB: would delete/insert for {},{}", fileId, version)
         return
     }
     val del = "DELETE FROM updates_${mod}_files WHERE fileId=? AND version=?"
@@ -285,49 +283,49 @@ fun processItem(
     Files.createDirectories(outDir)
     val target = outDir.resolve(name)
 
-    println("Processing $name (fileId $fileId)")
+    log.info("Processing {} (fileId {})", name, fileId)
 
     if (sources == null) {
         // VO file: look for downloaded file in target dir (name formatted)
         val expectedName = name // matches nameFmt.format(version)
         val candidate = outDir.resolve(expectedName)
         if (!Files.exists(candidate)) {
-            println("Warning: VO file $expectedName not found in $outDir, skipping")
+            log.info("Warning: VO file {} not found in {}, skipping", expectedName, outDir)
             return
         }
         val newMd5 = md5(candidate)
         val oldMd5 = readExisting(conn, mod)[fileId]?.second
         if (newMd5 != oldMd5) {
             updateDb(conn, mod, fileId, version, expectedName, newMd5)
         } else {
-            println("VO $expectedName unchanged")
+            log.info("VO {} unchanged", expectedName)
         }
         return
     }
 
     // sources present -> create zip or copy single file
     val existing = sources.filter { p -> Files.exists(p) }
     if (existing.isEmpty()) {
-        println("Warning: no existing sources for $name, skipping")
+        log.info("Warning: no existing sources for {}, skipping", name)
         return
     }
 
     // if single source and it's a file, copy it directly (like init_coop.lua)
     if (existing.size == 1 && Files.isRegularFile(existing[0])) {
         val src = existing[0]
-        println("Single file source for $name: copying $src -> $target")
+        log.info("Single file source for {}: copying {} -> {}", name, src, target)
         if (!DRYRUN) {
             Files.copy(src, target, StandardCopyOption.REPLACE_EXISTING)
             setPerm664(target)
         } else {
-            println("[DRYRUN] Would copy $src -> $target")
+            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 {
-            println("$name unchanged")
+            log.info("{} unchanged", name)
         }
         return
     }
@@ -340,85 +338,86 @@ fun processItem(
     }
 
     val tmp = Files.createTempFile("coop", ".zip")
-    println("Zipping sources with base=$base -> $tmp")
+    log.info("Zipping sources with base={} -> {}", base, tmp)
     zipPreserveStructure(existing, tmp, base)
-    println("Moving zip to $target")
+    log.info("Moving zip to {}", target)
     if (!DRYRUN) {
         Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING)
         setPerm664(target)
     } else {
-        println("[DRYRUN] Would move $tmp -> $target")
+        log.info("[DRYRUN] Would move {} -> {}", tmp, target)
     }
 
     val newMd5 = md5(target)
     val oldMd5 = readExisting(conn, mod)[fileId]?.second
     if (newMd5 != oldMd5) {
         updateDb(conn, mod, fileId, version, name, newMd5)
     } else {
-        println("$name unchanged")
+        log.info("{} unchanged", name)
     }
 }
 
 // --------------------------- MAIN ---------------------------
-
-println("=== Kotlin Coop Deployer v$PATCH_VERSION ===")
-val repo = prepareRepo()
-println("Repo ready at $repo")
+fun main() {
+    log.info("=== Kotlin Coop Deployer v{} ===", PATCH_VERSION)
+    val repo = prepareRepo()
+    log.info("Repo ready at {}", repo)
 
 // Download VO assets first
-val voFiles = downloadVoAssets(PATCH_VERSION, TARGET_DIR) // returns list of paths in target dir
-val voMap = voFiles.associateBy { it.fileName.toString() } // name -> Path
-
-val conn = dbConnection()
-try {
-    val existing = readExisting(conn, "coop")
-
-    data class PatchFile(val id: Int, val fileTemplate: String, val includes: List<Path>?)
-
-    val filesList = listOf(
-        PatchFile(1, "init_coop.v%d.lua", listOf(repo.resolve("init_coop.lua"))),
-        PatchFile(
-            2, "lobby_coop_v%d.cop", listOf(
-                repo.resolve("mods"),
-                repo.resolve("units"),
-                repo.resolve("mod_info.lua"),
-                repo.resolve("readme.md"),
-                repo.resolve("changelog.md")
-            )
-        ),
-
-        // all VO files (no sources → already downloaded externally)
-        PatchFile(3, "A01_VO.v%d.nx2", null),
-        PatchFile(4, "A02_VO.v%d.nx2", null),
-        PatchFile(5, "A03_VO.v%d.nx2", null),
-        PatchFile(6, "A04_VO.v%d.nx2", null),
-        PatchFile(7, "A05_VO.v%d.nx2", null),
-        PatchFile(8, "A06_VO.v%d.nx2", null),
-        PatchFile(9, "C01_VO.v%d.nx2", null),
-        PatchFile(10, "C02_VO.v%d.nx2", null),
-        PatchFile(11, "C03_VO.v%d.nx2", null),
-        PatchFile(12, "C04_VO.v%d.nx2", null),
-        PatchFile(13, "C05_VO.v%d.nx2", null),
-        PatchFile(14, "C06_VO.v%d.nx2", null),
-        PatchFile(15, "E01_VO.v%d.nx2", null),
-        PatchFile(16, "E02_VO.v%d.nx2", null),
-        PatchFile(17, "E03_VO.v%d.nx2", null),
-        PatchFile(18, "E04_VO.v%d.nx2", null),
-        PatchFile(19, "E05_VO.v%d.nx2", null),
-        PatchFile(20, "E06_VO.v%d.nx2", null),
-        PatchFile(21, "Prothyon16_VO.v%d.nx2", null),
-        PatchFile(22, "A03_VO.v%d.nx2", null),
-        PatchFile(23, "A03_VO.v%d.nx2", null),
-        PatchFile(24, "A03_VO.v%d.nx2", null),
-        PatchFile(25, "A03_VO.v%d.nx2", null),
-        // … add the rest
-    )
-
-    for ((fileId, fmt, srcs) in filesList) {
-        processItem(conn, "coop", PATCH_VERSION.toInt(), fileId, fmt, srcs?.map { it }, voMap)
+    val voFiles = downloadVoAssets(PATCH_VERSION, TARGET_DIR) // returns list of paths in target dir
+    val voMap = voFiles.associateBy { it.fileName.toString() } // name -> Path
+
+    val conn = dbConnection()
+    try {
+        val existing = readExisting(conn, "coop")
+
+        data class PatchFile(val id: Int, val fileTemplate: String, val includes: List<Path>?)
+
+        val filesList = listOf(
+            PatchFile(1, "init_coop.v%d.lua", listOf(repo.resolve("init_coop.lua"))),
+            PatchFile(
+                2, "lobby_coop_v%d.cop", listOf(
+                    repo.resolve("mods"),
+                    repo.resolve("units"),
+                    repo.resolve("mod_info.lua"),
+                    repo.resolve("readme.md"),
+                    repo.resolve("changelog.md")
+                )
+            ),
+
+            // all VO files (no sources → already downloaded externally)
+            PatchFile(3, "A01_VO.v%d.nx2", null),
+            PatchFile(4, "A02_VO.v%d.nx2", null),
+            PatchFile(5, "A03_VO.v%d.nx2", null),
+            PatchFile(6, "A04_VO.v%d.nx2", null),
+            PatchFile(7, "A05_VO.v%d.nx2", null),
+            PatchFile(8, "A06_VO.v%d.nx2", null),
+            PatchFile(9, "C01_VO.v%d.nx2", null),
+            PatchFile(10, "C02_VO.v%d.nx2", null),
+            PatchFile(11, "C03_VO.v%d.nx2", null),
+            PatchFile(12, "C04_VO.v%d.nx2", null),
+            PatchFile(13, "C05_VO.v%d.nx2", null),
+            PatchFile(14, "C06_VO.v%d.nx2", null),
+            PatchFile(15, "E01_VO.v%d.nx2", null),
+            PatchFile(16, "E02_VO.v%d.nx2", null),
+            PatchFile(17, "E03_VO.v%d.nx2", null),
+            PatchFile(18, "E04_VO.v%d.nx2", null),
+            PatchFile(19, "E05_VO.v%d.nx2", null),
+            PatchFile(20, "E06_VO.v%d.nx2", null),
+            PatchFile(21, "Prothyon16_VO.v%d.nx2", null),
+            PatchFile(22, "A03_VO.v%d.nx2", null),
+            PatchFile(23, "A03_VO.v%d.nx2", null),
+            PatchFile(24, "A03_VO.v%d.nx2", null),
+            PatchFile(25, "A03_VO.v%d.nx2", null),
+            // … add the rest
+        )
+
+        for ((fileId, fmt, srcs) in filesList) {
+            processItem(conn, "coop", PATCH_VERSION.toInt(), fileId, fmt, srcs?.map { it }, voMap)
+        }
+    } finally {
+        conn.close()
     }
-} finally {
-    conn.close()
-}
 
-println("=== Done ===")
+    log.info("=== Done ===")
+}

apps/faf-legacy-deployment/scripts/build.gradle.kts

@@ -0,0 +1,26 @@
+plugins {
+    kotlin("jvm") version "1.9.24"
+    application
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.mariadb.jdbc:mariadb-java-client:3.5.7")
+    implementation("org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r")
+    implementation("org.slf4j:slf4j-api:2.0.13")
+    runtimeOnly("ch.qos.logback:logback-classic:1.5.23")
+}
+
+application {
+    mainClass.set("CoopDeployerKt") // filename + Kt
+}
+
+// Use the root level for files
+sourceSets {
+    main {
+        kotlin.srcDirs(".")
+    }
+}