reverted last commit, which was just few print statement. Looks like sface is keeping...

[sface.git] / sface / sfiprocess.py

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 6101889..1e93b29 100644 (file)
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -5,6 +5,7 @@ import time
 
 from PyQt4.QtCore import *
 from sface.config import config
+from sface.xmlrpcwindow import XmlrpcTracker
 
 def find_executable(exec_name):
     """find the given executable in $PATH"""
@@ -23,9 +24,22 @@ class SfiProcess(QObject):
         self.process = QProcess()
         self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
                      self.processFinished)
+        
+        self.xmlrpctracker = XmlrpcTracker()
+        # in case self.output is read by the XmlrpcTracker 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)
 
@@ -36,6 +50,20 @@ 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 XmlrpcTracker too.
+        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()
@@ -112,3 +140,5 @@ class SfiProcess(QObject):
         if config.verbose:
             command = "%s %s" % (self.exe, self.args.join(" "))
             print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'
+            self.xmlrpctracker.getAndPrint(self.output)
+