PythonInterpreter: Added code to handle XmlRpc over pipe, but not work yet. Also forgot to update project file for name changes in previous commit

spillz · spillz · commit c1e01a324789 · 2013-11-18T06:01:05.000Z
diff --git a/PythonInterpreter/PythonInterpCtrl.cpp b/PythonInterpreter/PythonInterpCtrl.cpp
@@ -169,17 +169,18 @@ long PythonInterpCtrl::LaunchProcess(const wxString &processcmd, const wxArraySt
 {
     if(!IsDead())
         return -1;
-    //wxMessageBox(m_portalloc.GetPorts());
     m_port=m_portalloc.RequestPort();
     if(m_port<0)
         return -1;
-    //TODO: get the command and working dir from the
+//TODO: XmlRpc over pipe doesn't work because of the way interp.py is implemented
+//    m_port = -1; //Use XmlRpc over pipe
+    //TODO: get the command and working dir from config
 #ifdef __WXMSW__
     wxString cmd=_T("cmd /c interp.py ")+wxString::Format(_T(" %i"),m_port); //TODO: this could have process destruction issues on earlier version of wxWidgets (kills cmd, but not python)
     wxString python=_T("\\python");
     wxString interp=_T("\\interp.py");
 #else
-    wxString cmd=_T("python interp.py ")+wxString::Format(_T(" %i"),m_port);
+    wxString cmd=_T("python -u interp.py ")+wxString::Format(_T(" %i"),m_port);
     wxString python=_T("/python");
     wxString interp=_T("/interp.py");
 #endif
diff --git a/PythonInterpreter/PythonInterpCtrl.h b/PythonInterpreter/PythonInterpCtrl.h
@@ -143,8 +143,6 @@ class PythonInterpCtrl : public ShellCtrlBase
 
         void stdin_append(const wxString &data);
         wxString stdin_retrieve();
-        wxString stdout_retrieve();
-        wxString stderr_retrieve();
 
     protected:
         bool RunCode(const wxString &codestr);
diff --git a/PythonInterpreter/PythonInterpreter-unix.cbp b/PythonInterpreter/PythonInterpreter-unix.cbp
@@ -105,8 +105,6 @@
 			<Add directory="$(#cb)/devel" />
 			<Add directory="../XmlRpcEmbedder" />
 		</Linker>
-		<Unit filename="PyPlugin.cpp" />
-		<Unit filename="PyPlugin.h" />
 		<Unit filename="PythonInterpCtrl.cpp">
 			<Option target="default" />
 			<Option target="toolspluslink" />
@@ -115,6 +113,8 @@
 			<Option target="default" />
 			<Option target="toolspluslink" />
 		</Unit>
+		<Unit filename="PythonInterpreter.cpp" />
+		<Unit filename="PythonInterpreter.h" />
 		<Unit filename="Resources/dialogs.fbp">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
diff --git a/PythonInterpreter/python/interp.py b/PythonInterpreter/python/interp.py
@@ -4,6 +4,65 @@
 import time
 from SimpleXMLRPCServer import SimpleXMLRPCServer
 
+import os
+import struct
+import xmlrpclib
+
+o_stdin = sys.stdin
+o_stdout = sys.stdout
+
+isz=struct.calcsize('I')
+
+class XmlRpcPipeServer:
+    '''
+    A simple XMLRPC server implementation that uses the stdin, stdout
+    pipes to communicate with the owner of the process. Implements
+    most of the features of SimpleXMLRPCServer
+    '''
+    def __init__(self):
+        self.fn_dict={}
+        self.inpipe=o_stdin
+        self.outpipe=o_stdout
+        sys.stdout=open(os.devnull,'wb')
+        sys.stderr=open(os.devnull,'wb')
+
+    def register_function(self,fn,name):
+        self.fn_dict[name]=fn
+
+    def register_introspection_functions(self):
+        pass
+
+    def handle_request(self):
+        ##TODO: Need more error handling!
+        size_buf = self.inpipe.read(isz)
+        size = struct.unpack('I',size_buf)[0]
+        call_xml = self.inpipe.read(size)
+        self.outpipe.write(struct.pack('c','M'))
+        name=''
+        try:
+            args,name = xmlrpclib.loads(call_xml)
+            result = self.__call__(name, *args)
+            if not isinstance(result,tuple):
+                result=(result,)
+        except:
+            import traceback
+            result ='Error running call '+name+'\n'+call_xml+'\n'
+            result += '\n'.join(traceback.format_exception(*sys.exc_info()))
+            result = (result,)
+        try:
+            res_xml = bytes(xmlrpclib.dumps(result, methodresponse=True))
+        except:
+            res_xml = bytes(xmlrpclib.dumps('Method result of length %i could not be converted to XML'%(len(res_xml)), methodresponse=True))
+        size = len(res_xml)
+        self.outpipe.write(struct.pack('I',size))
+        self.outpipe.write(res_xml)
+        self.outpipe.flush()
+
+    def __call__(self,name,*args):
+        return self.fn_dict[name](*args)
+
+
+
 DEBUG=False
 
 if DEBUG:
@@ -134,7 +193,10 @@ def __init__(self,port):
     def start_interp(self):
         self.interp.main_loop()
     def run(self):
-        self.server = SimpleXMLRPCServer(("localhost", self.port))
+        if self.port==-1:
+            self.server = XmlRpcPipeServer()
+        else:
+            self.server = SimpleXMLRPCServer(("localhost", self.port))
         self.server.logRequests=0
         self.server.register_introspection_functions()
         #self.server.socket.settimeout(self.timeout) ##timeouts cause probs
@@ -180,7 +242,7 @@ def cont(self,stdin):
         logmsg('returning result ',result)
         return result
         #return status, stdout, stderr
-    def break(self):
+    def break_code(self):
         if self.interp._runningeval:
             raise KeyboardInterrupt
 
@@ -197,7 +259,7 @@ def cmd_err():
         port = int(sys.argv[1])
     except:
         cmd_err()
-    if port<=0:
+    if port<-1:
         cmd_err()
 
     logmsg('starting server on port', port)
