Changeset 1459

Timestamp:

07/06/08 16:09:42 (2 months ago)

Author:

rob

Message:

Fixed #484: Added RunFilter? command to run an arbitary program using current buffer as input

Location:

trunk/peppy

Files:

• mainmenu.py (modified) (5 diffs)
• major.py (modified) (2 diffs)
• plugins/error_log.py (modified) (5 diffs)

trunk/peppy/mainmenu.py

@@ -469 +469 @@
         self.frame.open("about:demo.txt")
 
-class RunScript(SelectAction):
+
+class RunMixin(object):
+    @classmethod
+    def worksWithMajorMode(cls, mode):
+        return hasattr(mode, 'startInterpreter')
+    
+    def isEnabled(self):
+        return hasattr(self.mode, 'startInterpreter') and not hasattr(self.mode, 'process')
+
+class RunScript(RunMixin, SelectAction):
     alias = "run-script"
     name = "Run"
@@ -477 +486 @@
     key_bindings = {'default': "F5"}
 
-    @classmethod
-    def worksWithMajorMode(cls, mode):
-        return hasattr(mode, 'startInterpreter')
-    
-    def isEnabled(self):
-        return hasattr(self.mode, 'startInterpreter') and not hasattr(self.mode, 'process')
-
     def action(self, index=-1, multiplier=1):
         self.mode.startInterpreter()
 
-
-class RunScriptWithArgs(RunScript):
+class RunScriptWithArgs(RunMixin, SelectAction):
     alias = "run-script-with-args"
     name = "Run with Args"
@@ -494 +495 @@
     icon = "icons/script_edit.png"
     default_menu = ("Tools", 2)
-    
-    # If subclassing another action, make sure to reset global_id, or the
-    # menu system will use the existing global id for the new action
-    global_id = None
     key_bindings = {'default': "C-F5"}
 
@@ -508 +505 @@
         self.mode.startInterpreter(text)
 
-
-class StopScript(RunScript):
+class RunFilter(RunMixin, SelectAction):
+    """Run an external program on this file"""
+    alias = "run-filter"
+    name = "Run Filter"
+    default_menu = ("Tools", 3)
+
+    def action(self, index=-1, multiplier=1):
+        minibuffer = TextMinibuffer(self.mode, self, label="Command line:",
+                                    initial = self.mode.getScriptArgs())
+        self.mode.setMinibuffer(minibuffer)
+        self.mode.setStatusText("Enter command line, %s will be replaced by full path to file")
+
+    def processMinibuffer(self, minibuffer, mode, text):
+        self.mode.startCommandLine(text)
+
+class StopScript(RunMixin, SelectAction):
     alias = "stop-script"
     name = "Stop"
     tooltip = "Stop the currently running script"
     icon = 'icons/stop.png'
-    default_menu = ("Tools", 3)
-    global_id = None
+    default_menu = ("Tools", 9)
     key_bindings = {'win': "C-CANCEL", 'emacs': "C-CANCEL", 'mac': 'C-.'}
     
@@ -884 +894 @@
                 Undo, Redo, Cut, Copy, Paste, PasteAtColumn, SelectAll,
 
-                RunScript, RunScriptWithArgs, StopScript,
+                RunScript, RunScriptWithArgs, RunFilter, StopScript,
 
                 MajorModeSelect, MinorModeShow, SidebarShow,

trunk/peppy/major.py

@@ -1034 +1034 @@
             self.scriptArgs = argstring
             
-        if self.buffer.readonly or not self.classprefs.autosave_before_run:
-            msg = "You must save this file to the local filesystem\nbefore you can run it through the interpreter."
-            dlg = wx.MessageDialog(wx.GetApp().GetTopWindow(), msg, "Save the file!", wx.OK | wx.ICON_ERROR )
-            retval=dlg.ShowModal()
-            return
-        else:
-            self.save()
-
         bangpath = None
         first = self.GetLine(0)
@@ -1063 +1055 @@
         else:
             cmd = self.getCommandLine(bangpath)
+            self.startCommandLine(cmd)
+    
+    def expandCommandLine(self, cmd):
+        """Expand the command line to include the filename of the buffer"""
+        if '%' in cmd:
+            cmd = cmd % self.buffer.getFilename()
+        else:
+            cmd = "%s %s" % (cmd, self.buffer.getFilename())
+        return cmd
+    
+    def startCommandLine(self, cmd):
+        """Attempt to create a process using the command line"""
+        if hasattr(self, 'process'):
+            self.frame.setStatusText("Already running a process.")
+        else:
+            if self.buffer.readonly or not self.classprefs.autosave_before_run:
+                msg = "You must save this file to the local filesystem\nbefore you can run it through the interpreter."
+                dlg = wx.MessageDialog(wx.GetApp().GetTopWindow(), msg, "Save the file!", wx.OK | wx.ICON_ERROR )
+                retval=dlg.ShowModal()
+                return
+            else:
+                self.save()
+
+            cmd = self.expandCommandLine(cmd)
             if self.classprefs.output_log == 0:
                 output = self

trunk/peppy/plugins/error_log.py

@@ -21 +21 @@
         BoolParam('show', False),
         BoolParam('always_scroll', False),
-        StrParam('filename_match_regex', "  File \"(.+)\", line ([0-9]+)", 'Regular expression used to match pathnames in the output'),
+        StrParam('filename_match_regex', "^  File \"(.+)\", line ([0-9]+)", 'Regular expression used to match pathnames in the output'),
         )
 
@@ -32 +32 @@
         
         self.filere = re.compile(self.classprefs.filename_match_regex)
+        self.stdre = re.compile("^((?:[a-zA-Z]:)?.+):([0-9]+):")
 
     def addMessage(self, text):
@@ -57 +58 @@
         self.scanForFilenames()
     
+    def matchLine(self, text, i=0):
+        match = self.filere.search(text, i)
+        if match:
+            return match
+        match = self.stdre.search(text, i)
+        if match:
+            return match
+        return None
+    
     def scanForFilenames(self):
         if not hasattr(self, 'last_matched_filename'):
@@ -67 +77 @@
         i = 0
         while i < len(text):
-            match = self.filere.search(text, i)
+            match = self.matchLine(text, i)
             if not match:
                 break
@@ -87 +97 @@
             text = self.GetLine(line)
             #dprint("text=%s" % text)
-            match = self.filere.search(text)
+            match = self.matchLine(text)
             if match:
                 filename = match.group(1)