upstream/FalsePatternLib
2
0 Fork 0
mirror of https://github.com/FalsePattern/FalsePatternLib.git synced 2026-11-11 23:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up update checker code

Browse Source
This commit is contained in:
FalsePattern committed 2023-07-16 12:31:04 +02:00
1 parent b3c988c2d4
commit 2404b2eb3f
4 files changed
+147 -132
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/falsepattern/lib/internal/impl/updates/UpdateCheckerImpl.java
+115 -114
View File
@@ -49,6 +49,64 @@ import java.util.concurrent.CompletionException;
import java.util.concurrent.atomic.AtomicReference;
public final class UpdateCheckerImpl {
public static CompletableFuture<List<ModUpdateInfo>> fetchUpdatesAsyncV2(String url) {
return CompletableFuture.supplyAsync(() -> {
try {
return fetchUpdatesV2(url);
} catch (UpdateCheckException e) {
throw new RuntimeException(e);
}
});
}
public static List<ModUpdateInfo> fetchUpdatesV2(String url) throws UpdateCheckException {
try {
val modList = fetchRootListShared(url);
val result = new ArrayList<ModUpdateInfo>();
val installedMods = Loader.instance().getIndexedModList();
for (val node : modList) {
if (!node.isJsonObject()) {
continue;
}
val obj = node.getAsJsonObject();
if (!obj.has("modid")) {
continue;
}
if (!obj.has("versions")) {
continue;
}
val modid = obj.get("modid").getAsString();
if (!installedMods.containsKey(modid)) {
continue;
}
val mod = installedMods.get(modid);
var versions = obj.get("versions");
if (!versions.isJsonArray()) {
if (!versions.isJsonObject()) {
continue;
}
val ver = versions.getAsJsonObject();
versions = new JsonArray();
versions.getAsJsonArray().add(ver);
}
val parsedVersions = parseVersionSpecs(versions.getAsJsonArray()).join();
val latestVersions = new ArrayList<String>();
for (val version : parsedVersions) {
val versionObj = version.getAsJsonObject();
latestVersions.add(versionObj.get("version").getAsString());
}
val currentVersion = mod.getVersion();
if (latestVersions.contains(currentVersion)) {
continue;
}
val latest = parsedVersions.get(0).getAsJsonObject();
result.add(new ModUpdateInfo(modid, currentVersion, latest.get("version").getAsString(), latest.get("url").getAsString()));
}
return result;
} catch (Exception e) {
throw new UpdateCheckException("Failed to check for updates!", e);
}
}
public static List<IChatComponent> updateListToChatMessages(String initiator, List<ModUpdateInfo> updates) {
if (updates == null || updates.size() == 0) {
return null;
@@ -112,118 +170,6 @@ public final class UpdateCheckerImpl {
return modList;
}
public static CompletableFuture<List<ModUpdateInfo>> fetchUpdatesAsync(String url) {
return CompletableFuture.supplyAsync(() -> {
val modList = fetchRootListShared(url);
val result = new ArrayList<ModUpdateInfo>();
val installedMods = Loader.instance().getIndexedModList();
for (val node : modList) {
if (!node.isJsonObject()) {
continue;
}
val obj = node.getAsJsonObject();
if (!obj.has("modid")) {
continue;
}
if (!obj.has("latestVersion")) {
continue;
}
val modid = obj.get("modid").getAsString();
if (!installedMods.containsKey(modid)) {
continue;
}
val mod = installedMods.get(modid);
val latestVersionsNode = obj.get("latestVersion");
List<String> latestVersions;
if (latestVersionsNode.isJsonPrimitive() && (latestVersionsNode.getAsJsonPrimitive().isString())) {
latestVersions = Collections.singletonList(latestVersionsNode.getAsString());
} else if (latestVersionsNode.isJsonArray()) {
latestVersions = new ArrayList<>();
for (val version : latestVersionsNode.getAsJsonArray()) {
if (!version.isJsonPrimitive() || !version.getAsJsonPrimitive().isString()) {
continue;
}
latestVersions.add(version.getAsString());
}
} else {
continue;
}
val currentVersion = mod.getVersion();
if (latestVersions.contains(currentVersion)) {
continue;
}
val updateURL = obj.has("updateURL") &&
obj.get("updateURL").isJsonPrimitive() &&
obj.get("updateURL").getAsJsonPrimitive().isString()
? obj.get("updateURL").getAsString()
: "";
result.add(new ModUpdateInfo(modid, currentVersion, latestVersions.get(0), updateURL));
}
return result;
});
}
public static List<ModUpdateInfo> fetchUpdates(String url) throws UpdateCheckException {
try {
return fetchUpdatesAsync(url).join();
} catch (CompletionException e) {
try {
throw e.getCause();
} catch (UpdateCheckException e1) {
throw e1;
} catch (Throwable e1) {
throw new UpdateCheckException("Failed to check for updates!", e1);
}
}
}
public static CompletableFuture<List<ModUpdateInfo>> fetchUpdatesAsyncV2(String url) {
return CompletableFuture.supplyAsync(() -> {
val modList = fetchRootListShared(url);
val result = new ArrayList<ModUpdateInfo>();
val installedMods = Loader.instance().getIndexedModList();
for (val node : modList) {
if (!node.isJsonObject()) {
continue;
}
val obj = node.getAsJsonObject();
if (!obj.has("modid")) {
continue;
}
if (!obj.has("versions")) {
continue;
}
val modid = obj.get("modid").getAsString();
if (!installedMods.containsKey(modid)) {
continue;
}
val mod = installedMods.get(modid);
var versions = obj.get("versions");
if (!versions.isJsonArray()) {
if (!versions.isJsonObject()) {
continue;
}
val ver = versions.getAsJsonObject();
versions = new JsonArray();
versions.getAsJsonArray().add(ver);
}
val parsedVersions = parseVersionSpecs(versions.getAsJsonArray()).join();
val latestVersions = new ArrayList<String>();
for (val version : parsedVersions) {
val versionObj = version.getAsJsonObject();
latestVersions.add(versionObj.get("version").getAsString());
}
val currentVersion = mod.getVersion();
if (latestVersions.contains(currentVersion)) {
continue;
}
val latest = parsedVersions.get(0).getAsJsonObject();
result.add(new ModUpdateInfo(modid, currentVersion, latest.get("version").getAsString(), latest.get("url").getAsString()));
}
return result;
});
}
private static String getString(JsonObject object, String entry) {
if (!object.has(entry)) {
return null;
@@ -318,9 +264,63 @@ public final class UpdateCheckerImpl {
return result;
}
public static List<ModUpdateInfo> fetchUpdatesV2(String url) throws UpdateCheckException {
//region deprecated
@Deprecated
public static CompletableFuture<List<ModUpdateInfo>> fetchUpdatesAsync(String url) {
return CompletableFuture.supplyAsync(() -> {
val modList = fetchRootListShared(url);
val result = new ArrayList<ModUpdateInfo>();
val installedMods = Loader.instance().getIndexedModList();
for (val node : modList) {
if (!node.isJsonObject()) {
continue;
}
val obj = node.getAsJsonObject();
if (!obj.has("modid")) {
continue;
}
if (!obj.has("latestVersion")) {
continue;
}
val modid = obj.get("modid").getAsString();
if (!installedMods.containsKey(modid)) {
continue;
}
val mod = installedMods.get(modid);
val latestVersionsNode = obj.get("latestVersion");
List<String> latestVersions;
if (latestVersionsNode.isJsonPrimitive() && (latestVersionsNode.getAsJsonPrimitive().isString())) {
latestVersions = Collections.singletonList(latestVersionsNode.getAsString());
} else if (latestVersionsNode.isJsonArray()) {
latestVersions = new ArrayList<>();
for (val version : latestVersionsNode.getAsJsonArray()) {
if (!version.isJsonPrimitive() || !version.getAsJsonPrimitive().isString()) {
continue;
}
latestVersions.add(version.getAsString());
}
} else {
continue;
}
val currentVersion = mod.getVersion();
if (latestVersions.contains(currentVersion)) {
continue;
}
val updateURL = obj.has("updateURL") &&
obj.get("updateURL").isJsonPrimitive() &&
obj.get("updateURL").getAsJsonPrimitive().isString()
? obj.get("updateURL").getAsString()
: "";
result.add(new ModUpdateInfo(modid, currentVersion, latestVersions.get(0), updateURL));
}
return result;
});
}
@Deprecated
public static List<ModUpdateInfo> fetchUpdates(String url) throws UpdateCheckException {
try {
return fetchUpdatesAsyncV2(url).join();
return fetchUpdatesAsync(url).join();
} catch (CompletionException e) {
try {
throw e.getCause();
@@ -331,4 +331,5 @@ public final class UpdateCheckerImpl {
}
}
}
//endregion
}
src/main/java/com/falsepattern/lib/updates/ModUpdateInfo.java
+3
View File
@@ -25,6 +25,9 @@ import lombok.Data;
import lombok.NonNull;
import org.apache.logging.log4j.Logger;
/**
* Information about a new version of a mod.
*/
@Data
@StableAPI(since = "0.8.0")
public class ModUpdateInfo {
src/main/java/com/falsepattern/lib/updates/UpdateCheckException.java
+4
View File
@@ -22,6 +22,10 @@ package com.falsepattern.lib.updates;
import com.falsepattern.lib.StableAPI;
/**
* Exception only thrown by methods of {@link UpdateChecker}.
* Please don't throw this in your own code, only catch/handle it.
*/
@StableAPI(since = "0.8.3")
public class UpdateCheckException extends Exception {
@StableAPI.Internal
src/main/java/com/falsepattern/lib/updates/UpdateChecker.java
+25 -18
View File
@@ -20,6 +20,7 @@
*/
package com.falsepattern.lib.updates;
import com.falsepattern.lib.DeprecationDetails;
import com.falsepattern.lib.StableAPI;
import com.falsepattern.lib.internal.impl.updates.UpdateCheckerImpl;
@@ -30,15 +31,6 @@ import java.util.concurrent.CompletableFuture;
@StableAPI(since = "0.8.0")
public final class UpdateChecker {
/**
* DEPRECATED: Use the V2 API instead. This is kept for backwards compatibility.
*/
@StableAPI.Expose
@Deprecated
public static CompletableFuture<List<ModUpdateInfo>> fetchUpdatesAsync(String url) {
return UpdateCheckerImpl.fetchUpdatesAsync(url);
}
/**
* Checks for updates. The URL should be a JSON file that contains a list of mods, each with a mod ID, and one or more
* versions. The JSON file must have the following format:
@@ -95,15 +87,6 @@ public final class UpdateChecker {
return UpdateCheckerImpl.fetchUpdatesAsyncV2(url);
}
/**
* DEPRECATED: Use the V2 API instead. This is kept for backwards compatibility.
*/
@StableAPI.Expose
@Deprecated
public static List<ModUpdateInfo> fetchUpdates(String url) throws UpdateCheckException {
return UpdateCheckerImpl.fetchUpdates(url);
}
/**
* Same this as {@link #fetchUpdatesAsyncV2(String)}, but returns the result in a blocking fashion.
*
@@ -130,4 +113,28 @@ public final class UpdateChecker {
public static List<IChatComponent> updateListToChatMessages(String initiator, List<ModUpdateInfo> updates) {
return UpdateCheckerImpl.updateListToChatMessages(initiator, updates);
}
//region deprecated
/**
* DEPRECATED: Use the V2 API instead. This is kept for backwards compatibility.
*/
@Deprecated
@DeprecationDetails(deprecatedSince = "0.11.0",
replacement = "fetchUpdatesV2")
@StableAPI.Expose
public static List<ModUpdateInfo> fetchUpdates(String url) throws UpdateCheckException {
return UpdateCheckerImpl.fetchUpdates(url);
}
/**
* DEPRECATED: Use the V2 API instead. This is kept for backwards compatibility.
*/
@StableAPI.Expose
@Deprecated
@DeprecationDetails(deprecatedSince = "0.11.0",
replacement = "fetchUpdatesAsyncV2")
public static CompletableFuture<List<ModUpdateInfo>> fetchUpdatesAsync(String url) {
return UpdateCheckerImpl.fetchUpdatesAsync(url);
}
//endregion
}