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

Correctly handle file invalidation

Browse Source
This commit is contained in:
comp500 2019-07-03 23:12:11 +01:00
parent 34a86ffb7d
commit a5ff63c587
No known key found for this signature in database
GPG Key ID: 214C822FFEC586B5
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,22 @@ public class UpdateManager {
return; return;
} }
if (manifest.packFileHash != null && packFileSource.hashIsEqual(manifest.packFileHash)) { 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) {
if (!Files.exists(Paths.get(opts.packFolder, entry.getValue().cachedLocation))) {
URI fileUri = entry.getKey();
System.out.println("File " + fileUri.toString() + " invalidated, marked for redownloading");
invalidatedUris.add(fileUri);
}
}
}
if (manifest.packFileHash != null && packFileSource.hashIsEqual(manifest.packFileHash) && invalidatedUris.size() == 0) {
System.out.println("Modpack is already up to date!"); System.out.println("Modpack is already up to date!");
// todo: --force? // todo: --force?
return; return;
@ -156,7 +171,7 @@ public class UpdateManager {
try { try {
processIndex(HandlerManager.getNewLoc(opts.downloadURI, pf.index.file), processIndex(HandlerManager.getNewLoc(opts.downloadURI, pf.index.file),
HashUtils.getHash(pf.index.hashFormat, pf.index.hash), pf.index.hashFormat, manifest); HashUtils.getHash(pf.index.hashFormat, pf.index.hash), pf.index.hashFormat, manifest, invalidatedUris);
} catch (Exception e1) { } catch (Exception e1) {
ui.handleExceptionAndExit(e1); ui.handleExceptionAndExit(e1);
} }
@ -177,8 +192,8 @@ public class UpdateManager {
// TODO: implement // TODO: implement
} }
protected void processIndex(URI indexUri, Hash indexHash, String hashFormat, ManifestFile manifest) { protected void processIndex(URI indexUri, Hash indexHash, String hashFormat, ManifestFile manifest, List<URI> invalidatedUris) {
if (manifest.indexFileHash != null && manifest.indexFileHash.equals(indexHash)) { if (manifest.indexFileHash != null && manifest.indexFileHash.equals(indexHash) && invalidatedUris.size() == 0) {
System.out.println("Modpack files are already up to date!"); System.out.println("Modpack files are already up to date!");
return; return;
} }
@ -212,26 +227,19 @@ public class UpdateManager {
} }
ui.submitProgress(new InstallProgress("Checking local files...")); ui.submitProgress(new InstallProgress("Checking local files..."));
List<URI> invalidatedUris = new ArrayList<>();
Iterator<Map.Entry<URI, ManifestFile.File>> it = manifest.cachedFiles.entrySet().iterator(); Iterator<Map.Entry<URI, ManifestFile.File>> it = manifest.cachedFiles.entrySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry<URI, ManifestFile.File> entry = it.next(); Map.Entry<URI, ManifestFile.File> entry = it.next();
if (entry.getValue().cachedLocation != null) { if (entry.getValue().cachedLocation != null) {
Path filePath = Paths.get(opts.packFolder, entry.getValue().cachedLocation); if (!indexFile.files.stream().anyMatch(f -> f.file.equals(entry.getKey()))) {
URI fileUri = entry.getKey();
if (!indexFile.files.stream().anyMatch(f -> f.file.equals(fileUri))) {
// File has been removed from the index // File has been removed from the index
try { try {
Files.deleteIfExists(filePath); Files.deleteIfExists(Paths.get(opts.packFolder, entry.getValue().cachedLocation));
} catch (IOException e) { } catch (IOException e) {
// TODO: should this be shown to the user in some way? // TODO: should this be shown to the user in some way?
e.printStackTrace(); e.printStackTrace();
} }
it.remove(); it.remove();
} else if (!Files.exists(filePath)) {
System.out.println("File " + fileUri.toString() + " invalidated, marked for redownloading");
invalidatedUris.add(fileUri);
} }
} }
} }