Merge branch 'master' into donatello-2

Author: i-make-robots

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.marginallyclever</groupId>
 	<artifactId>Makelangelo</artifactId>
-	<version>7.62.1</version>
+	<version>7.62.3</version>
 	<name>Makelangelo</name>
 	<description>Makelangelo Software is a Java program that prepares art for CNC plotters.  It is especially designed for the Makelangelo Robot.
 It pairs really well with Marlin-polargraph, the code in the brain of the robot that receives instructions and moves the motors.</description>
@@ -448,6 +448,11 @@ It pairs really well with Marlin-polargraph, the code in the brain of the robot
 			<artifactId>logback-classic</artifactId>
 			<version>1.5.9</version>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.janino</groupId>
+			<artifactId>janino</artifactId>
+			<version>3.1.8</version>
+		</dependency>
 		<!-- logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>

src/main/java/com/marginallyclever/makelangelo/firmwareuploader/AVRDudeDownloader.java

@@ -37,7 +37,8 @@ public static void main(String[] args) throws IOException {
 
     /**
      * Download AVRDude for the current OS architecture.
-     * @return the path to the extracted avrdude executable.
+     * @return the path to the first folder.  If the target is c:\a\b\ and the extracted files are in c:\a\b\c\d\
+     *         then this will return c:\a\b\c
      * @throws IOException if the download fails.
      */
     public static String downloadAVRDude() throws IOException {
@@ -52,22 +53,20 @@ public static String downloadAVRDude() throws IOException {
      */
     public static String downloadAVRDude(String arch) throws IOException {
         String url = getURLforOS(arch);
-        if (url != null) {
-            try {
-                return downloadAndExtract(url);
-            } catch (IOException e) {
-                logger.error("Error downloading avrdude", e);
-                throw e;
-            }
+        if (url == null) return null;
+
+        try {
+            return downloadAndExtract(url);
+        } catch (IOException e) {
+            logger.error("Error downloading avrdude", e);
+            throw e;
         }
-        return null;
     }
 
     public static String getArch() {
-        String arch = LINUX;
-        if (OSHelper.isWindows()) arch = WINDOWS;
-        if (OSHelper.isOSX()) arch = MACOS;
-        return arch;
+        if (OSHelper.isWindows()) return WINDOWS;
+        if (OSHelper.isOSX()) return MACOS;
+        return LINUX;
     }
 
     /**
@@ -160,7 +159,7 @@ private static JSONObject getJSONFromURL(String url) throws IOException {
     public static String downloadAndExtract(String urlStr) throws IOException {
         File toDeleteLater = downloadFileToTemp(urlStr);
         String path = extractFile(toDeleteLater, urlStr);
-        logger.info("new path: "+path);
+        logger.info("new path: {}", path);
         makeExecutable(path);
 
         return path;
@@ -210,6 +209,13 @@ private static File downloadFileToTemp(String urlStr) throws IOException {
         return toDeleteLater;
     }
 
+    /**
+     * Extract the downloaded file to ~/.makelangelo
+     * @param toDeleteLater the file to delete after extraction
+     * @param urlStr the URL of the file
+     * @return the path to the extracted file, which should be ~/.makelangelo/firstSubDirectory
+     * @throws IOException if the extraction fails
+     */
     private static String extractFile(File toDeleteLater, String urlStr) throws IOException {
         String targetDirStr = System.getProperty("user.home") + File.separator + ".makelangelo" + File.separator;
         String newFolderName = "";
@@ -225,18 +231,26 @@ private static String extractFile(File toDeleteLater, String urlStr) throws IOEx
             newFolderName = extractBz2File(toDeleteLater, targetDirStr);
         }
 
-        if(!newFolderName.isEmpty()) {
-            newFolderName = targetDirStr + newFolderName;
+        // sometimes the path returned might be /a/b/... and we only want /a/
+        if(newFolderName.contains("/")) {
+            newFolderName = newFolderName.split("/")[0];
         }
 
-        return newFolderName;
+        return targetDirStr + newFolderName;
     }
 
     private static String getFileExtension(String fileName) {
         int dotIndex = fileName.lastIndexOf('.');
         return (dotIndex == -1) ? "" : fileName.substring(dotIndex);
     }
 
+    /**
+     * Extract a zip file to the target directory.
+     * @param file the zip file
+     * @param targetDirStr the target directory
+     * @return the name of the first directory in the zip file
+     * @throws IOException if the extraction fails
+     */
     private static String extractZipFile(File file, String targetDirStr) throws IOException {
         try (ZipInputStream zipIn = new ZipInputStream(new FileInputStream(file))) {
             ZipEntry entry = zipIn.getNextEntry();
@@ -245,6 +259,10 @@ private static String extractZipFile(File file, String targetDirStr) throws IOEx
                 Path filePath = Paths.get(targetDirStr, entry.getName());
                 if (entry.isDirectory()) {
                     Files.createDirectories(filePath);
+                    // the first directory is the one we want to return
+                    if (newFolderName.isEmpty()) {
+                        newFolderName = entry.getName();
+                    }
                 } else {
                     Files.createDirectories(filePath.getParent());
                     try (OutputStream outputStream = new FileOutputStream(filePath.toFile())) {
@@ -256,15 +274,19 @@ private static String extractZipFile(File file, String targetDirStr) throws IOEx
                     }
                 }
                 zipIn.closeEntry();
-                if (newFolderName.isEmpty() && entry.isDirectory()) {
-                    newFolderName = entry.getName();
-                }
                 entry = zipIn.getNextEntry();
             }
             return newFolderName;
         }
     }
 
+    /**
+     * Extract a bz2 file to the target directory.
+     * @param file the zip file
+     * @param targetDirStr the target directory
+     * @return the name of the first directory in the bz2 file
+     * @throws IOException if the extraction fails
+     */
     private static String extractBz2File(File file, String targetDirStr) throws IOException {
         try (BZip2CompressorInputStream bzIn = new BZip2CompressorInputStream(new FileInputStream(file))) {
             Path targetFilePath = Paths.get(targetDirStr, file.getName().replace(".bz2", ""));
@@ -280,15 +302,25 @@ private static String extractBz2File(File file, String targetDirStr) throws IOEx
         }
     }
 
+    /**
+     * Extract a .tar.bz2 file to the target directory.
+     * @param file the zip file
+     * @param targetDirStr the target directory
+     * @return the name of the first directory in the bz2 file
+     * @throws IOException if the extraction fails
+     */
     private static String extractTarBz2File(File file, String targetDirStr) throws IOException {
         try (BZip2CompressorInputStream bzIn = new BZip2CompressorInputStream(new FileInputStream(file));
              TarArchiveInputStream tarIn = new TarArchiveInputStream(bzIn)) {
             TarArchiveEntry entry;
             String newFolderName = "";
-            while ((entry = (TarArchiveEntry) tarIn.getNextEntry()) != null) {
+            while ((entry = tarIn.getNextEntry()) != null) {
                 Path filePath = Paths.get(targetDirStr, entry.getName());
                 if (entry.isDirectory()) {
                     Files.createDirectories(filePath);
+                    if (newFolderName.isEmpty()) {
+                        newFolderName = getFolderNameFromEntry(entry.getName());
+                    }
                 } else {
                     Files.createDirectories(filePath.getParent());
                     try (OutputStream outputStream = new FileOutputStream(filePath.toFile())) {
@@ -299,9 +331,6 @@ private static String extractTarBz2File(File file, String targetDirStr) throws I
                         }
                     }
                 }
-                if (newFolderName.isEmpty()) {
-                    newFolderName = getFolderNameFromEntry(entry.getName());
-                }
             }
             return newFolderName;
         }

src/main/java/com/marginallyclever/makelangelo/firmwareuploader/FirmwareUploader.java

@@ -29,11 +29,11 @@ protected FirmwareUploader() {
 	}
 
 	/**
-	 * Search the tree starting at avrdudePath for the given filename.
+	 * Search the tree starting at the install path for the given filename.
 	 * @param target the name of the file to find.
 	 * @return the file if found, null otherwise.
 	 */
-	public File findFile(String target) {
+	public File findFileRecursively(String target) {
 		logger.info("Searching for "+target+" starting in "+installPath);
 		Path startPath = Paths.get(installPath);
 		try {
@@ -50,16 +50,16 @@ public File findFile(String target) {
 	public boolean findAVRDude() {
 		String path = "avrdude";
 		if( OSHelper.isWindows()) path+=".exe";
-		File f = findFile(path);
-		if(!f.exists()) return false;
+		File f = findFileRecursively(path);
+		if(f==null || !f.exists()) return false;
 		avrdudePath = f.getAbsolutePath();
 		return true;
 	}
 
 	// find avrdude.conf
 	public boolean findConf() {
-		File f = findFile(CONF);
-		if(!f.exists()) return false;
+		File f = findFileRecursively(CONF);
+		if(f==null || !f.exists()) return false;
 		confPath = f.getAbsolutePath();
 		return true;
 	}
@@ -147,13 +147,21 @@ public void setHexPath(String s) {
 		hexPath = s;
 	}
 
-    public void setAVRDude(String avrDudePath) {
-		logger.debug("setting avrdude to {}",avrDudePath);
-		avrdudePath = avrDudePath;
+	/**
+	 * Set the path to the avrdude executable.
+	 * @param path the path to the avrdude executable.
+	 */
+    public void setAVRDude(String path) {
+		logger.debug("setting avrdude to {}",path);
+		avrdudePath = path;
     }
 
-	public void setInstallPath(String avrDudePath) {
-		logger.debug("setting install path to {}",avrDudePath);
-		installPath = avrDudePath;
+	/**
+	 * Set the path to the install directory, which should be something like ~/.makelangelo/avrdude
+	 * @param path the path to the install directory.
+	 */
+	public void setInstallPath(String path) {
+		logger.debug("setting install path to {}",path);
+		this.installPath = path;
 	}
 }

src/main/java/com/marginallyclever/makelangelo/firmwareuploader/FirmwareUploaderPanel.java

@@ -80,10 +80,16 @@ private String[] getListOfCOMPorts() {
 	private void run(ActionEvent evt, String name) {
 		String title = Translator.get("FirmwareUploaderPanel.status");
 
+		logger.debug("setup...");
+		if(port.getSelectedIndex()==-1) {
+			JOptionPane.showMessageDialog(this, Translator.get("FirmwareUploaderPanel.noPortSelected"), title, JOptionPane.ERROR_MESSAGE);
+			return;
+		}
+
 		logger.debug("maybe downloading avrdude...");
 		try {
-			String AVRDudePath = AVRDudeDownloader.downloadAVRDude();
-			firmwareUploader.setInstallPath(AVRDudePath);
+			String installPath = AVRDudeDownloader.downloadAVRDude();
+			firmwareUploader.setInstallPath(installPath);
 		} catch(Exception e) {
 			JOptionPane.showMessageDialog(this,Translator.get("FirmwareUploaderPanel.avrdudeNotDownloaded"),title,JOptionPane.ERROR_MESSAGE);
 			return;
@@ -107,11 +113,6 @@ private void run(ActionEvent evt, String name) {
 			return;
 		}
 
-		logger.debug("setup...");
-		if(port.getSelectedIndex()==-1) {
-			JOptionPane.showMessageDialog(this, Translator.get("FirmwareUploaderPanel.noPortSelected"), title, JOptionPane.ERROR_MESSAGE);
-			return;
-		}
 		firmwareUploader.setHexPath(firmwareDownloader.getDownloadPath(name));
 		startM5.setEnabled(false);
 		startHuge.setEnabled(false);

src/main/java/com/marginallyclever/makelangelo/makeart/io/LoadSVG.java

@@ -306,17 +306,16 @@ private Color stringToColor(String strokeName) {
 				int a = Integer.parseInt(strokeName.substring(6,8),16);
 				return new Color(r,g,b,a);
 			}
-		} else if(strokeName.startsWith("rgb(")) {
-			// isolate the portion between the ()
+		} else if(strokeName.startsWith("rgb(") && strokeName.endsWith(")")) {
+			// isolate the portion between the parentheses
 			strokeName = strokeName.substring(4,strokeName.length()-1);
-			strokeName = strokeName.substring(0,strokeName.indexOf(")"));
 			if(strokeName.contains("%")) {
 				// convert from percent to 0-255
 				strokeName = strokeName.replace("%","");
 				String [] parts = strokeName.split(",");
-				int r = (int)(Integer.parseInt(parts[0])*255.0/100.0);
-				int g = (int)(Integer.parseInt(parts[1])*255.0/100.0);
-				int b = (int)(Integer.parseInt(parts[2])*255.0/100.0);
+				int r = Integer.parseInt(parts[0]) * 255 / 100;
+				int g = Integer.parseInt(parts[1]) * 255 / 100;
+				int b = Integer.parseInt(parts[2]) * 255 / 100;
 				return new Color(r,g,b);
 			} else {
 				// already in 0-255

src/main/java/module-info.java

@@ -36,6 +36,9 @@
     opens com.marginallyclever.makelangelo;
     opens com.marginallyclever.makelangelo.makeart.io;
     opens com.marginallyclever.makelangelo.texture;
+    opens com.marginallyclever.convenience.noise;
+    opens com.marginallyclever.convenience.helpers;
+    opens com.marginallyclever.convenience.log to ch.qos.logback.core;
 
     // A Java module that wants to implement a service interface from a service interface module must:
     // - Require the service interface module in its own module descriptor.