X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fsfiprocess.py;h=1e93b294c6186b86ad57404bb1079c82ae4126e9;hb=99a5613d5bf887070a67eb2208ba907091fe41fb;hp=227a35ba8c635f46c5f64262a447a0199fd2d20b;hpb=ab40b6e95de331b183c426db56fbe26cd3bdced8;p=sface.git
diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 227a35b..1e93b29 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -2,14 +2,10 @@
import os
import sys
import time
-import re
from PyQt4.QtCore import *
-from PyQt4.QtXml import QDomDocument
from sface.config import config
-from sface.logwindow import LogIO
-from sface.rspecwindow import RSpecWindow, DomModel
-
+from sface.xmlrpcwindow import XmlrpcTracker
def find_executable(exec_name):
"""find the given executable in $PATH"""
@@ -29,10 +25,21 @@ class SfiProcess(QObject):
self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
self.processFinished)
- self.xmltracker = XmlTracker()
+ 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)
@@ -43,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()
@@ -102,10 +123,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,82 +135,10 @@ 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())
-
-class XmlTracker():
- def __init__(self):
- self.xmlrpcwindow = XmlrpcWindow()
-
- def getAndPrint(self, rawOutput):
- self.store(rawOutput)
- self.extractXml()
- 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()
-
- def store(self, rawOutput):
- self.rawOutput = rawOutput
-
- def extractXml(self):
- pttrnAsk = '.*?'
- pttrnAns = '.*?'
- answers = re.compile(pttrnAsk, re.DOTALL).findall(self.rawOutput)
- 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)
- # A well-formed XML document must have one, and only one, top-level element
- self.xml = ''
- for ans in answers:
- self.xml += ans + replies.pop()
- self.xml += ''
-
- def test(self):
- print self.xml
-
- def stats(self):
- # statistics: round-trip time, size of the com
- pass
-
- def prettyPrint(self, XmlComs):
- # just for testing
- print XmlComs
+ self.xmlrpctracker.getAndPrint(self.output)
-class XmlrpcWindow(RSpecWindow):
- def __init__(self, parent=None):
- # super __init__() calls updateView,
- # which assumes you have some data
- self.data = ''
- RSpecWindow.__init__(self, parent)
-
- def setData(self, XmlrpcCom):
- self.data = XmlrpcCom
-
- def updateView(self):
- del self.document
- del self.model
- self.document = None
- self.model = None
-
- self.document = QDomDocument("RSpec")
- self.document.setContent(self.data)
- self.model = DomModel(self.document, self)
-
- self.view.setModel(self.model)
- self.view.expand(self.model.index(0, 0)) #expand first level only