AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bugs in ArbitraryDataFile, introduced when switching to the new temporary path.

Browse Source
This commit is contained in:
CalDescent 2021-08-14 18:10:59 +01:00
parent c50a11e58a
commit cfba793fcf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java
View File

@ -264,16 +264,16 @@ public class ArbitraryDataFile {
// Create temporary path for joined file // Create temporary path for joined file
// Use the user-specified temp dir, as it is deterministic, and is more likely to be located on reusable storage hardware // Use the user-specified temp dir, as it is deterministic, and is more likely to be located on reusable storage hardware
String baseDir = Settings.getInstance().getTempDataPath(); String baseDir = Settings.getInstance().getTempDataPath();
Path tempDir = Paths.get(baseDir, "join", this.chunks.get(0).digest58()); Path tempDir = Paths.get(baseDir, "join");
try { try {
Files.createDirectories(tempDir); Files.createDirectories(tempDir);
} catch (IOException e) { } catch (IOException e) {
return false; return false;
} }
this.filePath = tempDir.toString();
// Join the chunks // Join the chunks
File outputFile = new File(this.filePath); Path outputPath = Paths.get(tempDir.toString(), this.chunks.get(0).digest58());
File outputFile = new File(outputPath.toString());
try (BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(outputFile))) { try (BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(outputFile))) {
for (ArbitraryDataFileChunk chunk : this.chunks) { for (ArbitraryDataFileChunk chunk : this.chunks) {
File sourceFile = new File(chunk.filePath); File sourceFile = new File(chunk.filePath);
@ -288,9 +288,9 @@ public class ArbitraryDataFile {
out.close(); out.close();
// Copy temporary file to data directory // Copy temporary file to data directory
this.filePath = this.copyToDataDirectory(tempDir); this.filePath = this.copyToDataDirectory(outputPath);
if (FilesystemUtils.pathInsideDataOrTempPath(tempDir)) { if (FilesystemUtils.pathInsideDataOrTempPath(outputPath)) {
Files.delete(tempDir); Files.delete(outputPath);
} }
return true; return true;