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

Use artifact name when auto-updating plugin

Browse source
This commit is contained in:
Frank van der Heijden 2020-07-11 12:20:51 +02:00
parent c82364b7ae
commit e27e9fb4ea
No known key found for this signature in database
GPG key ID: 26DA56488D314D11
1 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ public class UpdateCheckerTask implements Runnable {
String githubVersion = getVersion(jsonObject); String githubVersion = getVersion(jsonObject);
String body = jsonObject.getAsJsonPrimitive("body").getAsString(); String body = jsonObject.getAsJsonPrimitive("body").getAsString();
String downloadUrl = getDownloadUrl(jsonObject); GitHubAsset asset = getAsset(jsonObject);
String downloaded = versionManager.getDownloadedVersion(); String downloaded = versionManager.getDownloadedVersion();
String current = versionManager.getCurrentVersion(); String current = versionManager.getCurrentVersion();
@ -106,16 +106,19 @@ public class UpdateCheckerTask implements Runnable {
plugin.getLogger().info(String.format(UPDATE_AVAILABLE, githubVersion)); plugin.getLogger().info(String.format(UPDATE_AVAILABLE, githubVersion));
plugin.getLogger().info("Release info: " + body); plugin.getLogger().info("Release info: " + body);
} }
if (canDownloadPlugin()) { if (canDownloadPlugin() && asset != null) {
if (isStartupCheck()) { if (isStartupCheck()) {
plugin.getLogger().info(String.format(DOWNLOAD_START, downloadUrl)); plugin.getLogger().info(String.format(DOWNLOAD_START, asset.downloadUrl));
} else { } else {
Messenger.sendMessage(sender, "serverutils.update.downloading", Messenger.sendMessage(sender, "serverutils.update.downloading",
"%old%", current, "%old%", current,
"%new%", githubVersion, "%new%", githubVersion,
"%info%", body); "%info%", body);
} }
downloadPlugin(githubVersion, downloadUrl);
File target = new File(plugin.getPluginManager().getPluginsFolder(), asset.name);
downloadPlugin(githubVersion, asset.downloadUrl, target);
plugin.getPluginManager().getPluginFile(ServerUtilsApp.getPlatformPlugin()).delete();
tryReloadPlugin(); tryReloadPlugin();
} else if (!isStartupCheck()) { } else if (!isStartupCheck()) {
Messenger.sendMessage(sender, "serverutils.update.available", Messenger.sendMessage(sender, "serverutils.update.available",
@ -135,10 +138,14 @@ public class UpdateCheckerTask implements Runnable {
return jsonObject.getAsJsonPrimitive("tag_name").getAsString().replace("v", ""); return jsonObject.getAsJsonPrimitive("tag_name").getAsString().replace("v", "");
} }
private String getDownloadUrl(JsonObject jsonObject) { private GitHubAsset getAsset(JsonObject jsonObject) {
JsonArray assets = jsonObject.getAsJsonArray("assets"); JsonArray assets = jsonObject.getAsJsonArray("assets");
if (assets != null && assets.size() > 0) { if (assets != null && assets.size() > 0) {
return assets.get(0).getAsJsonObject().getAsJsonPrimitive("browser_download_url").getAsString(); JsonObject assetJson = assets.get(0).getAsJsonObject();
return new GitHubAsset(
assetJson.get("name").getAsString(),
assetJson.get("browser_download_url").getAsString()
);
} }
return null; return null;
} }
@ -148,7 +155,7 @@ public class UpdateCheckerTask implements Runnable {
return config.getBoolean("settings.download-updates"); return config.getBoolean("settings.download-updates");
} }
private void downloadPlugin(String githubVersion, String downloadLink) { private void downloadPlugin(String githubVersion, String downloadLink, File target) {
if (versionManager.isDownloaded(githubVersion)) { if (versionManager.isDownloaded(githubVersion)) {
broadcastDownloadStatus(githubVersion, false); broadcastDownloadStatus(githubVersion, false);
return; return;
@ -159,9 +166,8 @@ public class UpdateCheckerTask implements Runnable {
return; return;
} }
File pluginFile = plugin.getPluginManager().getPluginFile(ServerUtilsApp.getPlatformPlugin());
try { try {
FileUtils.download(downloadLink, pluginFile); FileUtils.download(downloadLink, target);
} catch (IOException ex) { } catch (IOException ex) {
broadcastDownloadStatus(githubVersion, true); broadcastDownloadStatus(githubVersion, true);
throw new RuntimeException(DOWNLOAD_ERROR, ex); throw new RuntimeException(DOWNLOAD_ERROR, ex);
@ -188,4 +194,14 @@ public class UpdateCheckerTask implements Runnable {
String message = Messenger.getMessage(path,"%new%", githubVersion); String message = Messenger.getMessage(path,"%new%", githubVersion);
plugin.getChatProvider().broadcast("serverutils.notification.update", message); plugin.getChatProvider().broadcast("serverutils.notification.update", message);
} }
private static class GitHubAsset {
private final String name;
private final String downloadUrl;
public GitHubAsset(String name, String downloadUrl) {
this.name = name;
this.downloadUrl = downloadUrl;
}
}
} }