Changeset 1464

Timestamp:

07/07/08 09:19:35 (8 weeks ago)

Author:

rob

Message:

Moved start and finish message into Job as methods

Location:

trunk/peppy

Files:

• lib/processmanager.py (modified) (2 diffs)
• major.py (modified) (2 diffs)
• sidebar.py (modified) (2 diffs)

trunk/peppy/lib/processmanager.py

@@ -119 +119 @@
     debuglevel = 0
     
+    # Use the unicode rightward double arrow as a delimiter
+    arrow = u"\u21d2 "
+    
     def __init__(self, cmd, working_dir, job_output):
         self.pid = None
@@ -129 +132 @@
         self.stderr = None
         self.exit_code = 0
+    
+    def getStartMessage(self):
+        return self.arrow + _("Started %s on %s") % (self.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+
+    def getFinishMessage(self):
+        return self.arrow + _("exit code = %s") % self.exit_code + "\n" + self.arrow + _("Finished %s on %s") % (self.cmd, time.asctime(time.localtime(time.time()))) + "\n"
 
     def run(self, text=""):

trunk/peppy/major.py

@@ -1109 +1109 @@
         self.log = self.findMinorMode("OutputLog")
         if self.log:
-            text = "\n" + _(">> Started %s on %s") % (job.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+            text = "\n" + job.getStartMessage()
             self.log.showMessage(text)
 
@@ -1127 +1127 @@
         del self.process
         if self.log:
-            text = "\n" + _(">> exit code = %d\n>> Finished %s on %s") % (job.exit_code, job.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+            text = "\n" + job.getFinishMessage()
             self.log.showMessage(text)
 

trunk/peppy/sidebar.py

@@ -101 +101 @@
         """
         self.startCallback(job)
-        text = "\n" + _(">> Started %s on %s") % (job.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+        text = "\n" + job.getStartMessage()
         Publisher().sendMessage('peppy.log.info', (self.frame, text))
 
@@ -115 +115 @@
         """Callback from the JobOutputMixin when the job terminates."""
         self.finishCallback(job)
-        text = "\n" + _(">> exit code = %d\n>> Finished %s on %s") % (job.exit_code, job.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+        text = "\n" + job.getFinishMessage()
         Publisher().sendMessage('peppy.log.info', (self.frame, text))