From: Giovanni Gherdovich Date: Thu, 7 Oct 2010 12:38:10 +0000 (+0200) Subject: tracking xmlrpc. refactory needed: abstract xml stuff common to rspec and xmltracker. X-Git-Tag: sface-0.1-4~14 X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=b7b7f439707e66f748e6658758f17f8bcb682c17;hp=ab40b6e95de331b183c426db56fbe26cd3bdced8 tracking xmlrpc. refactory needed: abstract xml stuff common to rspec and xmltracker. --- diff --git a/sface-run b/sface-run index 74fdb73..eecabd2 100755 --- a/sface-run +++ b/sface-run @@ -11,6 +11,16 @@ exe = os.path.abspath(sys.argv[0]) def using_env(e): print "Using %s = %s" % (e, os.environ[e]) +def print_env(config): + if not config.verbose: + return + + if sys.platform == "darwin": + using_env("DYLD_FRAMEWORK_PATH") + using_env("DYLD_LIBRARY_PATH") + + using_env("PATH") + print "Using sys.path =", sys.path if sys.platform == "darwin": # for testing on mac os x 10.5 - baris @@ -20,9 +30,7 @@ if sys.platform == "darwin": CONTENTS = os.path.dirname(DIR) RESOURCES = os.path.join(CONTENTS, "Resources") FRAMEWORKS = os.path.join(CONTENTS, "Frameworks") - - sys.path.extend([RESOURCES, FRAMEWORKS]) - + DYLD_FRAMEWORK_PATH = FRAMEWORKS DYLD_LIBRARY_PATH = RESOURCES PATH = os.getenv("PATH") @@ -32,23 +40,16 @@ if sys.platform == "darwin": os.environ["PATH"] = PATH os.environ["DYLD_LIBRARY_PATH"] = DYLD_LIBRARY_PATH os.environ["DYLD_FRAMEWORK_PATH"] = DYLD_FRAMEWORK_PATH - - using_env("PATH") - using_env("DYLD_FRAMEWORK_PATH") - using_env("DYLD_LIBRARY_PATH") - print "Using sys.path =", sys.path + if os.path.exists(RESOURCES): sys.path.append(RESOURCES) + if os.path.exists(FRAMEWORKS): sys.path.append(FRAMEWORKS) elif sys.platform == "linux2": sys.path.extend(["/usr/share", "/usr/share/sface"]) - using_env("PATH") - print "Using sys.path =", sys.path - from sface.mainwindow import MainWindow from sface.config import config - def main(args): app = QApplication(args) app.setStyleSheet(''' @@ -100,4 +101,5 @@ if __name__ == "__main__": (options,args)=parser.parse_args() config.update_from_OptionParser(options) config.display("After command-line") + print_env(config) main(sys.argv) diff --git a/sface.spec b/sface.spec index 995ef68..2905cb3 100644 --- a/sface.spec +++ b/sface.spec @@ -8,7 +8,7 @@ %define name sface %define version 0.1 -%define taglevel 1 +%define taglevel 2 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -61,5 +61,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/sface/* %changelog +* Mon Sep 27 2010 Thierry Parmentelat - sface-0.1-2 +- initial version with rpm packaging + * Fri Sep 24 2010 Giovanni Gherdovich - initial package 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 = '' 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