Adding styling to the autoupdater

Author: madhephaestus

CaDoodleUpdater/src/main/java/com/commonwealthrobotics/CadoodleUpdater.java

@@ -27,7 +27,9 @@
 import java.io.OutputStream;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.List;
@@ -62,7 +64,8 @@ public class CadoodleUpdater {
 	private Label binary; // Value injected by FXMLLoader
 	@FXML // fx:id="currentVersion"
 	private Label currentVersion; // Value injected by FXMLLoader
-
+	@FXML // fx:id="currentVersion"
+	private Label infoBar;
 	@FXML // fx:id="yesButton"
 	private Button yesButton; // Value injected by FXMLLoader
 
@@ -96,9 +99,11 @@ void onYes(ActionEvent event) {
 		System.out.println("Yes path");
 		yesButton.setDisable(true);
 		noButton.setDisable(true);
+		infoBar.setText("Downloading CaDoodle JAR...");
 		new Thread(() -> {
 
 			try {
+				
 				String downloadURL2 = downloadJarURL;
 				System.out.println("Downloading "+downloadJarURL);
 				URL url = new URL(downloadURL2);
@@ -114,10 +119,13 @@ public void process(double percent) {
 					}
 				});
 				File folder = new File(bindir + latestVersionString + "/");
-				File exe = new File(bindir + latestVersionString + "/" + jarName);
+				File exe = new File(bindir + latestVersionString + "/" + jarName+"_TMP");
+				File exeFinal = new File(bindir + latestVersionString + "/" + jarName);
 
-				if (!folder.exists() || !exe.exists() || sizeOfJar != exe.length()) {
+				if (!folder.exists() || !exeFinal.exists() || sizeOfJar != exeFinal.length()) {
 					folder.mkdirs();
+					if(exe.exists())
+						exe.delete();
 					exe.createNewFile();
 					byte dataBuffer[] = new byte[1024];
 					int bytesRead;
@@ -129,8 +137,12 @@ public void process(double percent) {
 					pis.close();
 
 				}
-				if (folder.exists() && exe.exists() && sizeOfJar == exe.length())
+
+				if(exe.exists())
+					Files.move(exe.toPath(), exeFinal.toPath(), StandardCopyOption.REPLACE_EXISTING);
+				if (folder.exists() && exeFinal.exists() && sizeOfJar == exeFinal.length())
 					myVersionString = latestVersionString;
+
 			} catch (Exception e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
@@ -151,7 +163,7 @@ public void launchApplication() {
 		new Thread(() -> {
 			String command;
 			try {
-				command = JvmManager.getCommandString(project, repoName, myVersionString,downloadJsonURL,sizeOfJson,progress,bindir);
+				command = JvmManager.getCommandString(project, repoName, myVersionString,downloadJsonURL,sizeOfJson,progress,bindir,infoBar);
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -198,7 +210,22 @@ public void launchApplication() {
 			System.out.println("Running:\n\n"+finalCommand+"\n\n");
 			new Thread(() -> {
 				try {
-					Process process = Runtime.getRuntime().exec(finalCommand);
+					// Get the current environment
+					Map<String, String> env = new HashMap<>(System.getenv());
+
+					// Extract JAVA_HOME from the JVM path
+					// Assuming your command starts with the full path to java executable
+					String javaHome = extractJavaHomeFromCommand(command);
+					if (javaHome != null) {
+					    env.put("JAVA_HOME", javaHome);
+					}
+
+					// Convert environment map to array format
+					String[] envArray = env.entrySet().stream()
+					    .map(entry -> entry.getKey() + "=" + entry.getValue())
+					    .toArray(String[]::new);
+					// Execute with modified environment
+					Process process = Runtime.getRuntime().exec(finalCommand, envArray);
 					Thread thread = new Thread(()->{
 						BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
 						String line;
@@ -257,7 +284,31 @@ public void launchApplication() {
 			}).start();
 		}).start();
 	}
-
+	private static String extractJavaHomeFromCommand(String command) {
+	    try {
+	        // Split the command to get the java executable path
+	        String[] parts = command.split(" ");
+	        if (parts.length > 0) {
+	            String javaPath = parts[0];
+	            
+	            // Remove quotes if present
+	            javaPath = javaPath.replace("\"", "");
+	            
+	            // Get the parent directory of the bin folder
+	            Path path = Paths.get(javaPath);
+	            if (path.getFileName().toString().startsWith("java")) {
+	                // Go up from java executable to bin, then to JAVA_HOME
+	                Path binDir = path.getParent();
+	                if (binDir != null && binDir.getFileName().toString().equals("bin")) {
+	                    return binDir.getParent().toString();
+	                }
+	            }
+	        }
+	    } catch (Exception e) {
+	        System.err.println("Could not extract JAVA_HOME from command: " + e.getMessage());
+	    }
+	    return null;
+	}
 	public static boolean isWin() {
 		return System.getProperty("os.name").toLowerCase().contains("windows");
 	}

CaDoodleUpdater/src/main/java/com/commonwealthrobotics/JvmManager.java

@@ -19,6 +19,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -43,15 +44,18 @@
 import com.google.gson.reflect.TypeToken;
 
 import javafx.application.Platform;
+import javafx.scene.control.Label;
 import javafx.scene.control.ProgressBar;
 
 public class JvmManager {
 	private static long timeSincePrint = System.currentTimeMillis();
+	private static Label infoBar;
 
 	public static String getCommandString(String project, String repo, String version, String downloadJsonURL,
-			long sizeOfJson, ProgressBar progress, String bindir) throws Exception {
+			long sizeOfJson, ProgressBar progress, String bindir, Label info) throws Exception {
 		if (version == null)
 			version = "0.0.6";
+		infoBar=info;
 		File exe;
 		File jvmArchive;
 		File dest;
@@ -87,7 +91,7 @@ public static String getCommandString(String project, String repo, String versio
 						System.out.println("Failed the extract, erasing and re-downloading");
 						jvmArchive.delete();
 						ex.printStackTrace();
-						return getCommandString(project, repo, version, downloadJsonURL, sizeOfJson, progress, bindir);
+						return getCommandString(project, repo, version, downloadJsonURL, sizeOfJson, progress, bindir,info);
 					}
 				}
 				if (type.toLowerCase().contains("tar.gz")) {
@@ -146,6 +150,7 @@ public static boolean isExecutable(ZipArchiveEntry entry) {
 	private static void unzip(File path, String dir) throws Exception {
 		String fileBaseName = FilenameUtils.getBaseName(path.getName().toString());
 		Path destFolderPath = new File(dir).toPath();
+		Platform.runLater(()->infoBar.setText("Inflating Java Runtime..."));
 
 		try (ZipFile zipFile = ZipFile.builder().setFile(path).get()) {
 			Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
@@ -187,6 +192,7 @@ private static void unzip(File path, String dir) throws Exception {
 
 	public static void untar(File tarFile, String dir) throws Exception {
 		System.out.println("Untaring " + tarFile.getName() + " into " + dir);
+		Platform.runLater(()->infoBar.setText("Inflating Java Runtime..."));
 
 		File dest = new File(dir);
 		dest.mkdir();
@@ -231,7 +237,9 @@ private static String bits(byte b) {
 	private static File download(String version, String downloadJsonURL, long sizeOfJson, ProgressBar progress,
 			String bindir, String filename) throws MalformedURLException, IOException, FileNotFoundException {
 		File folder = new File(bindir + version + "/");
-		File exe = new File(bindir + version + "/" + filename);
+		File exe = new File(bindir + version + "/" + filename+"_TMP");
+		File exeFinal = new File(bindir + version + "/" + filename);
+
 		try {
 			URL url = new URL(downloadJsonURL);
 			URLConnection connection = url.openConnection();
@@ -252,8 +260,11 @@ public void process(double percent) {
 				}
 			});
 
-			if (!folder.exists() || !exe.exists()) {
+			if (!folder.exists() || !exeFinal.exists()) {
+				if(exe.exists())
+					exe.delete();
 				System.out.println("Start Downloading " + filename);
+				Platform.runLater(()->infoBar.setText("Downloading Java Runtime..."));
 				folder.mkdirs();
 				exe.createNewFile();
 				byte dataBuffer[] = new byte[1024];
@@ -271,7 +282,10 @@ public void process(double percent) {
 		} catch (Throwable t) {
 			t.printStackTrace();
 		}
-		System.out.println("Using JVM " + exe.getAbsolutePath());
-		return exe;
+		System.out.println("Using JVM " + exeFinal.getAbsolutePath());
+		if(exe.exists())
+			Files.move(exe.toPath(), exeFinal.toPath(), StandardCopyOption.REPLACE_EXISTING);
+		return exeFinal;
 	}
+	
 }