Fixed recently introduced bugs with file management.

This commit is contained in:
CalDescent 2021-07-03 18:05:17 +01:00
parent 56da7deb4c
commit e46c735efa

View File

@ -145,7 +145,7 @@ public class DataFile {
throw new IllegalStateException("Unable to create data subdirectory"); throw new IllegalStateException("Unable to create data subdirectory");
} }
} }
return outputDirectory + base58Digest; return outputDirectory + File.separator + base58Digest;
} }
public ValidationResult isValid() { public ValidationResult isValid() {
@ -273,7 +273,7 @@ public class DataFile {
Path path = Paths.get(this.filePath); Path path = Paths.get(this.filePath);
String dataPath = Settings.getInstance().getDataPath(); String dataPath = Settings.getInstance().getDataPath();
Path dataDirectory = Paths.get(dataPath); Path dataDirectory = Paths.get(dataPath);
if (!path.toAbsolutePath().startsWith(dataDirectory)) { if (!path.toAbsolutePath().startsWith(dataDirectory.toAbsolutePath())) {
return false; return false;
} }