Added .jar version support

Fi0x · Nov 19, 2021 · a46b456 · a46b456
1 parent 8f7d9ab
commit a46b456
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 8 deletions.
diff --git a/src/main/java/com/fi0x/edct/Main.java b/src/main/java/com/fi0x/edct/Main.java
@@ -38,7 +38,7 @@ public class Main
     public static File discord;
     //TODO: Update version information
     public static final String version = "1.6.9.8";//All.GUI.Logic.Hotfix
-    public static final boolean portable = false;
+    public static final VersionType versionType = VersionType.INSTALLER;
 
     public static void main(String[] args)
     {
@@ -146,4 +146,11 @@ private static String getDateString()
 
         return dtf.format(now);
     }
+
+    public enum VersionType
+    {
+        PORTABLE,
+        INSTALLER,
+        JAR
+    }
 }
diff --git a/src/main/java/com/fi0x/edct/gui/controller/ProgramInfo.java b/src/main/java/com/fi0x/edct/gui/controller/ProgramInfo.java
@@ -100,7 +100,21 @@ public void checkForUpdates()
         if(url != null && url.size() > 0)
         {
             updateUrl = url.get(0);
-            if(url.size() >= 3) assetUrl = url.get((Main.portable ? 1 : 2));
+            if(url.size() >= 3)
+            {
+                switch (Main.versionType)
+                {
+                    case PORTABLE:
+                        assetUrl = url.get(1);
+                        break;
+                    case INSTALLER:
+                        assetUrl = url.get(2);
+                        break;
+                    case JAR:
+                        assetUrl = url.get(3);
+                        break;
+                }
+            }
             btnUpdate.setVisible(true);
             btnBugReport.setVisible(false);
         }

diff --git a/src/main/java/com/fi0x/edct/logging/MixpanelHandler.java b/src/main/java/com/fi0x/edct/logging/MixpanelHandler.java
@@ -110,7 +110,7 @@ public static void setDebugMode(boolean isDebug)
 
     private static void addDefaultProperties(Map<String, String> props)
     {
-        props.put("version", Main.version + (Main.portable ? "-portable" : "-installed"));
+        props.put("version", Main.version + "-" + Main.versionType);
         props.put("debug", String.valueOf(debug));
         props.put("settingsMode", String.valueOf(Settings.detailedResults));
     }

diff --git a/src/main/java/com/fi0x/edct/logic/versioncontrol/ReleaseCleanup.java b/src/main/java/com/fi0x/edct/logic/versioncontrol/ReleaseCleanup.java
@@ -1,5 +1,6 @@
 package com.fi0x.edct.logic.versioncontrol;
 
+import com.fi0x.edct.Main;
 import com.fi0x.edct.logging.Logger;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -30,13 +31,15 @@ public static Map<String, ArrayList<String>> getReleases(String jsonString)
                 String url = releaseJson.get("html_url").toString();
 
                 JSONArray assets = (JSONArray) releaseJson.get("assets");
-                String runExeUrl = getAssetUrl(assets, true);
-                String installUrl = getAssetUrl(assets, false);
+                String runExeUrl = getAssetUrl(assets, Main.VersionType.PORTABLE);
+                String installUrl = getAssetUrl(assets, Main.VersionType.INSTALLER);
+                String jarUrl = getAssetUrl(assets, Main.VersionType.JAR);
 
                 ArrayList<String> urls = new ArrayList<>();
                 urls.add(url);
                 urls.add(runExeUrl);
                 urls.add(installUrl);
+                urls.add(jarUrl);
 
                 releaseDates.put(tag, urls);
             }
@@ -49,13 +52,26 @@ public static Map<String, ArrayList<String>> getReleases(String jsonString)
     }
 
     @Nullable
-    private static String getAssetUrl(JSONArray jsonAssets, boolean portable)
+    private static String getAssetUrl(JSONArray jsonAssets, Main.VersionType portable)
     {
         for(Object asset : jsonAssets)
         {
             JSONObject assetJson = (JSONObject) asset;
-            if(portable && assetJson.get("name").equals("EDCT.exe")) return assetJson.get("browser_download_url").toString();
-            else if(!portable && assetJson.get("name").equals("edctsetup.exe")) return assetJson.get("browser_download_url").toString();
+            switch (portable)
+            {
+                case PORTABLE:
+                    if(assetJson.get("name").equals("EDCT.exe"))
+                        return assetJson.get("browser_download_url").toString();
+                    break;
+                case INSTALLER:
+                    if(assetJson.get("name").equals("edctsetup.exe"))
+                        return assetJson.get("browser_download_url").toString();
+                    break;
+                case JAR:
+                    if(assetJson.get("name").equals("EDCT.jar"))
+                        return assetJson.get("browser_download_url").toString();
+                    break;
+            }
         }
 
         return null;