Fix coop map folder structure

Author: Brutus5000

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

@@ -33,7 +33,7 @@ data class CoopMap(
         "${folderName.lowercase()}.v${version.toString().padStart(4, '0')}.zip"
 
     fun folderName(version: Int) =
-        "${folderName.lowercase()}.v${version.toString().padStart(4, '0')}"
+        "${folderName}.v${version.toString().padStart(4, '0')}"
 }
 
 private val coopMaps = listOf(
@@ -139,7 +139,7 @@ private fun processCoopMap(
 
         // Compare with checksums from existing ZIP
         val currentZip = Path.of(mapsDir, map.zipName(currentVersion))
-        val oldChecksums = extractChecksumsFromZip(currentZip)
+        val oldChecksums = extractChecksumsFromZip(currentZip, "${map.folderName(currentVersion)}/$CHECKSUMS_FILENAME")
 
         val changed = currentVersion == 0 || newChecksums != oldChecksums
 
@@ -181,12 +181,15 @@ private fun generateChecksumsForMap(
  */
 private fun getFileContent(file: Path, map: CoopMap, version: Int): ByteArray {
     return if (file.isTextFile()) {
-        file.readText()
+        var text = file.readText()
             .replace(
                 "/maps/${map.folderName}/",
                 "/maps/${map.folderName(version)}/",
             )
-            .toByteArray()
+        if (file.toString().endsWith("_scenario.lua")) {
+            text = text.replace(Regex("""(map_version\s*=\s*)\d+"""), "$1$version")
+        }
+        text.toByteArray()
     } else {
         file.readBytes()
     }
@@ -202,22 +205,24 @@ private fun createZip(
     ZipArchiveOutputStream(out.toFile()).use { zip ->
         zip.setMethod(ZipArchiveEntry.DEFLATED)
 
-        // Generate and write checksums.md5 as first entry
+        // Write all files inside versioned subfolder
+        val versionedFolder = map.folderName(version)
+
+        // Generate and write checksums.md5 as first entry inside subfolder
         val checksums = generateChecksumsForMap(map, version, files, base)
         val checksumBytes = checksums.toByteArray()
-        val checksumEntry = ZipArchiveEntry(CHECKSUMS_FILENAME).apply {
+        val checksumEntry = ZipArchiveEntry("$versionedFolder/$CHECKSUMS_FILENAME").apply {
             size = checksumBytes.size.toLong()
         }
         zip.putArchiveEntry(checksumEntry)
         zip.write(checksumBytes)
         zip.closeArchiveEntry()
 
-        // Write all files at root level
         files.forEach { file ->
             val rel = base.relativize(file).toString().replace("\\", "/")
             val bytes = getFileContent(file, map, version)
 
-            val entry = ZipArchiveEntry(rel).apply {
+            val entry = ZipArchiveEntry("$versionedFolder/$rel").apply {
                 size = bytes.size.toLong()
             }
 

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

@@ -133,12 +133,12 @@ fun generateChecksums(
  * Extract checksums.md5 content from an existing ZIP file.
  * Returns null if the file doesn't exist or doesn't contain checksums.md5.
  */
-fun extractChecksumsFromZip(zipPath: Path): String? {
+fun extractChecksumsFromZip(zipPath: Path, entryName: String = CHECKSUMS_FILENAME): String? {
     if (!Files.exists(zipPath)) return null
 
     return try {
         ZipFile.builder().setPath(zipPath).get().use { zip ->
-            val entry = zip.getEntry(CHECKSUMS_FILENAME) ?: return null
+            val entry = zip.getEntry(entryName) ?: return null
             zip.getInputStream(entry).bufferedReader().readText()
         }
     } catch (e: Exception) {