Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-03 00:48:00 +02:00
Code Issues Projects Releases Wiki Activity

[#991] Fixed custom file path resolution

Browse Source
This commit is contained in:
Rsl1122 2019-04-06 16:29:25 +03:00
parent 0956cfa0ff
commit 05b320839b
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java
View File

@ -25,8 +25,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import java.io.File;
import java.io.IOException;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.nio.file.Path;
import java.util.Optional;
/**
@ -120,20 +119,17 @@ public class PlanFiles implements SubSystem {
private Optional<File> attemptToFind(String resourceName) {
if (dataFolder.exists() && dataFolder.isDirectory()) {
ArrayDeque<File> que = new ArrayDeque<>();
que.add(dataFolder);
while (!que.isEmpty()) {
File file = que.pop();
if (file.isFile() && resourceName.equals(file.getName())) {
return Optional.of(file);
}
if (file.isDirectory()) {
File[] files = file.listFiles();
if (files != null) {
que.addAll(Arrays.asList(files));
}
}
String[] path = resourceName.split("/");
Path toFile = dataFolder.getAbsoluteFile().toPath().toAbsolutePath();
for (String next : path) {
toFile = toFile.resolve(next);
}
File found = toFile.toFile();
if (found.exists()) {
return Optional.of(found);
}
}
return Optional.empty();