diff --git a/changelog.txt b/changelog.txt
index e075adf..0a4bf0c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -19,6 +19,7 @@
* Fixed an issue where 'random' data would not parse properly in preset_groups.yml
* Fixed an issue where preset groups would not display in the GUI even if the player has permission for them
* Fixed GUI icons displaying incorrectly in 1.9
+* Changed the plugin update detecter to query Spigot instead of Curse
* Cleaned up duplicated command parsing
* Refactored and cleaned up code
* Changed the package names
diff --git a/src/main/java/dev/esophose/playerparticles/manager/PluginUpdateManager.java b/src/main/java/dev/esophose/playerparticles/manager/PluginUpdateManager.java
index fa536ad..81d6d7c 100644
--- a/src/main/java/dev/esophose/playerparticles/manager/PluginUpdateManager.java
+++ b/src/main/java/dev/esophose/playerparticles/manager/PluginUpdateManager.java
@@ -3,7 +3,12 @@ package dev.esophose.playerparticles.manager;
import dev.esophose.playerparticles.PlayerParticles;
import dev.esophose.playerparticles.manager.ConfigurationManager.Setting;
import dev.esophose.playerparticles.util.StringPlaceholders;
-import dev.esophose.playerparticles.util.Updater;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.regex.Pattern;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -23,14 +28,16 @@ public class PluginUpdateManager extends Manager implements Listener {
public void reload() {
if (Setting.CHECK_UPDATES.getBoolean()) {
Bukkit.getScheduler().runTaskAsynchronously(this.playerParticles, () -> {
- try { // This can throw an exception if the server has no internet connection or if the Curse API is down
- Updater updater = new Updater(this.playerParticles, 82823, this.playerParticles.getJarFile(), Updater.UpdateType.NO_DOWNLOAD, false);
- if (Double.parseDouble(updater.getLatestName().replaceAll("PlayerParticles v", "")) > Double.parseDouble(this.playerParticles.getDescription().getVersion())) {
- this.updateVersion = updater.getLatestName().replaceAll("PlayerParticles v", "");
- this.playerParticles.getLogger().info("An update (v" + this.updateVersion + ") is available! You are running v" + this.playerParticles.getDescription().getVersion());
+ try {
+ String latestVersion = this.getLatestVersion();
+ String currentVersion = this.playerParticles.getDescription().getVersion();
+
+ if (this.isUpdateAvailable(latestVersion, currentVersion)) {
+ this.updateVersion = latestVersion;
+ this.playerParticles.getLogger().info("An update (v" + this.updateVersion + ") is available! You are running v" + currentVersion);
}
} catch (Exception e) {
- this.playerParticles.getLogger().warning("An error occurred checking for an update. There is either no established internet connection or the Curse API is down.");
+ this.playerParticles.getLogger().warning("An error occurred checking for an update. There is either no established internet connection or the Spigot API is down.");
}
});
}
@@ -41,6 +48,46 @@ public class PluginUpdateManager extends Manager implements Listener {
}
+ /**
+ * Checks if there is an update available
+ *
+ * @param latest The latest version of the plugin from Spigot
+ * @param current The currently installed version of the plugin
+ * @return true if available, otherwise false
+ */
+ private boolean isUpdateAvailable(String latest, String current) {
+ // Break versions into individual numerical pieces separated by periods
+ int[] latestSplit = Arrays.stream(latest.replaceAll("[^0-9.]", "").split(Pattern.quote("."))).mapToInt(Integer::parseInt).toArray();
+ int[] currentSplit = Arrays.stream(current.replaceAll("[^0-9.]", "").split(Pattern.quote("."))).mapToInt(Integer::parseInt).toArray();
+
+ // Make sure both arrays are the same length
+ if (latestSplit.length > currentSplit.length) {
+ currentSplit = Arrays.copyOf(currentSplit, latestSplit.length);
+ } else if (currentSplit.length > latestSplit.length) {
+ latestSplit = Arrays.copyOf(latestSplit, currentSplit.length);
+ }
+
+ // Compare pieces from most significant to least significant
+ for (int i = 0; i < latestSplit.length; i++)
+ if (latestSplit[i] > currentSplit[i])
+ return true;
+
+ return false;
+ }
+
+ /**
+ * Gets the latest version of the plugin from the Spigot Web API
+ *
+ * @return the latest version of the plugin from Spigot
+ * @throws IOException if a network error occurs
+ */
+ private String getLatestVersion() throws IOException {
+ URL spigot = new URL("https://api.spigotmc.org/legacy/update.php?resource=40261");
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(spigot.openStream()))) {
+ return reader.readLine();
+ }
+ }
+
/**
* Called when a player joins and notifies ops if an update is available
*
@@ -48,7 +95,7 @@ public class PluginUpdateManager extends Manager implements Listener {
*/
@EventHandler
public void onPlayerJoin(PlayerJoinEvent e) {
- if (e.getPlayer().isOp() && this.updateVersion != null) {
+ if (this.updateVersion != null && e.getPlayer().isOp()) {
PlayerParticles.getInstance().getManager(LocaleManager.class).sendMessage(
e.getPlayer(),
"update-available",
diff --git a/src/main/java/dev/esophose/playerparticles/util/Updater.java b/src/main/java/dev/esophose/playerparticles/util/Updater.java
deleted file mode 100644
index a1bfd55..0000000
--- a/src/main/java/dev/esophose/playerparticles/util/Updater.java
+++ /dev/null
@@ -1,796 +0,0 @@
-package dev.esophose.playerparticles.util;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Enumeration;
-import java.util.logging.Level;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitRunnable;
-
-/**
- * Check for updates on BukkitDev for a given plugin, and download the updates
- * if needed.
- *
- * VERY, VERY IMPORTANT: Because there are no standards for adding
- * auto-update toggles in your plugin's config, this system provides NO CHECK
- * WITH YOUR CONFIG to make sure the user has allowed auto-updating.
- * It is a BUKKIT POLICY that you include a boolean value in your config
- * that prevents the auto-updater from running AT ALL.
- * If you fail to include this option in your config, your plugin will be
- * REJECTED when you attempt to submit it to dev.bukkit.org.
- *
- * An example of a good configuration option would be something similar to
- * 'auto-update: true' - if this value is set to false you may NOT run the
- * auto-updater.
- * If you are unsure about these rules, please read the plugin submission
- * guidelines: http://goo.gl/8iU5l
- *
- * @author Gravity
- * @version 2.3
- */
-
-public class Updater {
-
- /* Constants */
-
- // Remote file's title
- private static final String TITLE_VALUE = "name";
- // Remote file's download link
- private static final String LINK_VALUE = "downloadUrl";
- // Remote file's release type
- private static final String TYPE_VALUE = "releaseType";
- // Remote file's build version
- private static final String VERSION_VALUE = "gameVersion";
- // Path to GET
- private static final String QUERY = "/servermods/files?projectIds=";
- // Slugs will be appended to this to get to the project's RSS feed
- private static final String HOST = "https://api.curseforge.com";
- // User-agent when querying Curse
- private static final String USER_AGENT = "Updater (by Gravity)";
- // Used for locating version numbers in file names
- private static final String DELIMETER = "^v|[\\s_-]v";
- // If the version number contains one of these, don't update.
- private static final String[] NO_UPDATE_TAG = { "-DEV", "-PRE", "-SNAPSHOT" };
- // Used for downloading files
- private static final int BYTE_SIZE = 1024;
- // Config key for api key
- private static final String API_KEY_CONFIG_KEY = "api-key";
- // Config key for disabling Updater
- private static final String DISABLE_CONFIG_KEY = "disable";
- // Default api key value in config
- private static final String API_KEY_DEFAULT = "PUT_API_KEY_HERE";
- // Default disable value in config
- private static final boolean DISABLE_DEFAULT = false;
-
- /* User-provided variables */
-
- // Plugin running Updater
- private final Plugin plugin;
- // Type of update check to run
- private final UpdateType type;
- // Whether to announce file downloads
- private final boolean announce;
- // The plugin file (jar)
- private final File file;
- // The folder that downloads will be placed in
- private final File updateFolder;
- // The provided callback (if any)
- private final UpdateCallback callback;
- // Project's Curse ID
- private int id = -1;
- // BukkitDev ServerMods API key
- private String apiKey = null;
-
- /* Collected from Curse API */
-
- private String versionName;
- private String versionLink;
- private String versionType;
- private String versionGameVersion;
-
- /* Update process variables */
-
- // Connection to RSS
- private URL url;
- // Updater thread
- private Thread thread;
- // Used for determining the outcome of the update process
- private Updater.UpdateResult result = Updater.UpdateResult.SUCCESS;
-
- /**
- * Gives the developer the result of the update process. Can be obtained by
- * called {@link #getResult()}
- */
- public enum UpdateResult {
- /**
- * The updater found an update, and has readied it to be loaded the next
- * time the server restarts/reloads.
- */
- SUCCESS,
- /**
- * The updater did not find an update, and nothing was downloaded.
- */
- NO_UPDATE,
- /**
- * The server administrator has disabled the updating system.
- */
- DISABLED,
- /**
- * The updater found an update, but was unable to download it.
- */
- FAIL_DOWNLOAD,
- /**
- * For some reason, the updater was unable to contact dev.bukkit.org to
- * download the file.
- */
- FAIL_DBO,
- /**
- * When running the version check, the file on DBO did not contain a
- * recognizable version.
- */
- FAIL_NOVERSION,
- /**
- * The id provided by the plugin running the updater was invalid and
- * doesn't exist on DBO.
- */
- FAIL_BADID,
- /**
- * The server administrator has improperly configured their API key in
- * the configuration.
- */
- FAIL_APIKEY,
- /**
- * The updater found an update, but because of the UpdateType being set
- * to NO_DOWNLOAD, it wasn't downloaded.
- */
- UPDATE_AVAILABLE
- }
-
- /**
- * Allows the developer to specify the type of update that will be run.
- */
- public enum UpdateType {
- /**
- * Run a version check, and then if the file is out of date, download
- * the newest version.
- */
- DEFAULT,
- /**
- * Don't run a version check, just find the latest update and download
- * it.
- */
- NO_VERSION_CHECK,
- /**
- * Get information about the version and the download size, but don't
- * actually download anything.
- */
- NO_DOWNLOAD
- }
-
- /**
- * Represents the various release types of a file on BukkitDev.
- */
- public enum ReleaseType {
- /**
- * An "alpha" file.
- */
- ALPHA,
- /**
- * A "beta" file.
- */
- BETA,
- /**
- * A "release" file.
- */
- RELEASE
- }
-
- /**
- * Initialize the updater.
- *
- * @param plugin The plugin that is checking for an update.
- * @param id The dev.bukkit.org id of the project.
- * @param file The file that the plugin is running from, get this by doing
- * this.getFile() from within your main class.
- * @param type Specify the type of update this will be. See
- * {@link UpdateType}
- * @param announce True if the program should announce the progress of new
- * updates in console.
- */
- public Updater(Plugin plugin, int id, File file, UpdateType type, boolean announce) {
- this(plugin, id, file, type, null, announce);
- }
-
- /**
- * Initialize the updater with the provided callback.
- *
- * @param plugin The plugin that is checking for an update.
- * @param id The dev.bukkit.org id of the project.
- * @param file The file that the plugin is running from, get this by doing
- * this.getFile() from within your main class.
- * @param type Specify the type of update this will be. See
- * {@link UpdateType}
- * @param callback The callback instance to notify when the Updater has
- * finished
- */
- public Updater(Plugin plugin, int id, File file, UpdateType type, UpdateCallback callback) {
- this(plugin, id, file, type, callback, false);
- }
-
- /**
- * Initialize the updater with the provided callback.
- *
- * @param plugin The plugin that is checking for an update.
- * @param id The dev.bukkit.org id of the project.
- * @param file The file that the plugin is running from, get this by doing
- * this.getFile() from within your main class.
- * @param type Specify the type of update this will be. See
- * {@link UpdateType}
- * @param callback The callback instance to notify when the Updater has
- * finished
- * @param announce True if the program should announce the progress of new
- * updates in console.
- */
- public Updater(Plugin plugin, int id, File file, UpdateType type, UpdateCallback callback, boolean announce) {
- this.plugin = plugin;
- this.type = type;
- this.announce = announce;
- this.file = file;
- this.id = id;
- this.updateFolder = this.plugin.getServer().getUpdateFolderFile();
- this.callback = callback;
-
- final File pluginFile = this.plugin.getDataFolder().getParentFile();
- final File updaterFile = new File(pluginFile, "Updater");
- final File updaterConfigFile = new File(updaterFile, "config.yml");
-
- YamlConfiguration config = new YamlConfiguration();
- config.options().header("This configuration file affects all plugins using the Updater system (version 2+ - http://forums.bukkit.org/threads/96681/ )" + '\n' + "If you wish to use your API key, read http://wiki.bukkit.org/ServerMods_API and place it below." + '\n' + "Some updating systems will not adhere to the disabled value, but these may be turned off in their plugin's configuration.");
- config.addDefault(API_KEY_CONFIG_KEY, API_KEY_DEFAULT);
- config.addDefault(DISABLE_CONFIG_KEY, DISABLE_DEFAULT);
-
- if (!updaterFile.exists()) {
- this.fileIOOrError(updaterFile, updaterFile.mkdir(), true);
- }
-
- boolean createFile = !updaterConfigFile.exists();
- try {
- if (createFile) {
- this.fileIOOrError(updaterConfigFile, updaterConfigFile.createNewFile(), true);
- config.options().copyDefaults(true);
- config.save(updaterConfigFile);
- } else {
- config.load(updaterConfigFile);
- }
- } catch (final Exception e) {
- final String message;
- if (createFile) {
- message = "The updater could not create configuration at " + updaterFile.getAbsolutePath();
- } else {
- message = "The updater could not load configuration at " + updaterFile.getAbsolutePath();
- }
- this.plugin.getLogger().log(Level.SEVERE, message, e);
- }
-
- if (config.getBoolean(DISABLE_CONFIG_KEY)) {
- this.result = UpdateResult.DISABLED;
- return;
- }
-
- String key = config.getString(API_KEY_CONFIG_KEY);
- if (API_KEY_DEFAULT.equalsIgnoreCase(key) || "".equals(key)) {
- key = null;
- }
-
- this.apiKey = key;
-
- try {
- this.url = new URL(Updater.HOST + Updater.QUERY + this.id);
- } catch (final MalformedURLException e) {
- this.plugin.getLogger().log(Level.SEVERE, "The project ID provided for updating, " + this.id + " is invalid.", e);
- this.result = UpdateResult.FAIL_BADID;
- }
-
- if (this.result != UpdateResult.FAIL_BADID) {
- this.thread = new Thread(new UpdateRunnable());
- this.thread.start();
- } else {
- runUpdater();
- }
- }
-
- /**
- * Get the result of the update process.
- *
- * @return result of the update process.
- * @see UpdateResult
- */
- public Updater.UpdateResult getResult() {
- this.waitForThread();
- return this.result;
- }
-
- /**
- * Get the latest version's release type.
- *
- * @return latest version's release type.
- * @see ReleaseType
- */
- public ReleaseType getLatestType() {
- this.waitForThread();
- if (this.versionType != null) {
- for (ReleaseType type : ReleaseType.values()) {
- if (this.versionType.equalsIgnoreCase(type.name())) {
- return type;
- }
- }
- }
- return null;
- }
-
- /**
- * Get the latest version's game version (such as "CB 1.2.5-R1.0").
- *
- * @return latest version's game version.
- */
- public String getLatestGameVersion() {
- this.waitForThread();
- return this.versionGameVersion;
- }
-
- /**
- * Get the latest version's name (such as "Project v1.0").
- *
- * @return latest version's name.
- */
- public String getLatestName() {
- this.waitForThread();
- return this.versionName;
- }
-
- /**
- * Get the latest version's direct file link.
- *
- * @return latest version's file link.
- */
- public String getLatestFileLink() {
- this.waitForThread();
- return this.versionLink;
- }
-
- /**
- * As the result of Updater output depends on the thread's completion, it is
- * necessary to wait for the thread to finish before allowing anyone to
- * check the result.
- */
- private void waitForThread() {
- if ((this.thread != null) && this.thread.isAlive()) {
- try {
- this.thread.join();
- } catch (final InterruptedException e) {
- this.plugin.getLogger().log(Level.SEVERE, null, e);
- }
- }
- }
-
- /**
- * Save an update from dev.bukkit.org into the server's update folder.
- *
- * @param file the name of the file to save it as.
- */
- private void saveFile(String file) {
- final File folder = this.updateFolder;
-
- deleteOldFiles();
- if (!folder.exists()) {
- this.fileIOOrError(folder, folder.mkdir(), true);
- }
- downloadFile();
-
- // Check to see if it's a zip file, if it is, unzip it.
- final File dFile = new File(folder.getAbsolutePath(), file);
- if (dFile.getName().endsWith(".zip")) {
- // Unzip
- this.unzip(dFile.getAbsolutePath());
- }
- if (this.announce) {
- this.plugin.getLogger().info("Finished updating.");
- }
- }
-
- /**
- * Download a file and save it to the specified folder.
- */
- private void downloadFile() {
- BufferedInputStream in = null;
- FileOutputStream fout = null;
- try {
- URL fileUrl = new URL(this.versionLink);
- final int fileLength = fileUrl.openConnection().getContentLength();
- in = new BufferedInputStream(fileUrl.openStream());
- fout = new FileOutputStream(new File(this.updateFolder, file.getName()));
-
- final byte[] data = new byte[Updater.BYTE_SIZE];
- int count;
- if (this.announce) {
- this.plugin.getLogger().info("About to download a new update: " + this.versionName);
- }
- long downloaded = 0;
- while ((count = in.read(data, 0, Updater.BYTE_SIZE)) != -1) {
- downloaded += count;
- fout.write(data, 0, count);
- final int percent = (int) ((downloaded * 100) / fileLength);
- if (this.announce && ((percent % 10) == 0)) {
- this.plugin.getLogger().info("Downloading update: " + percent + "% of " + fileLength + " bytes.");
- }
- }
- } catch (Exception ex) {
- this.plugin.getLogger().log(Level.WARNING, "The auto-updater tried to download a new update, but was unsuccessful.", ex);
- this.result = Updater.UpdateResult.FAIL_DOWNLOAD;
- } finally {
- try {
- if (in != null) {
- in.close();
- }
- } catch (final IOException ex) {
- this.plugin.getLogger().log(Level.SEVERE, null, ex);
- }
- try {
- if (fout != null) {
- fout.close();
- }
- } catch (final IOException ex) {
- this.plugin.getLogger().log(Level.SEVERE, null, ex);
- }
- }
- }
-
- /**
- * Remove possibly leftover files from the update folder.
- */
- private void deleteOldFiles() {
- // Just a quick check to make sure we didn't leave any files from last
- // time...
- File[] list = listFilesOrError(this.updateFolder);
- for (final File xFile : list) {
- if (xFile.getName().endsWith(".zip")) {
- this.fileIOOrError(xFile, xFile.mkdir(), true);
- }
- }
- }
-
- /**
- * Part of Zip-File-Extractor, modified by Gravity for use with Updater.
- *
- * @param file the location of the file to extract.
- */
- private void unzip(String file) {
- final File fSourceZip = new File(file);
- try {
- final String zipPath = file.substring(0, file.length() - 4);
- ZipFile zipFile = new ZipFile(fSourceZip);
- Enumeration extends ZipEntry> e = zipFile.entries();
- while (e.hasMoreElements()) {
- ZipEntry entry = e.nextElement();
- File destinationFilePath = new File(zipPath, entry.getName());
- this.fileIOOrError(destinationFilePath.getParentFile(), destinationFilePath.getParentFile().mkdirs(), true);
- if (!entry.isDirectory()) {
- final BufferedInputStream bis = new BufferedInputStream(zipFile.getInputStream(entry));
- int b;
- final byte[] buffer = new byte[Updater.BYTE_SIZE];
- final FileOutputStream fos = new FileOutputStream(destinationFilePath);
- final BufferedOutputStream bos = new BufferedOutputStream(fos, Updater.BYTE_SIZE);
- while ((b = bis.read(buffer, 0, Updater.BYTE_SIZE)) != -1) {
- bos.write(buffer, 0, b);
- }
- bos.flush();
- bos.close();
- bis.close();
- final String name = destinationFilePath.getName();
- if (name.endsWith(".jar") && this.pluginExists(name)) {
- File output = new File(this.updateFolder, name);
- this.fileIOOrError(output, destinationFilePath.renameTo(output), true);
- }
- }
- }
- zipFile.close();
-
- // Move any plugin data folders that were included to the right
- // place, Bukkit won't do this for us.
- moveNewZipFiles(zipPath);
-
- } catch (final IOException e) {
- this.plugin.getLogger().log(Level.SEVERE, "The auto-updater tried to unzip a new update file, but was unsuccessful.", e);
- this.result = Updater.UpdateResult.FAIL_DOWNLOAD;
- } finally {
- this.fileIOOrError(fSourceZip, fSourceZip.delete(), false);
- }
- }
-
- /**
- * Find any new files extracted from an update into the plugin's data
- * directory.
- *
- * @param zipPath path of extracted files.
- */
- private void moveNewZipFiles(String zipPath) {
- File[] list = listFilesOrError(new File(zipPath));
- for (final File dFile : list) {
- if (dFile.isDirectory() && this.pluginExists(dFile.getName())) {
- // Current dir
- final File oFile = new File(this.plugin.getDataFolder().getParent(), dFile.getName());
- // List of existing files in the new dir
- final File[] dList = listFilesOrError(dFile);
- // List of existing files in the current dir
- final File[] oList = listFilesOrError(oFile);
- for (File cFile : dList) {
- // Loop through all the files in the new dir
- boolean found = false;
- for (final File xFile : oList) {
- // Loop through all the contents in the current dir to
- // see if it exists
- if (xFile.getName().equals(cFile.getName())) {
- found = true;
- break;
- }
- }
- if (!found) {
- // Move the new file into the current dir
- File output = new File(oFile, cFile.getName());
- this.fileIOOrError(output, cFile.renameTo(output), true);
- } else {
- // This file already exists, so we don't need it
- // anymore.
- this.fileIOOrError(cFile, cFile.delete(), false);
- }
- }
- }
- this.fileIOOrError(dFile, dFile.delete(), false);
- }
- File zip = new File(zipPath);
- this.fileIOOrError(zip, zip.delete(), false);
- }
-
- /**
- * Check if the name of a jar is one of the plugins currently installed,
- * used for extracting the correct files out of a zip.
- *
- * @param name a name to check for inside the plugins folder.
- * @return true if a file inside the plugins folder is named this.
- */
- private boolean pluginExists(String name) {
- File[] plugins = listFilesOrError(new File("plugins"));
- for (final File file : plugins) {
- if (file.getName().equals(name)) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Check to see if the program should continue by evaluating whether the
- * plugin is already updated, or shouldn't be updated.
- *
- * @return true if the version was located and is not the same as the
- * remote's newest.
- */
- private boolean versionCheck() {
- final String title = this.versionName;
- if (this.type != UpdateType.NO_VERSION_CHECK) {
- final String localVersion = this.plugin.getDescription().getVersion();
- if (title.split(DELIMETER).length >= 2) {
- // Get the newest file's version number
- final String remoteVersion = title.split(DELIMETER)[title.split(DELIMETER).length - 1].split(" ")[0];
-
- if (this.hasTag(localVersion) || !this.shouldUpdate(localVersion, remoteVersion)) {
- // We already have the latest version, or this build is
- // tagged for no-update
- this.result = Updater.UpdateResult.NO_UPDATE;
- return false;
- }
- } else {
- // The file's name did not contain the string 'vVersion'
- final String authorInfo = this.plugin.getDescription().getAuthors().isEmpty() ? "" : " (" + 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 vVERSION'");
- this.plugin.getLogger().warning("Please notify the author of this error.");
- this.result = Updater.UpdateResult.FAIL_NOVERSION;
- return false;
- }
- }
- return true;
- }
-
- /**
- * If you wish to run mathematical versioning checks, edit this
- * method.
- *
- * With default behavior, Updater will NOT verify that a remote version
- * available on BukkitDev which is not this version is indeed an "update".
- * If a version is present on BukkitDev that is not the version that is
- * currently running, Updater will assume that it is a newer version. This
- * is because there is no standard versioning scheme, and creating a
- * calculation that can determine whether a new update is actually an update
- * is sometimes extremely complicated.
- *
- *
- * Updater will call this method from {@link #versionCheck()} before
- * deciding whether the remote version is actually an update. If you have a
- * specific versioning scheme with which a mathematical determination can be
- * reliably made to decide whether one version is higher than another, you
- * may revise this method, using the local and remote version parameters, to
- * execute the appropriate check.
- *
- *
- * Returning a value of false will tell the update process that this
- * is NOT a new version. Without revision, this method will always consider
- * a remote version at all different from that of the local version a new
- * update.
- *
- *
- * @param localVersion the current version
- * @param remoteVersion the remote version
- * @return true if Updater should consider the remote version an update,
- * false if not.
- */
- public boolean shouldUpdate(String localVersion, String remoteVersion) {
- return !localVersion.equalsIgnoreCase(remoteVersion);
- }
-
- /**
- * Evaluate whether the version number is marked showing that it should not
- * be updated by this program.
- *
- * @param version a version number to check for tags in.
- * @return true if updating should be disabled.
- */
- private boolean hasTag(String version) {
- for (final String string : Updater.NO_UPDATE_TAG) {
- if (version.contains(string)) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Make a connection to the BukkitDev API and request the newest file's
- * details.
- *
- * @return true if successful.
- */
- private boolean read() {
- try {
- final URLConnection conn = this.url.openConnection();
- conn.setConnectTimeout(5000);
-
- if (this.apiKey != null) {
- conn.addRequestProperty("X-API-Key", this.apiKey);
- }
- conn.addRequestProperty("User-Agent", Updater.USER_AGENT);
-
- conn.setDoOutput(true);
-
- final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
- final String response = reader.readLine();
-
- JsonParser parser = new JsonParser();
-
- final JsonArray array = parser.parse(response).getAsJsonArray();
-
- if (array.size() == 0) {
- this.plugin.getLogger().warning("The updater could not find any files for the project id " + this.id);
- this.result = UpdateResult.FAIL_BADID;
- return false;
- }
-
- JsonObject latestUpdate = array.get(array.size() - 1).getAsJsonObject();
- this.versionName = latestUpdate.get(Updater.TITLE_VALUE).getAsString();
- this.versionLink = latestUpdate.get(Updater.LINK_VALUE).getAsString();
- this.versionType = latestUpdate.get(Updater.TYPE_VALUE).getAsString();
- this.versionGameVersion = latestUpdate.get(Updater.VERSION_VALUE).getAsString();
-
- return true;
- } catch (final IOException e) {
- if (e.getMessage().contains("HTTP response code: 403")) {
- this.plugin.getLogger().severe("dev.bukkit.org rejected the API key provided in plugins/Updater/config.yml");
- this.plugin.getLogger().severe("Please double-check your configuration to ensure it is correct.");
- this.result = UpdateResult.FAIL_APIKEY;
- } else {
- this.plugin.getLogger().severe("The updater could not contact dev.bukkit.org for updating.");
- this.plugin.getLogger().severe("If you have not recently modified your configuration and this is the first time you are seeing this message, the site may be experiencing temporary downtime.");
- this.result = UpdateResult.FAIL_DBO;
- }
- this.plugin.getLogger().log(Level.SEVERE, null, e);
- return false;
- }
- }
-
- /**
- * Perform a file operation and log any errors if it fails.
- *
- * @param file file operation is performed on.
- * @param result result of file operation.
- * @param create true if a file is being created, false if deleted.
- */
- private void fileIOOrError(File file, boolean result, boolean create) {
- if (!result) {
- this.plugin.getLogger().severe("The updater could not " + (create ? "create" : "delete") + " file at: " + file.getAbsolutePath());
- }
- }
-
- private File[] listFilesOrError(File folder) {
- File[] contents = folder.listFiles();
- if (contents == null) {
- this.plugin.getLogger().severe("The updater could not access files at: " + this.updateFolder.getAbsolutePath());
- return new File[0];
- } else {
- return contents;
- }
- }
-
- /**
- * Called on main thread when the Updater has finished working, regardless
- * of result.
- */
- public interface UpdateCallback {
- /**
- * Called when the updater has finished working.
- *
- * @param updater The updater instance
- */
- void onFinish(Updater updater);
- }
-
- private class UpdateRunnable implements Runnable {
- @Override
- public void run() {
- runUpdater();
- }
- }
-
- private void runUpdater() {
- if (this.url != null && (this.read() && this.versionCheck())) {
- // Obtain the results of the project's file feed
- if ((this.versionLink != null) && (this.type != UpdateType.NO_DOWNLOAD)) {
- String name = this.file.getName();
- // If it's a zip file, it shouldn't be downloaded as the
- // plugin's name
- if (this.versionLink.endsWith(".zip")) {
- name = this.versionLink.substring(this.versionLink.lastIndexOf("/") + 1);
- }
- this.saveFile(name);
- } else {
- this.result = UpdateResult.UPDATE_AVAILABLE;
- }
- }
-
- if (this.callback != null) {
- new BukkitRunnable() {
- @Override
- public void run() {
- runCallback();
- }
- }.runTask(this.plugin);
- }
- }
-
- private void runCallback() {
- this.callback.onFinish(this);
- }
-}