From 446e0595e826b0f2bb4295908d9665b2e1041959 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Sun, 19 Jun 2022 19:18:40 +0100
Subject: [PATCH] Optimise file exists check in ModNioResourcePack (#2339)
---
.../impl/resource/loader/ModNioResourcePack.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
index 321a782f1..97ffbb161 100644
--- a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
+++ b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
@@ -20,6 +20,8 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.DirectoryStream;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -52,6 +54,7 @@ import net.fabricmc.loader.api.metadata.ModMetadata;
public class ModNioResourcePack extends AbstractFileResourcePack implements ModResourcePack {
private static final Logger LOGGER = LoggerFactory.getLogger(ModNioResourcePack.class);
private static final Pattern RESOURCE_PACK_PATH = Pattern.compile("[a-z0-9-_.]+");
+ private static final FileSystem DEFAULT_FS = FileSystems.getDefault();
private final String name;
private final ModMetadata modInfo;
@@ -74,7 +77,7 @@ public class ModNioResourcePack extends AbstractFileResourcePack implements ModR
path = path.toAbsolutePath().normalize();
Path childPath = path.resolve(subPath.replace("/", path.getFileSystem().getSeparator())).normalize();
- if (!childPath.startsWith(path) || !Files.exists(childPath)) {
+ if (!childPath.startsWith(path) || !exists(childPath)) {
continue;
}
@@ -147,7 +150,7 @@ public class ModNioResourcePack extends AbstractFileResourcePack implements ModR
for (Path basePath : basePaths) {
Path childPath = basePath.resolve(filename.replace("/", basePath.getFileSystem().getSeparator())).toAbsolutePath().normalize();
- if (childPath.startsWith(basePath) && Files.exists(childPath)) {
+ if (childPath.startsWith(basePath) && exists(childPath)) {
return childPath;
}
}
@@ -220,7 +223,7 @@ public class ModNioResourcePack extends AbstractFileResourcePack implements ModR
String separator = basePath.getFileSystem().getSeparator();
Path nsPath = basePath.resolve(type.getDirectory()).resolve(namespace);
Path searchPath = nsPath.resolve(path.replace("/", separator)).normalize();
- if (!Files.exists(searchPath)) continue;
+ if (!exists(searchPath)) continue;
try {
Files.walkFileTree(searchPath, new SimpleFileVisitor<Path>() {
@@ -277,4 +280,9 @@ public class ModNioResourcePack extends AbstractFileResourcePack implements ModR
public String getName() {
return name;
}
+
+ private static boolean exists(Path path) {
+ // NIO Files.exists is notoriously slow when checking the file system
+ return path.getFileSystem() == DEFAULT_FS ? path.toFile().exists() : Files.exists(path);
+ }
}