Added cli option to specify the target version to update to

Amulet-Team · Nov 28, 2020 · 658529b · 658529b
1 parent ebddb3e
commit 658529b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/com/amulet_editor/amulet_updater/Main.java b/src/main/java/com/amulet_editor/amulet_updater/Main.java
@@ -45,11 +45,13 @@ public static void main(String[] args) {
         options.addOption("pid", true, "The PID to kill");
         options.addOption("install_beta", "Switch to install the beta version");
         options.addOption("current_version", true, "The currently installed version");
+        options.addOption("target_version",true, "The target version to update to");
 
         CommandLineParser parser = new DefaultParser();
 
         String workingDirectory = null;
         String currentVersion = null;
+        String targetVersion = null;
         boolean installBeta = false;
         String sPid = null;
 
@@ -61,6 +63,9 @@ public static void main(String[] args) {
             if (cli.hasOption("pid")) {
                 sPid = cli.getOptionValue("pid");
             }
+            if (cli.hasOption("target_version")) {
+                targetVersion = cli.getOptionValue("target_version");
+            }
         } catch (ParseException exp) {
             exp.printStackTrace();
         }
@@ -73,7 +78,7 @@ public static void main(String[] args) {
         environment.put(Constants.WORKING_DIRECTORY, new File(workingDirectory));
         environment.put(Constants.CURRENT_VERSION, currentVersion);
 
-        GithubAPI.ReleaseInfo releaseInfo = GithubAPI.getLatestRelease(installBeta);
+        GithubAPI.ReleaseInfo releaseInfo = GithubAPI.getLatestRelease(installBeta, targetVersion);
         if (releaseInfo == null) {
             JOptionPane.showMessageDialog(UpdateUI.getInstanceComponent(), "Couldn't find latest release, please wait 1 hour and try again", "An Error has Occured", JOptionPane.ERROR_MESSAGE);
             return;

diff --git a/src/main/java/com/amulet_editor/amulet_updater/utils/GithubAPI.java b/src/main/java/com/amulet_editor/amulet_updater/utils/GithubAPI.java
@@ -14,7 +14,7 @@ public class GithubAPI {
     private static final Github github = new RtGithub();
 
     public static void main(String[] args) throws MalformedURLException {
-        ReleaseInfo info = getLatestRelease(false);
+        ReleaseInfo info = getLatestRelease(false, null);
         assert info != null;
         System.out.println(info.releaseVersion + " -> " + info.parseUrl(info.getReleaseAsset()));
     }
@@ -60,7 +60,7 @@ public  URL parseUrl(String assetName) throws MalformedURLException {
         }
     }
 
-    public static ReleaseInfo getLatestRelease(boolean includeBetas) {
+    public static ReleaseInfo getLatestRelease(boolean includeBetas, String targetVersion) {
         try {
             Repo repo = github.repos().get(
                     new Coordinates.Simple("Amulet-Team/Amulet-Map-Editor")
@@ -75,7 +75,11 @@ public static ReleaseInfo getLatestRelease(boolean includeBetas) {
                 }
 
                 if (!latestRelease.draft()) {
-                    break;
+                    if (targetVersion == null) {
+                        break;
+                    } else if (targetVersion.equals(latestRelease.tag())) {
+                        break;
+                    }
                 }
             }
             if (latestRelease != null) {