#13 add the

gitcache zip download process

Author: madhephaestus

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

@@ -49,6 +49,7 @@ public class CadoodleUpdater {
 	public static String myVersionString = null;
 	public static long sizeOfJar = 0;
 	public static long sizeOfJson = 0;
+	public static long sizeOfZip = 0;
 	@FXML // ResourceBundle that was given to the FXMLLoader
 	private ResourceBundle resources;
 
@@ -84,6 +85,7 @@ public class CadoodleUpdater {
 
 	private static String downloadJarURL;
 	private static String downloadJsonURL;
+	private static String downloadZip;
 
 	public static String repoName;
 	public static String jarName;
@@ -163,7 +165,7 @@ public void launchApplication() {
 		new Thread(() -> {
 			String command;
 			try {
-				command = JvmManager.getCommandString(project, repoName, myVersionString,downloadJsonURL,sizeOfJson,progress,bindir,infoBar);
+				command = JvmManager.getCommandString(project, repoName, myVersionString,downloadJsonURL, downloadZip,sizeOfZip,sizeOfJson,progress,bindir,infoBar);
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -361,6 +363,10 @@ public static void readCurrentVersion(String url) throws IOException {
 					downloadJsonURL = (String) key.get("browser_download_url");
 					sizeOfJson = ((Double) key.get("size")).longValue();
 					System.out.println(downloadJsonURL + " Size " + sizeOfJson + " bytes");
+				}if (string.contentEquals("gitcache.zip")) {
+					downloadZip = (String) key.get("browser_download_url");
+					sizeOfZip = ((Double) key.get("size")).longValue();
+					System.out.println(downloadZip + " Size " + sizeOfZip + " bytes");
 				}else
 					System.out.println(string+" is not jvm.json");
 

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

@@ -52,7 +52,7 @@ public class JvmManager {
 	private static Label infoBar;
 
 	public static String getCommandString(String project, String repo, String version, String downloadJsonURL,
-			long sizeOfJson, ProgressBar progress, String bindir, Label info) throws Exception {
+			String downloadZip, long sizeOfZip, long sizeOfJson, ProgressBar progress, String bindir, Label info) throws Exception {
 		if (version == null)
 			version = "0.0.6";
 		infoBar=info;
@@ -61,7 +61,7 @@ public static String getCommandString(String project, String repo, String versio
 		File dest;
 		try {
 			exe = download(version, downloadJsonURL, sizeOfJson, progress, bindir, "jvm.json");
-			download(version, downloadJsonURL, sizeOfJson, progress, bindir, "gitcache.zip");
+			download(version, downloadZip, sizeOfZip, progress, bindir, "gitcache.zip");
 			Type TT_mapStringString = new TypeToken<HashMap<String, Object>>() {
 			}.getType();
 			// chreat the gson object, this is the parsing factory
@@ -100,7 +100,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,info);
+						return getCommandString(project, repo, version, downloadJsonURL, downloadZip,  sizeOfZip, sizeOfJson, progress, bindir,info);
 					}
 				}
 				if (type.toLowerCase().contains("tar.gz")) {