got running in a separate process functional!

Author: kazimuth

README.md

@@ -24,14 +24,16 @@ Future work:
 As I don't have the preprocessor done, code isn't very pretty right now, but it works!
 A working sketch (copy and paste into the PDE to try it out!):
 
-	import info.sansgills.mode.python.PythonPApplet as PApplet
+	import info.sansgills.mode.python.wrapper.PythonPApplet as PApplet
 
 	class Placeholder(PApplet):
 		def setup(self):
 			self.size(200, 200)
 			self.background(0)
 			self.noStroke()
 			self.ellipseMode(PApplet.CENTER)
-		
+	
 		def draw(self):
-			self.ellipse(self.mouseX, self.mouseY, 5, 5)
+			self.ellipse(self.mouseX, self.mouseY, 5, 5)
+	
+	applet = Placeholder()

build.xml

@@ -60,7 +60,7 @@
 
 		<mkdir dir="${build}" />
 
-		<javac srcdir="${src}" destdir="${build}" source="${java.target.version}" target="${java.target.version}" bootclasspath="${java.target.bootclasspath}" includeantruntime="false">
+		<javac srcdir="${src}" destdir="${build}" source="${java.target.version}" target="${java.target.version}" bootclasspath="${java.target.bootclasspath}" includeantruntime="false" debug="true">
 			<classpath>
 				<path refid="library-classpath"/>
 			</classpath>

release/PythonMode.zip

@@ -4,6 +4,7 @@
 import java.io.PrintWriter;
 
 import processing.app.Base;
+import processing.app.Library;
 import processing.app.Sketch;
 import processing.app.SketchCode;
 
@@ -44,7 +45,7 @@ public void build() throws Exception{
 		//a start
 		resultProgram = "";
 
-		SketchCode[] parts = sketch.getCode();		//TODO this function doesn't work properly, it returns old code for some reason
+		SketchCode[] parts = sketch.getCode(); //fix'd
 
 		//concatenate code strings
 		for(int i = parts.length-1; i >= 0; i--){	//iterate backwards... it seemed like a good idea at the time
@@ -59,11 +60,14 @@ public void build() throws Exception{
 		binFolder = sketch.makeTempFolder();
 
 		outFile = new File(binFolder.getAbsolutePath()
+				+ File.separator
 				+ sketch.getName().toLowerCase()
 				+ ".py");
 		outFile.createNewFile();
+	
+		
 		PrintWriter writer = new PrintWriter(outFile);
-		writer.write(resultProgram+"\n");
+		writer.print(resultProgram+"\n");
 		writer.close();
 	}
 
@@ -97,22 +101,40 @@ public int getBuildNumber(){
 
 	/*
 	 * Classes used to run the build.
+	 * 
+	 * TODO build during preprocess
 	 */
-	public String getClassPath(){
-		String cp = "";
-		String sep = System.getProperty("file.separator");
-		String modeRoot = Base.getSketchbookModesFolder().getAbsolutePath()
-				+sep
-				+"PythonMode"
-				+sep
-				+"mode"
-				+sep;
-		cp += modeRoot+"ProcessingJythonWrapper.jar;";
-		cp += modeRoot+"jython-standalone-2.7-b1.jar;";
+	public String getClassPath() {
+		//the Processing classpath
+		String cp = mode.getCoreLibrary().getClassPath();
+		
+		// From JavaMode.java:
+		// Finally, add the regular Java CLASSPATH. This contains everything
+		// imported by the PDE itself (core.jar, pde.jar, quaqua.jar) which may
+		// in fact be more of a problem.
+		String javaClassPath = System.getProperty("java.class.path");
+		// Remove quotes if any.. A messy (and frequent) Windows problem
+		if (javaClassPath.startsWith("\"") && javaClassPath.endsWith("\"")) {
+			javaClassPath = javaClassPath.substring(1,
+					javaClassPath.length() - 1);
+		}
+		cp += File.pathSeparator + javaClassPath;
+		
+		//The .jars for this mode; Jython and wrapper, primarily
+		String jythonModeLib = Base.getSketchbookModesFolder().getAbsolutePath()
+				+ File.separator
+				+ "PythonMode"
+				+ File.separator
+				+ "mode";
+		System.out.println(jythonModeLib);
+		cp += Base.contentsToClassPath(new File(jythonModeLib));
 
-		cp += mode.getCoreLibrary().getClassPath();
 
-		return cp; //TODO libraries?
+		return cp; // TODO libraries?
+	}
+
+	public String getJavaLibraryPath(){
+		return "";
 	}
 
 	/*

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

@@ -136,13 +136,13 @@ public void handleRun() {
 		new Thread(new Runnable(){
 			public void run(){
 				toolbar.activate(PythonToolbar.RUN);			//pretty lights
+				prepareRun();
 				PythonBuild build = new PythonBuild(sketch, pyMode);	//create build
 				try {
 					build.build();								//run build
 				} catch (Exception e){
 					statusError(e);								//do something pretty?
 				}
-				prepareRun();
 				runner = new PythonRunner(build, self);			//create runtime (can't use 'this', this is a runnable)
 				runner.launch(false);							//launch runtime; present = false
 			}
@@ -154,13 +154,13 @@ public void handlePresent() {
 		new Thread(new Runnable() {
 			public void run() {
 				toolbar.activate(PythonToolbar.RUN);
+				prepareRun();
 				PythonBuild build = new PythonBuild(sketch, pyMode);
 				try {
 					build.build();
 				} catch (Exception e){
 					statusError(e);
 				}
-				prepareRun();
 				runner = new PythonRunner(build, self);
 				runner.launch(true);							//present = true
 			}

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

@@ -1,8 +1,10 @@
 package info.sansgills.mode.python;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 
 import processing.app.Base;
+import processing.app.exec.StreamRedirectThread;
 import processing.core.PApplet;
 
 /**
@@ -17,10 +19,13 @@
 
 public class PythonRunner {
 	PythonBuild build;				// the python source we're working with
-	PythonEditor editor;
-	
-	Process sketchProcess;
+	PythonEditor editor;			// our editor (TODO command line?)
 
+	Process sketchProcess;			// the process we create
+
+	// Threads to redirect output / error streams from process to us
+	Thread errThread = null;
+	Thread outThread = null;
 
 	public PythonRunner(PythonBuild build, PythonEditor editor) {
 		this.build = build;
@@ -36,31 +41,69 @@ public void launch(boolean present) {
 
 	/*
 	 * Construct the command-line command to start the sketch with
+	 * 
+	 * TODO add proper machine detection & whatnot from Java Mode
 	 */
 	private String[] buildArgs(boolean present){
 		ArrayList<String> args = new ArrayList<String>();
 
 		args.add("java");
-		args.add("");
+		args.add("-cp");
+		args.add(build.getClassPath());
+		
+		args.add("info.sansgills.mode.python.wrapper.ProcessingJythonWrapper");	//main class
+		
+		args.add(build.getResultFile());	//path to script
+		args.add("Placeholder");			//sketch name
 
 		String[] out = args.toArray(new String[0]);
-		System.out.println("command: "+out);
+		
+		{//debugging
+			String cmd = "";
+			for (String c : out) {
+				cmd += c + " ";
+			}
+			System.out.println("command: " + cmd);
+		}
+		
 		return out;
 	}
 
+	/*
+	 * Start the process & a thread to track it
+	 */
 	private void exec(final String[] args){
 		new Thread(new Runnable(){
 			public void run(){
 				sketchProcess = PApplet.exec(args);
+				attach(); //TODO dirty hack
 				try{
 					int result = sketchProcess.waitFor();
+					System.out.println("result: "+result);
 				}catch(InterruptedException e){
+					System.out.println("error:");
 					e.printStackTrace();
 				}
 			}
 		}).start();
 	}
 
+	/*
+	 * Create redirect threads for stdout, stderr, etc.
+	 * 
+	 * TODO connect vm & error threads
+	 */
+	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.
 	 */

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

@@ -36,50 +36,51 @@ public class ProcessingJythonWrapper {
 	static PySystemState sys;				// for modifying python classpath, as yet
 	static PythonPApplet constructedApplet;	// Applet we pull from the interpreter
 
-	static String scriptPath;
-	static String objname = "applet";
-	
-	static String[] params;
+	static final String objname = "applet";
 
 	/**
 	 * 
 	 * First argument is the path to the script; the rest are things to pass to PApplet.
 	 * 
 	 */
 	public static void main(String[] args) {
-		scriptPath = args[0];
-		params = Arrays.copyOfRange(args, 1, args.length);
-		run();
+		String scriptPath = args[0];
+		String[] params = Arrays.copyOfRange(args, 1, args.length);
+		run(scriptPath, params);
 	}
 
 	/*
 	 * Run.
 	 */
-	public static void run(){
+	public static void run(String scriptPath, String[] params){
 		interp = new InteractiveConsole();	// create jython environment
 		sys = Py.getSystemState();			// python 'sys' variable
 
 		//path to the archive of this wrapper, for Jython to import PythonPApplet from
-		String jarPath = getJarLocation(); //TODO
-		
+		String jarPath = getJarLocation();
+				
 		sys.path.append(new PyString(jarPath));
 
-		
 		try {
 			//run the script we were given; should define a PythonPApplet subclass and create an instance
 			interp.execfile(scriptPath);
 
 			//get the applet we constructed
 			PyObject pythonApplet = interp.get(objname);
 
-			//aaaand convert to an applet through jython magic
-			constructedApplet = (PythonPApplet) pythonApplet.__tojava__(PythonPApplet.class);
+			if (pythonApplet != null) {
+				// aaaand convert to an applet through jython magic
+				constructedApplet = (PythonPApplet) pythonApplet.__tojava__(PythonPApplet.class);
+			} else {
+				throw new Exception("Couldn't construct applet.");
+			}
 
 			//run the sketch!
 			PythonPApplet.runSketch(params, constructedApplet);
 
 		} catch (Exception e){
-			System.err.println("Error running sketch: "+e.getMessage()); //TODO
+			System.err.println("Error running sketch: " + e.getMessage()); //TODO
+			e.printStackTrace();
 			System.exit(1);
 		}
 	}