FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-03-23 21:40:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions3

Optimise file exists check in ModNioResourcePack ()

Browse source
This commit is contained in:
modmuss50 2022-06-19 19:18:40 +01:00
parent 0ca3bd2b78
commit 446e0595e8
1 changed files with 11 additions and 3 deletions

14
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
View file

@ -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);
}
}