Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

enhance UpdateChecker to support alpha/beta versions and snapshots

Browse source
This commit is contained in:
D3v1s0m 2024-03-10 20:47:46 +05:30
parent 220e4a3f58
commit 57e11cb186
No known key found for this signature in database
GPG key ID: FA1F770C7B1D40C1
1 changed files with 42 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
plugin/src/main/java/lol/pyr/znpcsplus/updater/UpdateChecker.java
View file

@ -28,10 +28,7 @@ public class UpdateChecker extends BukkitRunnable {
if (resource == null) return; if (resource == null) return;
newestVersion = resource.getVersion(); newestVersion = resource.getVersion();
int current = versionToNumber(info.getVersion()); status = compareVersions(info.getVersion(), newestVersion);
int newest = versionToNumber(newestVersion);
status = current >= newest ? Status.LATEST_VERSION : Status.UPDATE_NEEDED;
if (status == Status.UPDATE_NEEDED) notifyConsole(); if (status == Status.UPDATE_NEEDED) notifyConsole();
} }
@ -40,10 +37,43 @@ public class UpdateChecker extends BukkitRunnable {
logger.warning("Download it at " + UpdateChecker.DOWNLOAD_LINK); logger.warning("Download it at " + UpdateChecker.DOWNLOAD_LINK);
} }
private int versionToNumber(String version) { private Status compareVersions(String currentVersion, String newVersion) {
int num = Integer.parseInt(version.replaceAll("[^0-9]", "")); if (currentVersion.equalsIgnoreCase(newVersion)) return Status.LATEST_VERSION;
if (version.toLowerCase().contains("snapshot")) num -= 1; ReleaseType currentType = parseReleaseType(currentVersion);
return num; ReleaseType newType = parseReleaseType(newVersion);
if (currentType == ReleaseType.UNKNOWN || newType == ReleaseType.UNKNOWN) return Status.UNKNOWN;
String currentVersionWithoutType = getVersionWithoutReleaseType(currentVersion);
String newVersionWithoutType = getVersionWithoutReleaseType(newVersion);
String[] currentParts = currentVersionWithoutType.split("\\.");
String[] newParts = newVersionWithoutType.split("\\.");
for (int i = 0; i < Math.min(currentParts.length, newParts.length); i++) {
int currentPart = Integer.parseInt(currentParts[i]);
int newPart = Integer.parseInt(newParts[i]);
if (newPart > currentPart) return Status.UPDATE_NEEDED;
}
if (newType.ordinal() > currentType.ordinal()) return Status.UPDATE_NEEDED;
if (newType == currentType) {
int currentReleaseTypeNumber = getReleaseTypeNumber(currentVersion);
int newReleaseTypeNumber = getReleaseTypeNumber(newVersion);
if (newReleaseTypeNumber > currentReleaseTypeNumber) return Status.UPDATE_NEEDED;
}
return Status.LATEST_VERSION;
}
private ReleaseType parseReleaseType(String version) {
if (version.toLowerCase().contains("snapshot")) return ReleaseType.SNAPSHOT;
if (version.toLowerCase().contains("alpha")) return ReleaseType.ALPHA;
if (version.toLowerCase().contains("beta")) return ReleaseType.BETA;
return version.matches("\\d+\\.\\d+\\.\\d+") ? ReleaseType.RELEASE : ReleaseType.UNKNOWN;
}
private String getVersionWithoutReleaseType(String version) {
return version.contains("-") ? version.split("-")[0] : version;
}
private int getReleaseTypeNumber(String version) {
if (!version.contains("-")) return 0;
return Integer.parseInt(version.split("-")[1].split("\\.")[1]);
} }
public Status getStatus() { public Status getStatus() {
@ -57,4 +87,8 @@ public class UpdateChecker extends BukkitRunnable {
public enum Status { public enum Status {
UNKNOWN, LATEST_VERSION, UPDATE_NEEDED UNKNOWN, LATEST_VERSION, UPDATE_NEEDED
} }
public enum ReleaseType {
UNKNOWN, SNAPSHOT, ALPHA, BETA, RELEASE
}
} }