Worker tries to use helper

Cube Control/cubeWorker.java

@@ -34,6 +34,24 @@ import java.io.FileWriter;
 import java.io.File;
 import java.io.IOException;
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
+import java.io.Closeable;
+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.io.BufferedReader;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+import java.lang.Process;
+import java.util.StringTokenizer;
 
 public class cubeWorker {
 
@@ -262,15 +280,204 @@ public class cubeWorker {
     }
 
     public String[] getSerialPorts() {
-
-           String[] sPorts = { "Select serial port..." }; // Has to be the first entry
-           return sPorts;
+		String[] ports = {"Select serial port..."};
+		String helperName;
+		if ((System.getProperty("os.name").toLowerCase()).indexOf("win") >= 0) {
+			helperName = "serialHelper.exe";
+		} else {
+			helperName = "serialHelper";
+		}
+		String[] arg = {"p"};
+		String portLines = HelperUtility.runHelper(arg);
+		System.out.println("Output: " + portLines);
+		if (portLines == null) {
+			return ports;
+		}
+		StringTokenizer sT = new StringTokenizer(portLines, "\n");
+		int size = sT.countTokens() + 1;
+		ports = new String[size];
+		ports[0] = "Select serial port...";
+		for (int i = 1; i < size; i++) {
+			ports[i] = sT.nextToken();
+		}
+		return ports;
     }
 
 // --------------------
 
 }
 
+class HelperUtility {
+
+	public static String runHelper(String[] args) {
+		String[] helperName = new String[args.length + 1];
+		boolean windows = false;
+		if ((System.getProperty("os.name").toLowerCase()).indexOf("win") >= 0) {
+			helperName[0] = "serialHelper.exe";
+			windows = true;
+		} else {
+			helperName[0] = "serialHelper";
+		}
+		for (int i = 0; i < args.length; i++) {
+			helperName[i + 1] = args[i];
+		}
+		String ret = "";
+		try {
+			File helper = new File(getFile(getJarURI(), helperName[0]));
+			helperName[0] = helper.getAbsolutePath();
+			if (!windows) {
+				Process execute = Runtime.getRuntime().exec("chmod a+x " + helper.getAbsolutePath());
+				execute.waitFor();
+				if (execute.exitValue() != 0) {
+					System.out.println("Could not set helper as executeable (" + execute.exitValue()+ ")");
+					return null;
+				}
+			}
+			Process p = Runtime.getRuntime().exec(helperName);
+			BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+			String line;
+			boolean fin = false;
+			
+			do { // Wait for process to finish... Doesn't work...?
+				fin = false;
+				try {
+					p.waitFor();
+				} catch (Exception e) {
+					fin = true;
+				}
+
+				// Read output in same loop... Should work...!
+				line = br.readLine();
+				if (line != null) {
+					ret = ret + line + "\n";
+					fin = true;
+				}
+			} while (fin);
+
+			br.close();
+			if (ret.length() == 0) {
+				ret = "g"; // We have added a last \n... We will remove it, so add garbage to be removed...
+			}
+			ret = ret.substring(0, ret.length() - 1);
+			return ret;
+		} catch(Exception e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	// From http://stackoverflow.com/questions/600146/run-exe-which-is-packaged-inside-jar
+	private static URI getJarURI()
+        throws URISyntaxException
+    {
+        final ProtectionDomain domain;
+        final CodeSource       source;
+        final URL              url;
+        final URI              uri;
+
+        domain = cubeWorker.class.getProtectionDomain();
+        source = domain.getCodeSource();
+        url    = source.getLocation();
+        uri    = url.toURI();
+
+        return (uri);
+    }
+
+    private static URI getFile(final URI    where,
+                               final String fileName)
+        throws ZipException,
+               IOException
+    {
+        final File location;
+        final URI  fileURI;
+
+        location = new File(where);
+
+        // not in a JAR, just return the path on disk
+        if(location.isDirectory())
+        {
+            fileURI = URI.create(where.toString() + fileName);
+        }
+        else
+        {
+            final ZipFile zipFile;
+
+            zipFile = new ZipFile(location);
+
+            try
+            {
+                fileURI = extract(zipFile, fileName);
+            }
+            finally
+            {
+                zipFile.close();
+            }
+        }
+
+        return (fileURI);
+    }
+
+    private static URI extract(final ZipFile zipFile,
+                               final String  fileName)
+        throws IOException
+    {
+        final File         tempFile;
+        final ZipEntry     entry;
+        final InputStream  zipStream;
+        OutputStream       fileStream;
+
+        tempFile = File.createTempFile(fileName, Long.toString(System.currentTimeMillis()));
+        tempFile.deleteOnExit();
+        entry    = zipFile.getEntry(fileName);
+
+        if(entry == null)
+        {
+            throw new FileNotFoundException("cannot find file: " + fileName + " in archive: " + zipFile.getName());
+        }
+
+        zipStream  = zipFile.getInputStream(entry);
+        fileStream = null;
+
+        try
+        {
+            final byte[] buf;
+            int          i;
+
+            fileStream = new FileOutputStream(tempFile);
+            buf        = new byte[1024];
+            i          = 0;
+
+            while((i = zipStream.read(buf)) != -1)
+            {
+                fileStream.write(buf, 0, i);
+            }
+        }
+        finally
+        {
+            close(zipStream);
+            close(fileStream);
+        }
+
+        return (tempFile.toURI());
+    }
+
+    private static void close(final Closeable stream)
+    {
+        if(stream != null)
+        {
+            try
+            {
+                stream.close();
+            }
+            catch(final IOException ex)
+            {
+                ex.printStackTrace();
+            }
+        }
+    }
+}
+
 class AnimationUtility {
   private static String lastError = null;
 

Cube Control/helper/winSerial.c

@@ -113,7 +113,7 @@ char** getSerialPorts(void) {
 	 ports = (LPTSTR)malloc(100 * sizeof(CHAR));
 #endif
 
-	num = QueryDosDevice(ports, 100);	
+	num = QueryDosDevice(NULL, ports, 100);	
 	files = (char **)malloc(num * sizeof(char *));
 	
 	for (i = 0; i < num; i++) {

Cube Control/makefile

@@ -6,9 +6,9 @@ TARGET = unix
 JAVAFILES = cubeWorker.java layerEditFrame.java frame.java
 
 ifeq ($(TARGET),win)
-CLASSES = cubeWorker.class layerEditFrame.class layerEditFrame$$1.class layerEditFrame$$2.class layerEditFrame$$3.class layerEditFrame$$4.class frame.class frame$$1.class frame$$2.class frame$$3.class frame$$4.class frame$$5.class frame$$6.class frame$$7.class frame$$8.class frame$$9.class frame$$10.class frame$$11.class frame$$12.class frame$$13.class frame$$14.class frame$$15.class frame$$16.class frame$$17.class frame$$18.class frame$$19.class frame$$20.class frame$$21.class frame$$22.class frame$$23.class frame$$24.class AFrame.class Animation.class AnimationUtility.class LEDoff.png LEDon.png
+CLASSES = cubeWorker.class layerEditFrame.class layerEditFrame$$1.class layerEditFrame$$2.class layerEditFrame$$3.class layerEditFrame$$4.class frame.class frame$$1.class frame$$2.class frame$$3.class frame$$4.class frame$$5.class frame$$6.class frame$$7.class frame$$8.class frame$$9.class frame$$10.class frame$$11.class frame$$12.class frame$$13.class frame$$14.class frame$$15.class frame$$16.class frame$$17.class frame$$18.class frame$$19.class frame$$20.class frame$$21.class frame$$22.class frame$$23.class frame$$24.class AFrame.class Animation.class AnimationUtility.class HelperUtility.class LEDoff.png LEDon.png
 else
-CLASSES = 'cubeWorker.class' 'layerEditFrame.class' 'layerEditFrame$$1.class' 'layerEditFrame$$2.class' 'layerEditFrame$$3.class' 'layerEditFrame$$4.class' 'frame.class' 'frame$$1.class' 'frame$$2.class' 'frame$$3.class' 'frame$$4.class' 'frame$$5.class' 'frame$$6.class' 'frame$$7.class' 'frame$$8.class' 'frame$$9.class' 'frame$$10.class' 'frame$$11.class' 'frame$$12.class' 'frame$$13.class' 'frame$$14.class' 'frame$$15.class' 'frame$$16.class' 'frame$$17.class' 'frame$$18.class' 'frame$$19.class' 'frame$$20.class' 'frame$$21.class' 'frame$$22.class' 'frame$$23.class' 'frame$$24.class' 'AFrame.class' 'Animation.class' 'AnimationUtility.class' 'LEDoff.png' 'LEDon.png'
+CLASSES = 'cubeWorker.class' 'layerEditFrame.class' 'layerEditFrame$$1.class' 'layerEditFrame$$2.class' 'layerEditFrame$$3.class' 'layerEditFrame$$4.class' 'frame.class' 'frame$$1.class' 'frame$$2.class' 'frame$$3.class' 'frame$$4.class' 'frame$$5.class' 'frame$$6.class' 'frame$$7.class' 'frame$$8.class' 'frame$$9.class' 'frame$$10.class' 'frame$$11.class' 'frame$$12.class' 'frame$$13.class' 'frame$$14.class' 'frame$$15.class' 'frame$$16.class' 'frame$$17.class' 'frame$$18.class' 'frame$$19.class' 'frame$$20.class' 'frame$$21.class' 'frame$$22.class' 'frame$$23.class' 'frame$$24.class' 'AFrame.class' 'Animation.class' 'AnimationUtility.class' 'HelperUtility.class' 'LEDoff.png' 'LEDon.png'
 endif
 
 all: build clean

Cube Control/serialHelper.c

@@ -51,6 +51,8 @@ Return values:
 int main(int argc, char *argv[]) {
 	size_t length, written;
 
+		printf("Debugging Worker... Ignore me!\n");
+
 		if (argc < 2) {
 			usage(argv[0]);
 			return 1;