Commit 7c899ce1 authored by xtaodada's avatar xtaodada Committed by Melledy
Browse files

Fix dataloader not getting path correctly

parent d1775b13
...@@ -9,7 +9,6 @@ import java.net.URI; ...@@ -9,7 +9,6 @@ import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.*; import java.nio.file.*;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -77,19 +76,18 @@ public final class FileUtils { ...@@ -77,19 +76,18 @@ public final class FileUtils {
} }
// From https://mkyong.com/java/java-read-a-file-from-resources-folder/ // From https://mkyong.com/java/java-read-a-file-from-resources-folder/
public static List<Path> getPathsFromResource(String folder) throws URISyntaxException, IOException { public static List<Path> getPathsFromResource(String folder) throws URISyntaxException {
List<Path> result = null; List<Path> result = null;
// Get path of the current running JAR // Get pathUri of the current running JAR
String jarPath = Grasscutter.class.getProtectionDomain() URI pathUri = Grasscutter.class.getProtectionDomain()
.getCodeSource() .getCodeSource()
.getLocation() .getLocation()
.toURI() .toURI();
.getPath();
try { try {
// file walks JAR // file walks JAR
URI uri = URI.create("jar:file:" + jarPath); URI uri = URI.create("jar:file:" + pathUri.getRawPath());
try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) { try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
result = Files.walk(fs.getPath(folder)) result = Files.walk(fs.getPath(folder))
.filter(Files::isRegularFile) .filter(Files::isRegularFile)
...@@ -105,7 +103,7 @@ public final class FileUtils { ...@@ -105,7 +103,7 @@ public final class FileUtils {
result = Arrays.stream(f.listFiles()).map(File::toPath).toList(); result = Arrays.stream(f.listFiles()).map(File::toPath).toList();
} }
return result; return result;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment