X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=ca2c023f03d88507b43c37a7ce79007e88f7ba1a;hp=227a35ba8c635f46c5f64262a447a0199fd2d20b;hb=b7b7f439707e66f748e6658758f17f8bcb682c17;hpb=ab40b6e95de331b183c426db56fbe26cd3bdced8;ds=sidebyside

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 227a35b..ca2c023 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -30,9 +30,20 @@ class SfiProcess(QObject):
                      self.processFinished)
         
         self.xmltracker = XmlTracker()
+        # in case self.output is read by the XmlTracker before any
+        # readyReadStandardOutput signal
+        self.output = ''
+
+        self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
+                     self.processStandardOutput)
+        self.connect(self.process, SIGNAL("readyReadStandardError()"),
+                     self.processStandardError)
 
     def __init_command(self, args):
         self.args = QStringList()
+        if config.debug:
+            # this shows xmlrpc conversation, see sfi.py docs.
+            self.args << QString('-D')
         for arg in args:
             self.args << QString(arg)
 
@@ -43,6 +54,22 @@ class SfiProcess(QObject):
     def isRunning(self):
         return self.process.state() != QProcess.NotRunning
 
+    def processStandardOutput(self):
+        # NOTE: The signal readyReadStandardOutput is emitted when
+        # the process has made new data available through its standard output channel.
+        # But the process is not necessarily finished.
+        # It's cool to have this method wo we print the stdOut live,
+        # but we must be carefull with self.output, used by xmlTracker too.
+        print "SETTING SELF.OUTPUT"
+        tmpOut = self.process.readAllStandardOutput()
+        if config.debug:
+            print tmpOut        
+        self.output += tmpOut
+
+
+    def processStandardError(self):
+        print self.process.readAllStandardError()
+
     def processFinished(self):
         if self.process.exitStatus() == QProcess.CrashExit:
             print self.readOutput()
@@ -102,10 +129,8 @@ class SfiProcess(QObject):
         return filename
 
     def start(self):
-        self.args.prepend(QString('-D'))
         self.trace_command()
         self.process.start(self.exe, self.args)
-        print self.args
 
     def readOutput(self):
         if self.process.state() == QProcess.NotRunning:
@@ -116,34 +141,28 @@ class SfiProcess(QObject):
             self._trace=time.time()
             command = "%s %s" % (self.exe, self.args.join(" "))
             print time.strftime('%M:%S'),'Invoking',command
-            #self.xmltracker.startTracking()
-            #print "tracking"
 
     def trace_end (self):
         if config.verbose:
-            #print "stop tracking"
-            #self.xmltracker.stopTracking()
             command = "%s %s" % (self.exe, self.args.join(" "))
             print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'
-            self.xmltracker.getAndPrint(self.process.readAllStandardOutput())
+            self.xmltracker.getAndPrint(self.output)
 
 class XmlTracker():
     def __init__(self):
-        self.xmlrpcwindow = XmlrpcWindow()
+        self.xmlrpcWindow = XmlrpcWindow()
 
     def getAndPrint(self, rawOutput):
         self.store(rawOutput)
         self.extractXml()
-        self.xmlrpcwindow.setData(self.xml)
+        self.xmlrpcWindow.setData(self.xml)
         self.showXmlrpc()
-        self.test()
 
     def showXmlrpc(self):
-        # set all camel case
-        self.xmlrpcwindow.show()
-        self.xmlrpcwindow.resize(500, 640)
-        self.xmlrpcwindow.raise_()
-        self.xmlrpcwindow.activateWindow()
+        self.xmlrpcWindow.show()
+        self.xmlrpcWindow.resize(500, 640)
+        self.xmlrpcWindow.raise_()
+        self.xmlrpcWindow.activateWindow()
 
     def store(self, rawOutput):
         self.rawOutput = rawOutput
@@ -155,16 +174,14 @@ class XmlTracker():
         replies = re.compile(pttrnAns, re.DOTALL).findall(self.rawOutput)
         # cleaning
         answers = map(lambda x: x.replace('\\n','\n'), answers)
-        replies = map(lambda x: x.replace('\\n','\n').replace("'body: '", ''), replies)
+        replies = map(lambda x: x.replace('\\n','\n').replace("'\nbody: '", ''), replies)
+        replies.reverse() # so that I use pop() as popleft
         # A well-formed XML document must have one, and only one, top-level element
         self.xml = '<debug>'
         for ans in answers:
             self.xml += ans + replies.pop()
         self.xml += '</debug>'
 
-    def test(self):
-        print self.xml
-        
     def stats(self):
         # statistics: round-trip time, size of the com
         pass