Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-27 21:26:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix a false positive with the updater

Browse Source
This commit is contained in:
Dan Mulloy 2016-05-16 17:43:58 -04:00
parent 4330bae47f
commit 869b457810
2 changed files with 373 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/Updater.java
View File

@ -57,43 +57,52 @@ public abstract class Updater {
}
public boolean versionCheck(String title) {
if (this.type != UpdateType.NO_VERSION_CHECK) {
String version = this.plugin.getDescription().getVersion();
if (this.type != UpdateType.NO_VERSION_CHECK) {
String version = this.plugin.getDescription().getVersion();
boolean devBuild = false;
if (version.contains("-SNAPSHOT") || version.contains("-BETA")) {
devBuild = true;
version = version.substring(0, version.indexOf("-"));
}
// Extract the version from the response
String[] split = title.split(" ");
String remote = "Unknown";
final String[] splitTitle = title.split(" ");
String remoteVersion;
if (splitTitle.length == 2) {
remoteVersion = splitTitle[1].split("-")[0];
} else if (this instanceof SpigotUpdater) {
remoteVersion = splitTitle[0];
} else {
if (split.length == 2) { // BukkitDev
remote = split[1];
} else if (this instanceof SpigotUpdater) { // Spigot resource
remote = split[0];
} else { // Misconfigured
// The file's name did not contain the string 'vVersion'
final String authorInfo = this.plugin.getDescription().getAuthors().size() == 0 ? "" : " (" + this.plugin.getDescription().getAuthors().get(0) + ")";
this.plugin.getLogger().warning("The author of this plugin " + authorInfo + " has misconfigured their Auto Update system");
this.plugin.getLogger().warning("File versions should follow the format 'PluginName VERSION[-SNAPSHOT]'");
this.plugin.getLogger().warning("Please notify the author of this error.");
String authorInfo = this.plugin.getDescription().getAuthors().size() == 0 ? "" : " (" + this.plugin.getDescription().getAuthors().get(0) + ")";
plugin.getLogger().warning("The author of this plugin " + authorInfo + " has misconfigured their Auto Update system");
plugin.getLogger().warning("File versions should follow the format 'PluginName VERSION[-SNAPSHOT]'");
plugin.getLogger().warning("Please notify the author of this error.");
this.result = BukkitUpdater.UpdateResult.FAIL_NOVERSION;
return false;
}
// Parse the version
if (remoteVersion.startsWith("v")) {
remoteVersion = remoteVersion.substring(1);
}
// Check if the local version is a dev build
MinecraftVersion parsedRemote = new MinecraftVersion(remoteVersion);
MinecraftVersion parsedCurrent = new MinecraftVersion(plugin.getDescription().getVersion());
boolean devBuild = false;
if (version.contains("-SNAPSHOT") || version.contains("-BETA")) {
devBuild = true;
version = version.substring(0, version.indexOf("-"));
}
// Remove the v
if (remote.startsWith("v")) {
remote = remote.substring(1);
}
// Remove the build number if it snuck in there
if (version.contains("-b")) {
version = version.substring(0, version.lastIndexOf("-"));
}
// Parse it and our local version
MinecraftVersion parsedRemote = new MinecraftVersion(remote);
MinecraftVersion parsedCurrent = new MinecraftVersion(version);
if (devBuild && parsedRemote.equals(parsedCurrent)) {
// They're using a dev build and this version has been released
return !remoteVersion.contains("-BETA") && !remoteVersion.contains("-SNAPSHOT");
return !remote.contains("-BETA") && !remote.contains("-SNAPSHOT");
}
// The remote version has to be greater
@ -103,6 +112,7 @@ public abstract class Updater {
return false;
}
}
return true;
}

2
modules/ProtocolLib/src/test/java/com/comphenix/protocol/updater/UpdaterTest.java
View File

@ -30,7 +30,7 @@ public class UpdaterTest {
plugin = mock(Plugin.class);
String version = System.getProperty("projectVersion");
if (version == null) version = "3.7.0-BETA";
if (version == null) version = "4.0.1-SNAPSHOT-b281";
when(plugin.getDescription()).thenReturn(new PluginDescriptionFile("ProtocolLib", version, null));
when(plugin.getLogger()).thenReturn(Logger.getLogger("ProtocolLib"));
when(plugin.getDataFolder()).thenReturn(null);