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

Remove files correctly, redownload when deleted

Browse Source
This commit is contained in:
comp500 2019-07-02 23:32:00 +01:00
parent d1647764c4
commit 780efe2c9f
No known key found for this signature in database
GPG Key ID: 214C822FFEC586B5
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/link/infra/packwiz/installer/UpdateManager.java
View File

@ -7,10 +7,14 @@ import java.io.IOException;
import java.io.Writer; import java.io.Writer;
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.Paths; import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.CompletionService; import java.util.concurrent.CompletionService;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
@ -207,6 +211,31 @@ public class UpdateManager {
manifest.cachedFiles = new HashMap<URI, ManifestFile.File>(); manifest.cachedFiles = new HashMap<URI, ManifestFile.File>();
} }
ui.submitProgress(new InstallProgress("Checking local files..."));
List<URI> invalidatedUris = new ArrayList<>();
Iterator<Map.Entry<URI, ManifestFile.File>> it = manifest.cachedFiles.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<URI, ManifestFile.File> entry = it.next();
if (entry.getValue().cachedLocation != null) {
Path filePath = Paths.get(opts.packFolder, entry.getValue().cachedLocation);
URI fileUri = entry.getKey();
if (!indexFile.files.stream().anyMatch(f -> f.file.equals(fileUri))) {
// File has been removed from the index
try {
Files.deleteIfExists(filePath);
} catch (IOException e) {
// TODO: should this be shown to the user in some way?
e.printStackTrace();
}
it.remove();
} else if (!Files.exists(filePath)) {
invalidatedUris.add(fileUri);
}
}
}
ui.submitProgress(new InstallProgress("Comparing new files..."));
// TODO: progress bar // TODO: progress bar
ConcurrentLinkedQueue<Exception> exceptionQueue = new ConcurrentLinkedQueue<Exception>(); ConcurrentLinkedQueue<Exception> exceptionQueue = new ConcurrentLinkedQueue<Exception>();
List<IndexFile.File> newFiles = indexFile.files.stream().map(f -> { List<IndexFile.File> newFiles = indexFile.files.stream().map(f -> {
@ -215,6 +244,9 @@ public class UpdateManager {
} }
return f; return f;
}).filter(f -> { }).filter(f -> {
if (invalidatedUris.contains(f.file)) {
return true;
}
ManifestFile.File cachedFile = manifest.cachedFiles.get(f.file); ManifestFile.File cachedFile = manifest.cachedFiles.get(f.file);
Hash newHash; Hash newHash;
try { try {
@ -343,6 +375,7 @@ public class UpdateManager {
ret.err = e; ret.err = e;
} }
} }
newCachedFile.cachedLocation = ret.file.getDestURI().toString();
manifest.cachedFiles.put(ret.file.file, newCachedFile); manifest.cachedFiles.put(ret.file.file, newCachedFile);
} }
// TODO: show errors properly? // TODO: show errors properly?

1
src/main/java/link/infra/packwiz/installer/metadata/ManifestFile.java
View File

@ -16,5 +16,6 @@ public class ManifestFile {
public boolean isOptional = false; public boolean isOptional = false;
public boolean optionValue = true; public boolean optionValue = true;
public Hash linkedFileHash = null; public Hash linkedFileHash = null;
public String cachedLocation = null;
} }
} }