mirrors/packwiz-installer
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz-installer.git synced 2025-04-19 21:16:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure files are removed when they need to be

Browse Source
This commit is contained in:
comp500 2019-08-10 19:43:41 +01:00
parent e6637b9af8
commit 02b50be782
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/link/infra/packwiz/installer/DownloadTask.java
View File

@ -10,6 +10,7 @@ import okio.Buffer;
import okio.Okio; import okio.Okio;
import okio.Source; import okio.Source;
import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -101,8 +102,21 @@ class DownloadTask implements IOptionDetails {
public void download(String packFolder, URI indexUri) { public void download(String packFolder, URI indexUri) {
if (failure != null) return; if (failure != null) return;
// Ensure it is removed
if (!cachedFile.optionValue || !correctSide()) {
if (cachedFile.cachedLocation == null) return;
try {
Files.deleteIfExists(Paths.get(packFolder, cachedFile.cachedLocation));
} catch (IOException e) {
// TODO: how much of a problem is this? use log4j/other log library to show warning?
e.printStackTrace();
}
cachedFile.cachedLocation = null;
return;
}
if (alreadyUpToDate) return; if (alreadyUpToDate) return;
if (!correctSide()) return;
Path destPath = Paths.get(packFolder, metadata.getDestURI().toString()); Path destPath = Paths.get(packFolder, metadata.getDestURI().toString());
@ -198,7 +212,7 @@ class DownloadTask implements IOptionDetails {
@Override @Override
public boolean getOptionValue() { public boolean getOptionValue() {
return this.cachedFile.optionValue; return cachedFile.optionValue;
} }
@Override @Override
@ -210,12 +224,11 @@ class DownloadTask implements IOptionDetails {
} }
public void setOptionValue(boolean value) { public void setOptionValue(boolean value) {
// TODO: if this is false, ensure the file is deleted in the actual download stage (regardless of alreadyUpToDate?) if (value && !cachedFile.optionValue) {
if (value && !this.cachedFile.optionValue) { // Ensure that an update is done if it changes from false to true, or from true to false
// Ensure that an update is done if it changes from false to true
alreadyUpToDate = false; alreadyUpToDate = false;
} }
this.cachedFile.optionValue = value; cachedFile.optionValue = value;
} }
public static List<DownloadTask> createTasksFromIndex(IndexFile index, String defaultFormat, UpdateManager.Options.Side downloadSide) { public static List<DownloadTask> createTasksFromIndex(IndexFile index, String defaultFormat, UpdateManager.Options.Side downloadSide) {