FeaturedModGitRepo

Author: Brutus5000

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

@@ -112,42 +112,54 @@ fun zipPreserveStructure(sources: List<Path>, outputFile: Path, base: Path) {
     }
 }
 
-// --------------------------- GIT ---------------------------
-
-fun prepareRepo(): Path {
-    val dir = Paths.get(WORKDIR)
-    if (Files.exists(dir.resolve(".git"))) {
-        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 {
-        log.info("Cloning $REPO_URL -> $dir ...")
-        Git.cloneRepository()
-            .setURI(REPO_URL)
-            .setDirectory(dir.toFile())
-            .call()
-        Git.open(dir.toFile()).use { git ->
-            git.checkout().setName(GIT_REF).call()
+data class FeatureModGitRepo(
+    val workDir: Path,
+    val repoUrl: String,
+    val gitRef: String,
+) {
+    fun checkout(): Path {
+        if (Files.exists(workDir.resolve(".git"))) {
+            log.info("Repo exists — fetching and checking out $gitRef...")
+            Git.open(workDir.toFile()).use { git ->
+                git.fetch().call()
+                git.checkout().setName(gitRef).call()
+            }
+        } else {
+            log.info("Cloning repository $repoUrl")
+            Git.cloneRepository()
+                .setURI(repoUrl)
+                .setDirectory(workDir.toFile())
+                .call()
+            log.info("Checking out $gitRef")
+            Git.open(workDir.toFile()).use { git ->
+                git.checkout().setName(gitRef).call()
+            }
         }
+
+        return workDir
     }
-    return dir
 }
 
-object GithubAssetDownloader {
-    private const val API_URL = "https://api.github.com/repos/FAForever/fa-coop/releases/tags/v%s"
-    private val DOWNLOAD_URL_REGEX = Regex(""""browser_download_url"\s*:\s*"(?<url>[^"]+)"""")
+data class GithubAssetDownloader(
+    val repoOwner: String = "FAForever",
+    val repoName: String,
+    val suffix: String,
+    val version: String,
+) {
+    companion object {
+        private const val API_URL = "https://api.github.com/repos/%s/%s/releases/tags/v%s"
+        private val DOWNLOAD_URL_REGEX = Regex(""""browser_download_url"\s*:\s*"(?<url>[^"]+)"""")
+    }
 
     private val httpClient = HttpClient.newBuilder()
         .connectTimeout(Duration.ofSeconds(10))
         .followRedirects(HttpClient.Redirect.NORMAL)
         .build()
 
-    fun downloadVoiceOverAssets(version: String, targetDir: Path): List<Path> {
+    fun downloadAssets(targetDir: Path): List<Path> {
         log.info("Downloading VO assets for version $version from GitHub releases...")
 
-        val urls = getAssetUrisBySuffix(version, ".nx2")
+        val urls = getAssetUrisBySuffix()
         if (urls.isEmpty()) {
             log.info("No .nx2 assets found in release v{}", version)
             return emptyList()
@@ -185,9 +197,9 @@ object GithubAssetDownloader {
         return downloaded.map { outDir.resolve(it.fileName) }
     }
 
-    private fun getAssetUrisBySuffix(version: String, suffix: String): List<URI> {
+    private fun getAssetUrisBySuffix(): List<URI> {
         val request = HttpRequest.newBuilder()
-            .uri(URI.create(API_URL.format(version)))
+            .uri(URI.create(API_URL.format(repoOwner, repoName, version)))
             .timeout(Duration.ofSeconds(10))
             .header("Accept", "application/vnd.github.v3+json")
             .GET()
@@ -224,17 +236,20 @@ object GithubAssetDownloader {
 
 }
 
-
-// --------------------------- DATABASE ---------------------------
-
-class FafDatabase(val host: String, val database: String, val dryRun: Boolean) : AutoCloseable {
+data class FafDatabase(
+    val host: String,
+    val database: String,
+    val username: String,
+    val password: String,
+    val dryRun: Boolean
+) : AutoCloseable {
     /**
      * Definition of an existing file in the database
      */
     data class PatchFile(val mod: String, val fileId: Int, val name: String, val md5: String, val version: Int)
 
     private val connection: Connection =
-        DriverManager.getConnection("jdbc:mariadb://$host/$database?useSSL=false&serverTimezone=UTC", DB_USER, DB_PASS)
+        DriverManager.getConnection("jdbc:mariadb://$host/$database?useSSL=false&serverTimezone=UTC", username, password)
 
     fun getCurrentPatchFile(mod: String, fileId: Int): PatchFile? {
         val sql = """
@@ -289,7 +304,6 @@ class FafDatabase(val host: String, val database: String, val dryRun: Boolean) :
     }
 }
 
-
 // --------------------------- PROCESS FILES ---------------------------
 
 fun processItem(
@@ -387,11 +401,19 @@ fun processItem(
 
 fun main() {
     log.info("=== Kotlin Coop Deployer v{} ===", PATCH_VERSION)
-    val repo = prepareRepo()
-    log.info("Repo ready at {}", repo)
+
+    val repo = FeatureModGitRepo(
+        workDir = Paths.get(WORKDIR),
+        repoUrl = REPO_URL,
+        gitRef = GIT_REF
+    ).checkout()
 
     // Download VO assets first
-    GithubAssetDownloader.downloadVoiceOverAssets(PATCH_VERSION, TARGET_DIR) // returns list of paths in target dir
+    GithubAssetDownloader(
+        repoName = "fa-coop",
+        suffix = ".nx2",
+        version = PATCH_VERSION
+    ).downloadAssets(TARGET_DIR)
 
     val filesList = listOf(
         PatchFile(1, "init_coop.v%d.lua", listOf(repo.resolve("init_coop.lua"))),
@@ -432,9 +454,15 @@ fun main() {
         // … add the rest
     )
 
-    FafDatabase(DB_HOST, DB_NAME, DRYRUN).use { db ->
+    FafDatabase(
+        host = DB_HOST,
+        database = DB_NAME,
+        username = DB_USER,
+        password = DB_PASS,
+        dryRun = DRYRUN
+    ).use { db ->
         filesList.forEach { processItem(db, it) }
     }
 
-    log.info("=== Done ===")
+    log.info("=== Deployment complete ===")
 }

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

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.9.24"
+    kotlin("jvm") version "2.3.0"
     application
 }