Merge pull request #236 from J3fftw1/chore/pull-version-from-blob-build

Author: WalshyDev

dough-updater/src/main/java/io/github/bakedlibs/dough/updater/AbstractPluginUpdater.java

@@ -11,6 +11,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 
+import io.github.bakedlibs.dough.versions.PrefixedVersion;
 import io.github.bakedlibs.dough.versions.Version;
 
 abstract class AbstractPluginUpdater<V extends Version> implements PluginUpdater<V> {
@@ -79,4 +80,16 @@ protected void scheduleAsyncUpdateTask(@Nonnull UpdaterTask<V> task) {
         plugin.getServer().getScheduler().runTaskAsynchronously(plugin, task);
     }
 
+    @ParametersAreNonnullByDefault
+    @Nonnull
+    protected static PrefixedVersion extractBuild(String prefix, Plugin plugin) {
+        String pluginVersion = plugin.getDescription().getVersion();
+
+        if (pluginVersion.startsWith(prefix)) {
+            int version = Integer.parseInt(pluginVersion.substring(prefix.length()).split(" ")[0], 10);
+            return new PrefixedVersion(prefix, version);
+        } else {
+            throw new IllegalArgumentException("Not a valid build version: " + pluginVersion);
+        }
+    }
 }

dough-updater/src/main/java/io/github/bakedlibs/dough/updater/BlobBuildUpdater.java

@@ -13,7 +13,6 @@
 import java.net.URL;
 import java.util.logging.Level;
 
-// TODO: add a way to get the current version.
 // TODO: checksum checking.
 public class BlobBuildUpdater extends AbstractPluginUpdater<PrefixedVersion> {
 
@@ -28,7 +27,7 @@ public BlobBuildUpdater(@Nonnull Plugin plugin, @Nonnull File file, @Nonnull Str
     }
 
     public BlobBuildUpdater(@Nonnull Plugin plugin, @Nonnull File file, @Nonnull String project, @Nonnull String releaseChannel) {
-        super(plugin, file, new PrefixedVersion(releaseChannel, 0));
+        super(plugin, file, extractBuild(releaseChannel + " - ", plugin));
 
         this.project = project;
         this.releaseChannel = releaseChannel;
@@ -54,7 +53,7 @@ public UpdateInfo parse(String result) throws MalformedURLException, URISyntaxEx
                     int latestVersion = data.get("build_id").getAsInt();
                     URL downloadURL = new URI(data.get("file_download_url").getAsString()).toURL();
 
-                    return new UpdateInfo(downloadURL, new PrefixedVersion(releaseChannel, latestVersion));
+                    return new UpdateInfo(downloadURL, new PrefixedVersion(releaseChannel + " - ", latestVersion));
                 }
             });
         } catch (MalformedURLException | URISyntaxException e ) {

dough-updater/src/main/java/io/github/bakedlibs/dough/updater/GitHubBuildsUpdater.java

@@ -6,7 +6,6 @@
 import java.util.logging.Level;
 
 import javax.annotation.Nonnull;
-import javax.annotation.ParametersAreNonnullByDefault;
 
 import org.bukkit.plugin.Plugin;
 
@@ -34,18 +33,6 @@ public GitHubBuildsUpdater(@Nonnull Plugin plugin, @Nonnull File file, @Nonnull
         this.prefix = prefix;
     }
 
-    @ParametersAreNonnullByDefault
-    private static @Nonnull PrefixedVersion extractBuild(String prefix, Plugin plugin) {
-        String pluginVersion = plugin.getDescription().getVersion();
-
-        if (pluginVersion.startsWith(prefix)) {
-            int version = Integer.parseInt(pluginVersion.substring(prefix.length()).split(" ")[0], 10);
-            return new PrefixedVersion(prefix, version);
-        } else {
-            throw new IllegalArgumentException("Not a valid build version: " + pluginVersion);
-        }
-    }
-
     @Override
     public void start() {
         try {