Changeset 1439

Timestamp:

07/01/08 21:49:42 (5 months ago)

Author:

rob

Message:

Fixed #469: added output_log classpref to JobControlMixin? to choose where output goes: minor mode or sidebar
* changed ErrorLogSidebar? to only print output to the requested frame
* added sidebar controller to wrap the JobOutputMixin? interface and send the output to the Information sidebar

Location:

trunk

Files:

• peppy/major.py (modified) (5 diffs)
• peppy/plugins/error_log.py (modified) (2 diffs)
• peppy/sidebar.py (modified) (2 diffs)
• tests/samples/job-control.py (modified) (1 diff)

trunk/peppy/major.py

@@ -42 +42 @@
 from peppy.debug import *
 from peppy.minor import *
+from peppy.sidebar import *
 from peppy.yapsy.plugins import *
 from peppy.editra import *
@@ -949 +950 @@
         PathParam('interpreter_exe', '', 'Program that can interpret this text and return results on standard output', fullwidth=True),
         BoolParam('autosave_before_run', True, 'Automatically save without prompting before running script'),
+        IndexChoiceParam('output_log',
+                         ['use minor mode', 'use sidebar'],
+                         1, 'Does the output stay in the tab (minor mode) or visible to all tabs in the frame (major mode)'),
         )
 
@@ -1052 +1056 @@
         else:
             cmd = self.getCommandLine(bangpath)
-            ProcessManager().run(cmd, self.buffer.cwd(), self)
-
+            if self.classprefs.output_log == 0:
+                output = self
+            else:
+                output = JobOutputSidebarController(self.frame, self.registerProcess, self.deregisterProcess)
+            ProcessManager().run(cmd, self.buffer.cwd(), output)
+
+    def registerProcess(self, job):
+        self.process = job
+    
+    def deregisterProcess(self, job):
+        del self.process
+    
     def stopInterpreter(self):
         """Interface used by actions to kill the currently running job.
@@ -1071 +1085 @@
         self.log = self.findMinorMode("OutputLog")
         if self.log:
-            self.log.showMessage("\n" + _("Started %s on %s") %
-                                 (job.cmd,
-                                  time.asctime(time.localtime(time.time()))) +
-                                 "\n")
+            text = "\n" + _("Started %s on %s") % (job.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+            self.log.showMessage(text)
 
     def stdoutCallback(self, job, text):
@@ -1091 +1103 @@
         del self.process
         if self.log:
-            self.log.showMessage(_("Finished %s on %s") %
-                                 (job.cmd,
-                                  time.asctime(time.localtime(time.time()))) +
-                                 "\n")
+            text = "\n" + _("Finished %s on %s") % (job.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+            self.log.showMessage(text)
 
 

trunk/peppy/plugins/error_log.py

@@ -140 +140 @@
 
     def showError(self, message=None):
-        if self.frame == wx.GetApp().GetTopWindow():
-            paneinfo = self.frame._mgr.GetPane(self)
+        data = message.data
+        if isinstance(data, tuple) or isinstance(data, list):
+            frame = data[0]
+            text = data[1]
+        else:
+            frame = wx.GetApp().GetTopWindow()
+            text = data
+        if self.frame == frame:
+            paneinfo = frame._mgr.GetPane(self)
             if self.classprefs.unhide_on_message:
                 if not paneinfo.IsShown():
                     paneinfo.Show(True)
-                    self.frame._mgr.Update()
-            text = message.data
+                    frame._mgr.Update()
             if message.topic[-1] == 'wrap':
                 columns = 72
@@ -177 +183 @@
         IntParam('min_height', 20),
     )
-    
+
+
 class OutputLogMinorMode(MinorMode, LoggingSTC):
     """An error log using message passing.

trunk/peppy/sidebar.py

@@ -21 +21 @@
 from peppy.debug import *
 from peppy.lib.userparams import *
-
+from peppy.lib.processmanager import *
 
 class Sidebar(ClassPrefs, debugmixin):
@@ -85 +85 @@
         """
         pass
+
+
+class JobOutputSidebarController(JobOutputMixin):
+    """Simple wrapper around the JobOutputMixin interface to direct all output
+    to the Information sidebar.
+    """
+    def __init__(self, frame, startCallback, finishCallback):
+        self.frame = frame
+        self.startCallback = startCallback
+        self.finishCallback = finishCallback
+        
+    def startupCallback(self, job):
+        """Callback from the JobOutputMixin when a job is successfully
+        started.
+        """
+        self.startCallback(job)
+        text = "\n" + _("Started %s on %s") % (job.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+        Publisher().sendMessage('peppy.log.info', (self.frame, text))
+
+    def stdoutCallback(self, job, text):
+        """Callback from the JobOutputMixin for a block of text on stdout."""
+        Publisher().sendMessage('peppy.log.info', (self.frame, text))
+
+    def stderrCallback(self, job, text):
+        """Callback from the JobOutputMixin for a block of text on stderr."""
+        Publisher().sendMessage('peppy.log.info', (self.frame, text))
+
+    def finishedCallback(self, job):
+        """Callback from the JobOutputMixin when the job terminates."""
+        self.finishCallback(job)
+        text = "\n" + _("Finished %s on %s") % (job.cmd, time.asctime(time.localtime(time.time()))) + "\n"
+        Publisher().sendMessage('peppy.log.info', (self.frame, text))

trunk/tests/samples/job-control.py

@@ -3 +3 @@
 import time
 
-import euaoeu
+#import euaoeu
 
 for x in range(100):