Merge branch 'main' of

https://github.com/CommonWealthRobotics/HatRack.git into main

Author: madhe

.github/workflows/release.yml

@@ -125,51 +125,51 @@ jobs:
                GITHUB_TOKEN: ${{ github.token }}
         with:
                upload_url: ${{ steps.create_release.outputs.upload_url }}
-               asset_path: BowlerLauncher-x86_64.AppImage
-               asset_name: BowlerLauncher-x86_64.AppImage
+               asset_path: BowlerLauncher-Linux-x86_64.AppImage
+               asset_name: BowlerLauncher-Linux-x86_64.AppImage
                asset_content_type: application/octet-stream
       - name: upload Debian 
         uses: actions/upload-release-asset@v1
         env:
                GITHUB_TOKEN: ${{ github.token }}
         with:
                upload_url: ${{ steps.create_release.outputs.upload_url }}
-               asset_path: BowlerLauncher-x86_64.deb
-               asset_name: BowlerLauncher-x86_64.deb
+               asset_path: BowlerLauncher-Linux-x86_64.deb
+               asset_name: BowlerLauncher-Linux-x86_64.deb
                asset_content_type: application/octet-stream                 
       - name: upload Windows exe
         uses: actions/upload-release-asset@v1
         env:
                GITHUB_TOKEN: ${{ github.token }}
         with:
                upload_url: ${{ steps.create_release.outputs.upload_url }}
-               asset_path: BowlerLauncher-x86_64.exe
-               asset_name: BowlerLauncher-x86_64.exe
+               asset_path: BowlerLauncher-Windows-x86_64.exe
+               asset_name: BowlerLauncher-Windows-x86_64.exe
                asset_content_type: application/exe        
       - name: upload Windows zip
         uses: actions/upload-release-asset@v1
         env:
                GITHUB_TOKEN: ${{ github.token }}
         with:
                upload_url: ${{ steps.create_release.outputs.upload_url }}
-               asset_path: BowlerLauncher-x86_64.zip
-               asset_name: BowlerLauncher-x86_64.zip
+               asset_path: BowlerLauncher-Windows-x86_64.zip
+               asset_name: BowlerLauncher-Windows-x86_64.zip
                asset_content_type: application/zip        
       - name: upload MacOS dmg x86
         uses: actions/upload-release-asset@v1
         env:
                GITHUB_TOKEN: ${{ github.token }}
         with:
                upload_url: ${{ steps.create_release.outputs.upload_url }}
-               asset_path: BowlerLauncher-x86_64.dmg
-               asset_name: BowlerLauncher-x86_64.dmg
+               asset_path: BowlerLauncher-MacOS-x86_64.dmg
+               asset_name: BowlerLauncher-MacOS-x86_64.dmg
                asset_content_type: application/octet-stream 
       - name: upload MacOS dmg arm
         uses: actions/upload-release-asset@v1
         env:
                GITHUB_TOKEN: ${{ github.token }}
         with:
                upload_url: ${{ steps.create_release.outputs.upload_url }}
-               asset_path: BowlerLauncher-arm64.dmg
-               asset_name: BowlerLauncher-arm64.dmg
+               asset_path: BowlerLauncher-MacOS-arm64.dmg
+               asset_name: BowlerLauncher-MacOS-arm64.dmg
                asset_content_type: application/octet-stream 

.gitignore

@@ -19,4 +19,5 @@ HatRack*
 /zulu*.zip*
 /zulu*.tar*
 **.deb
-/release/
+release
+**.DS_Store**

lib/.gitignore

@@ -0,0 +1 @@
+/bin/

lib/bin/.gitignore

@@ -1,18 +1,21 @@
 package com.commonwealthrobotics;
 
 import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -21,13 +24,16 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+import java.util.stream.Collectors;
+//import java.util.zip.ZipEntry;
+//import java.util.zip.ZipFile;
 
 import org.apache.commons.compress.archivers.examples.Archiver;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarUtils;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.apache.commons.compress.utils.IOUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -43,8 +49,11 @@ public class JvmManager {
 
 	public static String getCommandString(String project, String repo, String version, String downloadJsonURL,
 			long sizeOfJson, ProgressBar progress, String bindir) throws Exception {
-
-		File exe = download(version, downloadJsonURL, sizeOfJson, progress, bindir, "jvm.json");
+		if(version==null)
+			throw new RuntimeException("Version can not be null");
+		File exe;
+		
+		exe= download(version, downloadJsonURL, sizeOfJson, progress, bindir, "jvm.json");
 		Type TT_mapStringString = new TypeToken<HashMap<String, Object>>() {
 		}.getType();
 		// chreat the gson object, this is the parsing factory
@@ -53,28 +62,7 @@ public static String getCommandString(String project, String repo, String versio
 
 		HashMap<String, Object> database = gson.fromJson(jsonText, TT_mapStringString);
 		String key = "UNKNOWN";
-		if (LatestFromGithubLaunchUI.isLin()) {
-			if (LatestFromGithubLaunchUI.isArm()) {
-				key = "Linux-aarch64";
-			} else {
-				key = "Linux-x64";
-			}
-		}
-
-		if (LatestFromGithubLaunchUI.isMac()) {
-			if (LatestFromGithubLaunchUI.isArm()) {
-				key = "Mac-aarch64";
-			} else {
-				key = "Mac-x64";
-			}
-		}
-		if (LatestFromGithubLaunchUI.isWin()) {
-			if (LatestFromGithubLaunchUI.isArm()) {
-				key = "UNKNOWN";
-			} else {
-				key = "Windows-x64";
-			}
-		}
+		key = discoverKey(key);
 		Map<String, Object> vm = (Map<String, Object>) database.get(key);
 		String baseURL = vm.get("url").toString();
 		String type = vm.get("type").toString();
@@ -87,16 +75,16 @@ public static String getCommandString(String project, String repo, String versio
 			jvmargs = new ArrayList<String>();
 		String jvmURL = baseURL + name + "." + type;
 		File jvmArchive = download("", jvmURL, 185000000, progress, bindir, name + "." + type);
-		File dest = new File(bindir+name);
-		if(!dest.exists()) {
+		File dest = new File(bindir + name);
+		if (!dest.exists()) {
 			if (type.toLowerCase().contains("zip")) {
 				unzip(jvmArchive, bindir);
 			}
 			if (type.toLowerCase().contains("tar.gz")) {
 				untar(jvmArchive, bindir);
 			}
-		}else {
-			System.out.println("Not extraction, VM exists "+dest.getAbsolutePath());
+		} else {
+			System.out.println("Not extraction, VM exists " + dest.getAbsolutePath());
 		}
 		String cmd = bindir + name + "/bin/java" + (LatestFromGithubLaunchUI.isWin() ? ".exe" : "") + " ";
 		for (String s : jvmargs) {
@@ -105,24 +93,75 @@ public static String getCommandString(String project, String repo, String versio
 		return cmd + " -jar ";
 	}
 
+	private static String discoverKey(String key) {
+		if (LatestFromGithubLaunchUI.isLin()) {
+			if (LatestFromGithubLaunchUI.isArm()) {
+				key = "Linux-aarch64";
+			} else {
+				key = "Linux-x64";
+			}
+		}
+
+		if (LatestFromGithubLaunchUI.isMac()) {
+			if (LatestFromGithubLaunchUI.isArm()) {
+				key = "Mac-aarch64";
+			} else {
+				key = "Mac-x64";
+			}
+		}
+		if (LatestFromGithubLaunchUI.isWin()) {
+			if (LatestFromGithubLaunchUI.isArm()) {
+				key = "UNKNOWN";
+			} else {
+				key = "Windows-x64";
+			}
+		}
+		return key;
+	}
+
+	public static boolean isExecutable(ZipArchiveEntry entry) {
+		int unixMode = entry.getUnixMode();
+		// Check if any of the executable bits are set for user, group, or others.
+		// User executable: 0100 (0x40), Group executable: 0010 (0x10), Others
+		// executable: 0001 (0x01)
+		return (unixMode & 0x49) != 0;
+	}
+
 	private static void unzip(File path, String dir) throws Exception {
 		String fileBaseName = FilenameUtils.getBaseName(path.getName().toString());
 		Path destFolderPath = new File(dir).toPath();
 
-		try (ZipFile zipFile = new ZipFile(path, ZipFile.OPEN_READ, Charset.defaultCharset())) {
-			Enumeration<? extends ZipEntry> entries = zipFile.entries();
+		try (ZipFile zipFile = ZipFile.builder().setFile(path).get()) {
+			Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
 			while (entries.hasMoreElements()) {
-				ZipEntry entry = entries.nextElement();
+				ZipArchiveEntry entry = entries.nextElement();
 				Path entryPath = destFolderPath.resolve(entry.getName());
 				if (entryPath.normalize().startsWith(destFolderPath.normalize())) {
 					if (entry.isDirectory()) {
 						Files.createDirectories(entryPath);
 					} else {
 						Files.createDirectories(entryPath.getParent());
 						try (InputStream in = zipFile.getInputStream(entry)) {
+							try {
+								// ar.setExternalAttributes(entry.extraAttributes);
+								if (entry.isUnixSymlink()) {
+									String text = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))
+											.lines().collect(Collectors.joining("\n"));
+									Path target = Paths.get(".", text);
+									System.out.println("Creating symlink " + entryPath + " with " + target);
+
+									Files.createSymbolicLink(entryPath, target);
+									continue;
+								}
+							} catch (Exception ex) {
+								ex.printStackTrace();
+							}
 							try (OutputStream out = new FileOutputStream(entryPath.toFile())) {
 								IOUtils.copy(in, out);
 							}
+							if (isExecutable(entry)) {
+								entryPath.toFile().setExecutable(true);
+							}
 						}
 					}
 				}
@@ -141,7 +180,7 @@ private static void untar(File tarFile, String dir) throws Exception {
 		// tarIn is a TarArchiveInputStream
 		while (tarEntry != null) {// create a file with the same name as the tarEntry
 			File destPath = new File(dest.toString() + System.getProperty("file.separator") + tarEntry.getName());
-			//System.out.println("working: " + destPath.getCanonicalPath());
+			// System.out.println("working: " + destPath.getCanonicalPath());
 			if (tarEntry.isDirectory()) {
 				destPath.mkdirs();
 			} else {
@@ -152,54 +191,60 @@ private static void untar(File tarFile, String dir) throws Exception {
 				fout.write(b);
 				fout.close();
 				int mode = tarEntry.getMode();
-				b= new byte[5];
+				b = new byte[5];
 				TarUtils.formatUnsignedOctalString(mode, b, 0, 4);
-				if(bits(b[1]).endsWith("1")) {
+				if (bits(b[1]).endsWith("1")) {
 					destPath.setExecutable(true);
 				}
 			}
 			tarEntry = tarIn.getNextTarEntry();
 		}
 		tarIn.close();
 	}
+
 	private static String bits(byte b) {
 		return String.format("%6s", Integer.toBinaryString(b & 0xFF)).replace(' ', '0');
 	}
 
 	private static File download(String version, String downloadJsonURL, long sizeOfJson, ProgressBar progress,
 			String bindir, String filename) throws MalformedURLException, IOException, FileNotFoundException {
-		URL url = new URL(downloadJsonURL);
-		URLConnection connection = url.openConnection();
-		InputStream is = connection.getInputStream();
-		ProcessInputStream pis = new ProcessInputStream(is, (int) sizeOfJson);
-		pis.addListener(new Listener() {
-			@Override
-			public void process(double percent) {
-				System.out.println("Download percent " + percent);
-				Platform.runLater(() -> {
-					progress.setProgress(percent);
-				});
-			}
-		});
 		File folder = new File(bindir + version + "/");
 		File exe = new File(bindir + version + "/" + filename);
+		try {
+			URL url = new URL(downloadJsonURL);
+			URLConnection connection = url.openConnection();
+			InputStream is = connection.getInputStream();
+			ProcessInputStream pis = new ProcessInputStream(is, (int) sizeOfJson);
+			pis.addListener(new Listener() {
+				@Override
+				public void process(double percent) {
+					System.out.println("Download percent " + percent);
+					Platform.runLater(() -> {
+						progress.setProgress(percent);
+					});
+				}
+			});
 
-		if (!folder.exists() || !exe.exists()) {
-			System.out.println("Start Downloading " + filename);
-			folder.mkdirs();
-			exe.createNewFile();
-			byte dataBuffer[] = new byte[1024];
-			int bytesRead;
-			FileOutputStream fileOutputStream = new FileOutputStream(exe.getAbsoluteFile());
-			while ((bytesRead = pis.read(dataBuffer, 0, 1024)) != -1) {
-				fileOutputStream.write(dataBuffer, 0, bytesRead);
+			if (!folder.exists() || !exe.exists()) {
+				System.out.println("Start Downloading " + filename);
+				folder.mkdirs();
+				exe.createNewFile();
+				byte dataBuffer[] = new byte[1024];
+				int bytesRead;
+				FileOutputStream fileOutputStream = new FileOutputStream(exe.getAbsoluteFile());
+				while ((bytesRead = pis.read(dataBuffer, 0, 1024)) != -1) {
+					fileOutputStream.write(dataBuffer, 0, bytesRead);
+				}
+				fileOutputStream.close();
+				pis.close();
+				System.out.println("Finished downloading " + filename);
+			} else {
+				System.out.println("Not downloadeing, it existst " + filename);
 			}
-			fileOutputStream.close();
-			pis.close();
-			System.out.println("Finished downloading " + filename);
-		} else {
-			System.out.println("Not downloadeing, it existst " + filename);
+		} catch (Throwable t) {
+			t.printStackTrace();
 		}
+		System.out.println("Using JVM "+exe.getAbsolutePath());
 		return exe;
 	}
 }