Changeset 1459 for trunk/peppy/major.py

Timestamp:

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

Author:

rob

Message:

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

Files:

• trunk/peppy/major.py (modified) (2 diffs)

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