working on leaving the Jython process running

Author: kazimuth

prepend-commented.py renamed to resources/prepend-commented.py

@@ -0,0 +1,85 @@
+package info.sansgills.mode.python;
+
+import java.awt.Point;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+
+import processing.app.exec.StreamRedirectThread;
+import processing.core.PApplet;
+
+/**
+ * 
+ * The glue between the PDE process and the sketch process
+ * Handles sending messages to and recieving messages from
+ *
+ */
+public class Communicator {
+	private PythonEditor editor;
+	private Process sketchProcess;
+	
+	private StreamRedirectThread outThread;
+	private MessageReceiverThread errThread;
+	
+	private OutputStream toSketch;
+	
+	public Communicator (Process sketchProcess, PythonEditor editor){
+		this.sketchProcess = sketchProcess;
+		this.editor = editor;
+		
+		outThread = new StreamRedirectThread("JVM Stdout Reader", sketchProcess.getInputStream(), System.out);
+		errThread = new MessageReceiverThread(sketchProcess.getErrorStream(), editor);
+		
+		toSketch = sketchProcess.getOutputStream();
+		
+		outThread.start();
+		errThread.start();
+	}
+	
+	public void close(){
+		errThread.running = false;
+		errThread = null;
+		outThread = null;
+	}
+	
+	
+	//private class to handle doing things when the sketch process sends us a message via system.err
+	private class MessageReceiverThread extends Thread{
+		PythonEditor editor;
+		BufferedReader messageReader;
+		
+		public boolean running;
+		
+		public MessageReceiverThread(InputStream messageStream, PythonEditor editor){
+			this.messageReader = new BufferedReader(new InputStreamReader(messageStream));
+			this.editor = editor;
+			this.running = true;
+		}
+		
+		public void run() {
+			try {
+				String currentLine;
+
+				// continually read messages
+				while ((currentLine = messageReader.readLine()) != null && running) {
+					if (currentLine.indexOf(PApplet.EXTERNAL_STOP) == 0) {
+						// sketch telling us it stopped
+						editor.internalCloseRunner();
+						return;
+					}else if (currentLine.indexOf(PApplet.EXTERNAL_MOVE) == 0) {
+						//sketch telling us it moved
+						String nums = currentLine.substring(currentLine.indexOf(' ') + 1).trim();
+						int space = nums.indexOf(' ');
+						int left = Integer.parseInt(nums.substring(0, space));
+						int top = Integer.parseInt(nums.substring(space + 1));
+						editor.setSketchLocation(new Point(left, top));
+						return;
+					}else{
+						System.err.println(currentLine);
+					}
+				}
+			} catch (Exception e) {}
+		}
+	}
+}

src/info/sansgills/mode/python/Communicator.java

@@ -27,8 +27,7 @@ public class PythonRunner {
 	Process sketchProcess;			// the process we create
 
 	// Threads to redirect output / error streams from process to us
-	Thread errThread = null;
-	Thread outThread = null;
+	Communicator communicator;
 
 	public PythonRunner(PythonBuild build, PythonEditor editor) {
 		this.build = build;
@@ -164,10 +163,9 @@ private void exec(final String[] args){
 		new Thread(new Runnable(){
 			public void run(){
 				sketchProcess = PApplet.exec(args);
-				attach(); //TODO dirty hack
+				communicator = new Communicator(sketchProcess, editor);
 				try{
 					int result = sketchProcess.waitFor();
-					System.out.println("result: "+result);
 				}catch(InterruptedException e){
 					System.out.println("error:");
 					e.printStackTrace();
@@ -176,26 +174,11 @@ public void run(){
 		}).start();
 	}
 
-	/*
-	 * Create redirect threads for stdout, stderr, etc.
-	 * 
-	 * TODO handle special err. messages
-	 */
-	private void attach(){
-		// piggybacking off of Java Mode's redirect for now
-		outThread = new StreamRedirectThread("JVM stdout Reader",
-				sketchProcess.getInputStream(), System.out);
-		errThread = new StreamRedirectThread("JVM stderr Reader",
-				sketchProcess.getErrorStream(), System.err);
-		
-		outThread.start();
-		errThread.start();
-	}
-	
 	/*
 	 * Kill the code.
 	 */
 	public void close() {
+		communicator.close();
 		if(sketchProcess != null){
 			sketchProcess.destroy();
 			sketchProcess = null;

src/info/sansgills/mode/python/PythonRunner.java

@@ -1,6 +1,5 @@
 package info.sansgills.mode.python.wrapper;
 
-import java.io.File;
 import java.util.Arrays;
 import java.util.Scanner;
 
@@ -31,7 +30,10 @@ public class ProcessingJythonWrapper {
 	//EVERYTHING IS STATIC
 
 	//Read in prepend.py from jar (this is the only one-liner to read in a stream, don't you love java)
-	static final String prepend = new Scanner(ProcessingJythonWrapper.class.getResourceAsStream("prepend.py")).useDelimiter("\\A").next();
+	static final String prepend;
+	static{
+		prepend = new Scanner(ProcessingJythonWrapper.class.getResourceAsStream("prepend.py")).useDelimiter("\\A").next();
+	}
 
 	static final String[] sketchFunctions = { "setup", "draw", "mousePressed",
 			"mouseReleased", "mouseClicked", "mouseWheel", "mouseMoved",
@@ -48,26 +50,28 @@ public class ProcessingJythonWrapper {
 	 * First argument is the path to the script; the rest are things to pass to PApplet.
 	 * 
 	 */
-	public static void main(String[] args) {		
+	public static void main(String[] args) {
 		String scriptPath = args[0];
 		String[] params = Arrays.copyOfRange(args, 1, args.length);
+		prepare();
 		run(scriptPath, params);
 	}
 
+	public static void prepare() {
+		interp = new InteractiveConsole(); // create jython environment
+		sys = Py.getSystemState(); // python 'sys' variable
+
+		// give jython the packages we need
+		// TODO libraries?
+		PySystemState.add_package("info.sansgills.mode.python.wrapper");
+		PySystemState.add_package("processing.core");
+		PySystemState.add_package("processing.opengl");
+	}
+
 	/*
 	 * Run.
 	 */
 	public static void run(String scriptPath, String[] params){
-		interp = new InteractiveConsole();	// create jython environment
-		sys = Py.getSystemState();			// python 'sys' variable
-		
-		
-		// give jython the packages we need
-		// TODO libraries?
-		sys.add_package("info.sansgills.mode.python.wrapper");
-		sys.add_package("processing.core");
-		sys.add_package("processing.opengl");
-		
 		try {
 			//run prepend.py
 			interp.exec(prepend);