more refactor

Author: Brutus5000

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

@@ -340,12 +340,15 @@ class Patcher(
     }
 
     private fun Path.commonPath(other: Path): Path {
-        val a = this.toAbsolutePath().normalize()
+        val a = toAbsolutePath().normalize()
         val b = other.toAbsolutePath().normalize()
-        val min = minOf(a.nameCount, b.nameCount)
-        var i = 0
-        while (i < min && a.getName(i) == b.getName(i)) i++
-        return if (i == 0) a.root else a.root.resolve(a.subpath(0, i))
+
+        val commonCount = (0 until minOf(a.nameCount, b.nameCount))
+            .takeWhile { a.getName(it) == b.getName(it) }
+            .count()
+
+        return if (commonCount == 0) a.root
+        else a.root.resolve(a.subpath(0, commonCount))
     }
 
     private fun zipPreserveStructure(sources: List<Path>, outputFile: Path, base: Path) {
@@ -354,33 +357,34 @@ class Patcher(
             for (src in sources) {
                 if (!Files.exists(src)) {
                     // skip
+                    log.warn("Could not find path {}", src)
                     continue
                 }
                 if (Files.isDirectory(src)) {
                     Files.walk(src).use { stream ->
-                        stream.filter { Files.isRegularFile(it) }.forEach { file ->
-                            val arcname = base.relativize(file).toString().replace("\\", "/")
-                            val entry = ZipEntry(arcname)
-                            // fix timestamp for determinism (not strictly necessary)
-                            entry.time = 315532800000L // 1980-01-01 00:00:00 UTC in ms
-                            zos.putNextEntry(entry)
-                            Files.newInputStream(file).use { inp -> inp.copyTo(zos) }
-                            zos.closeEntry()
-                        }
+                        stream
+                            .filter { Files.isRegularFile(it) }
+                            .forEach { zos.pushNormalizedFile(base, it) }
                     }
                 } else {
-                    val arcname = base.relativize(src).toString().replace("\\", "/")
-                    val entry = ZipEntry(arcname)
-                    // earliest timestamp allowed in zip file
-                    entry.time = 315532800000L
-                    zos.putNextEntry(entry)
-                    Files.newInputStream(src).use { inp -> inp.copyTo(zos) }
-                    zos.closeEntry()
+                    zos.pushNormalizedFile(base, src)
                 }
             }
         }
     }
 
+    private fun ZipOutputStream.pushNormalizedFile(base: Path, path: Path) {
+        require(Files.isRegularFile(path)) { "Path $path is not a regular file" }
+
+        val archiveName = base.relativize(path).toString().replace("\\", "/")
+        val entry = ZipEntry(archiveName)
+        // fix timestamp for determinism (not strictly necessary)
+        entry.time = 315532800000L
+        this.putNextEntry(entry)
+        Files.newInputStream(path).use { inp -> inp.copyTo(this) }
+        this.closeEntry()
+    }
+
 }
 
 fun main() {
@@ -445,11 +449,10 @@ fun main() {
         Patcher.PatchFile(19, "E05_VO.v%d.nx2", null),
         Patcher.PatchFile(20, "E06_VO.v%d.nx2", null),
         Patcher.PatchFile(21, "Prothyon16_VO.v%d.nx2", null),
-        Patcher.PatchFile(22, "A03_VO.v%d.nx2", null),
-        Patcher.PatchFile(23, "A03_VO.v%d.nx2", null),
-        Patcher.PatchFile(24, "A03_VO.v%d.nx2", null),
-        Patcher.PatchFile(25, "A03_VO.v%d.nx2", null),
-        // … add the rest
+        Patcher.PatchFile(22, "TCR_VO.v%d.nx2", null),
+        Patcher.PatchFile(23, "SCCA_Briefings.v%d.nx2", null),
+        Patcher.PatchFile(24, "SCCA_FMV.v%d.nx2", null),
+        Patcher.PatchFile(25, "FAF_Coop_Operation_Tight_Spot_VO.v%d.nx2", null),
     )
 
     FafDatabase(