FileSystemProvider experiment

Author: MsRandom

minecraft-codev-core/gradle.properties

@@ -1 +1 @@
-version=0.6.1
+version=0.6.2

minecraft-codev-core/src/main/kotlin/net/msrandom/minecraftcodev/core/utils/path-utils.kt

@@ -3,35 +3,24 @@ package net.msrandom.minecraftcodev.core.utils
 import org.gradle.api.file.FileSystemLocation
 import org.gradle.api.file.FileSystemLocationProperty
 import org.jetbrains.annotations.Blocking
-import org.slf4j.LoggerFactory
-import java.lang.Thread.sleep
-import java.net.URI
 import java.nio.file.*
+import java.nio.file.spi.FileSystemProvider
 import kotlin.streams.asSequence
-import kotlin.time.Duration.Companion.seconds
 
-private val logger = LoggerFactory.getLogger("path-utils")
-
-@Blocking
 fun zipFileSystem(
-    file: Path,
+    path: Path,
     create: Boolean = false,
 ): FileSystem {
-    val uri = URI.create("jar:${file.toUri()}")
-
-    if (create) {
-        return FileSystems.newFileSystem(uri, mapOf("create" to true.toString()))
-    }
+    val env = mapOf("create" to create.toString())
 
-    while (true) {
+    for (provider in FileSystemProvider.installedProviders()) {
         try {
-            return FileSystems.newFileSystem(uri, emptyMap<String, Any>())
-        } catch (e: FileSystemAlreadyExistsException) {
-            logger.info("Couldn't acquire access to $file file-system, waiting", e)
-
-            sleep(1.seconds.inWholeMilliseconds)
+            return provider.newFileSystem(path, env)
+        } catch (_: UnsupportedOperationException) {
         }
     }
+
+    throw ProviderNotFoundException("Provider not found")
 }
 
 fun <T> Path.walk(action: Sequence<Path>.() -> T) =

minecraft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/JarRemapper.kt

@@ -10,17 +10,14 @@ import net.msrandom.minecraftcodev.core.utils.zipFileSystem
 import net.msrandom.minecraftcodev.remapper.extra.InnerClassRemapper
 import net.msrandom.minecraftcodev.remapper.extra.SimpleFallbackRemapper
 import java.io.File
-import java.nio.file.FileSystems
 import java.nio.file.Path
-import java.util.*
 import java.util.EnumSet
 import java.util.concurrent.CompletableFuture
-import kotlin.io.path.exists
 import kotlin.io.path.listDirectoryEntries
 
 const val REMAP_OPERATION_VERSION = 3
 
-private fun hasRefmaps(path: Path) = FileSystems.newFileSystem(path, null).use {
+private fun hasRefmaps(path: Path) = zipFileSystem(path).use {
     it.getPath("/").listDirectoryEntries("*refmap.json").isNotEmpty()
 }
 

minecraft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/RemapAction.kt

@@ -4,6 +4,7 @@ import net.fabricmc.mappingio.format.tiny.Tiny2FileReader
 import net.fabricmc.mappingio.tree.MemoryMappingTree
 import net.msrandom.minecraftcodev.core.utils.cacheExpensiveOperation
 import net.msrandom.minecraftcodev.core.utils.getAsPath
+import net.msrandom.minecraftcodev.core.utils.zipFileSystem
 import net.msrandom.minecraftcodev.includes.includedJarListingRules
 import org.gradle.api.artifacts.transform.CacheableTransform
 import org.gradle.api.artifacts.transform.InputArtifact
@@ -128,7 +129,7 @@ abstract class RemapAction : TransformAction<RemapAction.Parameters> {
                 classpath,
             )
 
-            FileSystems.newFileSystem(output, null).use { outputFs ->
+            zipFileSystem(output).use { outputFs ->
                 val root = outputFs.getPath("/")
                 val handler = includedJarListingRules.firstNotNullOfOrNull { it.load(root) }
                 if (handler != null) {