mirror of
https://github.com/packwiz/packwiz-installer.git
synced 2025-04-19 13:06:30 +02:00
Don't invalidate files that aren't on the current side
This commit is contained in:
parent
0cba5ba17b
commit
79a983bc2f
36
build.gradle
36
build.gradle
@ -50,21 +50,23 @@ task copyJar(type: Copy) {
|
||||
|
||||
build.dependsOn copyJar
|
||||
|
||||
githubRelease {
|
||||
// IntelliJ u ok?
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
owner "comp500"
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
repo "packwiz-installer"
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
tagName "${project.version}"
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
releaseName "Release ${project.version}"
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
draft true
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
token getProperty("github.token")
|
||||
releaseAssets = [jar.destinationDirectory.file("packwiz-installer.jar").get()]
|
||||
}
|
||||
if (project.hasProperty("github.token")) {
|
||||
githubRelease {
|
||||
// IntelliJ u ok?
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
owner "comp500"
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
repo "packwiz-installer"
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
tagName "${project.version}"
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
releaseName "Release ${project.version}"
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
draft true
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
token findProperty("github.token") ?: ""
|
||||
releaseAssets = [jar.destinationDirectory.file("packwiz-installer.jar").get()]
|
||||
}
|
||||
|
||||
tasks.githubRelease.dependsOn(build)
|
||||
tasks.githubRelease.dependsOn(build)
|
||||
}
|
@ -97,6 +97,7 @@ class DownloadTask implements IOptionDetails, IExceptionDetails {
|
||||
}
|
||||
}
|
||||
cachedFile.isOptional = isOptional();
|
||||
cachedFile.onlyOtherSide = !correctSide();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -153,6 +153,10 @@ public class UpdateManager {
|
||||
List<SpaceSafeURI> invalidatedUris = new ArrayList<>();
|
||||
if (manifest.cachedFiles != null) {
|
||||
for (Map.Entry<SpaceSafeURI, ManifestFile.File> entry : manifest.cachedFiles.entrySet()) {
|
||||
// ignore onlyOtherSide files
|
||||
if (entry.getValue().onlyOtherSide) {
|
||||
continue;
|
||||
}
|
||||
boolean invalid = false;
|
||||
// if isn't optional, or is optional but optionValue == true
|
||||
if (!entry.getValue().isOptional || entry.getValue().optionValue) {
|
||||
|
@ -0,0 +1,29 @@
|
||||
package link.infra.packwiz.installer.metadata;
|
||||
|
||||
import com.google.gson.TypeAdapter;
|
||||
import com.google.gson.stream.JsonReader;
|
||||
import com.google.gson.stream.JsonToken;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class EfficientBooleanAdapter extends TypeAdapter<Boolean> {
|
||||
|
||||
@Override
|
||||
public void write(JsonWriter out, Boolean value) throws IOException {
|
||||
if (value == null || !value) {
|
||||
out.nullValue();
|
||||
return;
|
||||
}
|
||||
out.value(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean read(JsonReader in) throws IOException {
|
||||
if (in.peek() == JsonToken.NULL) {
|
||||
in.nextNull();
|
||||
return false;
|
||||
}
|
||||
return in.nextBoolean();
|
||||
}
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
package link.infra.packwiz.installer.metadata;
|
||||
|
||||
import com.google.gson.annotations.JsonAdapter;
|
||||
import link.infra.packwiz.installer.UpdateManager;
|
||||
import link.infra.packwiz.installer.metadata.hash.Hash;
|
||||
|
||||
@ -19,9 +20,13 @@ public class ManifestFile {
|
||||
public Hash linkedFileHash = null;
|
||||
public String cachedLocation = null;
|
||||
|
||||
@JsonAdapter(EfficientBooleanAdapter.class)
|
||||
public boolean isOptional = false;
|
||||
public boolean optionValue = true;
|
||||
|
||||
@JsonAdapter(EfficientBooleanAdapter.class)
|
||||
public boolean onlyOtherSide = false;
|
||||
|
||||
// When an error occurs, the state needs to be reverted. To do this, I have a crude revert system.
|
||||
public void backup() {
|
||||
revert = new File();
|
||||
@ -30,6 +35,7 @@ public class ManifestFile {
|
||||
revert.cachedLocation = cachedLocation;
|
||||
revert.isOptional = isOptional;
|
||||
revert.optionValue = optionValue;
|
||||
revert.onlyOtherSide = onlyOtherSide;
|
||||
}
|
||||
|
||||
public File getRevert() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user