zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Adapt UpdateCheckerTask to download platform jar

Browse source
This commit is contained in:
Frank van der Heijden 2021-11-25 23:46:08 +01:00
parent 1ea8e24a1e
commit 35593efb0e
No known key found for this signature in database
GPG key ID: B808721C2DD5B5B8
2 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Common/src/main/java/net/frankheijden/serverutils/common/entities/http/GitHubAsset.java
View file

@ -1,7 +1,11 @@
package net.frankheijden.serverutils.common.entities.http; package net.frankheijden.serverutils.common.entities.http;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import java.util.Locale;
import java.util.function.Predicate;
import net.frankheijden.serverutils.common.entities.ServerUtilsPlugin;
public class GitHubAsset { public class GitHubAsset {
@ -17,13 +21,30 @@ public class GitHubAsset {
* Creates a new GitHubAsset from given release url. * Creates a new GitHubAsset from given release url.
*/ */
public static GitHubAsset from(JsonObject jsonObject) { public static GitHubAsset from(JsonObject jsonObject) {
return from(jsonObject, name -> true);
}
/**
* Creates a new GitHubAsset for given platfrom from given release url.
*/
public static GitHubAsset from(JsonObject jsonObject, ServerUtilsPlugin.Platform platform) {
return from(jsonObject, name -> name.toUpperCase(Locale.ENGLISH).contains(platform.name()));
}
/**
* Creates a new GitHubAsset from given release url.
*/
public static GitHubAsset from(JsonObject jsonObject, Predicate<String> namePredicate) {
JsonArray assets = jsonObject.getAsJsonArray("assets"); JsonArray assets = jsonObject.getAsJsonArray("assets");
if (assets != null && assets.size() > 0) { if (assets != null) {
JsonObject assetJson = assets.get(0).getAsJsonObject(); for (JsonElement asset : assets) {
return new GitHubAsset( JsonObject assetJson = asset.getAsJsonObject();
assetJson.get("name").getAsString(),
assetJson.get("browser_download_url").getAsString() String name = assetJson.get("name").getAsString();
); if (namePredicate.test(name)) {
return new GitHubAsset(name, assetJson.get("browser_download_url").getAsString());
}
}
} }
return null; return null;
} }

2
Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java
View file

@ -128,7 +128,7 @@ public class UpdateCheckerTask<U extends ServerUtilsPlugin<P, ?, ?, ?, ?>, P> im
plugin.getLogger().log(Level.INFO, UPDATE_AVAILABLE, githubVersion); plugin.getLogger().log(Level.INFO, UPDATE_AVAILABLE, githubVersion);
plugin.getLogger().log(Level.INFO, RELEASE_INFO, body); plugin.getLogger().log(Level.INFO, RELEASE_INFO, body);
GitHubAsset pluginAsset = GitHubAsset.from(pluginJson); GitHubAsset pluginAsset = GitHubAsset.from(pluginJson, plugin.getPlatform());
if (!download || pluginAsset == null) { if (!download || pluginAsset == null) {
if (sender.isPlayer()) { if (sender.isPlayer()) {
Component component = plugin.getMessagesResource().get(MessageKey.UPDATE_AVAILABLE).toComponent( Component component = plugin.getMessagesResource().get(MessageKey.UPDATE_AVAILABLE).toComponent(