Fixed several resource filesystem bugs

AMNatty · Apr 6, 2022 · c675729 · c675729
1 parent 8313c08
commit c675729
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/UPDATE_NOTES.md b/UPDATE_NOTES.md
@@ -1,3 +1,6 @@
+## 22.0.0.0-alpha.7
+* `[PlutoRuntime]` Fixed several resource filesystem bugs
+
 ## 22.0.0.0-alpha.6
 * `[PlutoSpritesheet]` Added a constructor to `PartialTextureSprite` that initializes the spritesheet to `null`
 

diff --git a/buildSrc/src/main/kotlin/org/plutoengine/Versions.kt b/buildSrc/src/main/kotlin/org/plutoengine/Versions.kt
@@ -22,7 +22,7 @@ object Versions {
 
     const val isPrerelease = true
     const val prereleaseName = "alpha"
-    const val prerealeaseUpdate = 6
+    const val prerealeaseUpdate = 7
 
     val versionFull =
         if (isPrerelease)

diff --git a/...runtime/src/main/java/org/plutoengine/resource/filesystem/ResourceFileSystemProvider.java b/...runtime/src/main/java/org/plutoengine/resource/filesystem/ResourceFileSystemProvider.java
@@ -156,7 +156,14 @@ public FileChannel newFileChannel(Path path, Set<? extends OpenOption> options,
     @Override
     public AsynchronousFileChannel newAsynchronousFileChannel(Path path, Set<? extends OpenOption> options, ExecutorService executor, FileAttribute<?>... attrs) throws IOException
     {
-        return super.newAsynchronousFileChannel(path, options, executor, attrs);
+        if (!(path instanceof ResourcePath rp))
+            throw new IllegalArgumentException("Expected a path of type %s!".formatted(ResourcePath.class));
+
+        var backingPath = rp.getBackingPath();
+        var backingFileSystem = backingPath.getFileSystem();
+        var backingProvider = backingFileSystem.provider();
+
+        return backingProvider.newAsynchronousFileChannel(backingPath, options, executor, attrs);
     }
 
     @Override

diff --git a/...-core/plutoruntime/src/main/java/org/plutoengine/resource/filesystem/ResourceManager.java b/...-core/plutoruntime/src/main/java/org/plutoengine/resource/filesystem/ResourceManager.java
@@ -6,6 +6,7 @@
 import javax.annotation.concurrent.ThreadSafe;
 import java.io.Closeable;
 import java.io.IOException;
+import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.ProviderNotFoundException;
 import java.nio.file.spi.FileSystemProvider;
@@ -30,9 +31,7 @@ public static ResourceFileSystemProvider provider()
         {
             try
             {
-                var loader = ServiceLoader.load(FileSystemProvider.class, ResourceFileSystemProvider.class.getClassLoader());
-
-                for (FileSystemProvider provider : loader)
+                for (FileSystemProvider provider : FileSystemProvider.installedProviders())
                 {
                     if (provider.getScheme().equals(URI_SCHEME))
                     {