Mercurial > python-cmd2

changeset 46:27b45b33a574

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pipe experiment
author catherine@cordelia
date Tue, 03 Jun 2008 08:01:16 -0400
parents 67cde3f501de
children 927bc07467de
files cmd2.py
diffstat 1 files changed, 27 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/cmd2.py	Tue Jun 03 07:41:46 2008 -0400
+++ b/cmd2.py	Tue Jun 03 08:01:16 2008 -0400
@@ -103,7 +103,6 @@
         can_clip = True
     except AttributeError:  # check_call not defined, Python < 2.5
         teststring = 'Testing for presence of xclip.'
-        #import pdb; pdb.set_trace()
         xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
         xclipproc.stdin.write(teststring)
         xclipproc.stdin.close()
@@ -240,30 +239,38 @@
             statement = self.finishStatement(statement)
         statekeeper = None
         stop = 0
-        statement, redirect, mode = self.parseRedirectors(statement)
-        if redirect == self._TO_PASTE_BUFFER:
-            try:
-                clipcontents = getPasteBuffer()
-                if mode in ('w', 'a'):
+        statement, redirect = self.pipeFinder(statement)
+        if redirect:
+            redirect = subprocess.Popen(redirect, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
+            redirect.stdin = self.stdout
+            stop = cmd.Cmd.onecmd(self, statement)            
+            self.stdout.write(redirect.stdout.read())
+            return stop # didn't record in history
+        else:
+            statement, redirect, mode = self.parseRedirectors(statement)
+            if redirect == self._TO_PASTE_BUFFER:
+                try:
+                    clipcontents = getPasteBuffer()
+                    if mode in ('w', 'a'):
+                        statekeeper = Statekeeper(self, ('stdout',))
+                        self.stdout = tempfile.TemporaryFile()
+                        if mode == 'a':
+                            self.stdout.write(clipcontents)
+                    else:
+                        statement = '%s %s' % (statement, clipcontents)
+                except OSError, e:
+                    print e
+                    return 0
+            elif redirect:
+                if mode in ('w','a'):
                     statekeeper = Statekeeper(self, ('stdout',))
-                    self.stdout = tempfile.TemporaryFile()
-                    if mode == 'a':
-                        self.stdout.write(clipcontents)
+                    self.stdout = open(redirect, mode)            
                 else:
-                    statement = '%s %s' % (statement, clipcontents)
-            except OSError, e:
-                print e
-                return 0
-        elif redirect:
-            if mode in ('w','a'):
-                statekeeper = Statekeeper(self, ('stdout',))
-                self.stdout = open(redirect, mode)            
-            else:
-                statement = '%s %s' % (statement, self.fileimport(statement=statement, source=redirect))
+                    statement = '%s %s' % (statement, self.fileimport(statement=statement, source=redirect))
         stop = cmd.Cmd.onecmd(self, statement)
         try:
             if command not in self.excludeFromHistory:
-                self.history.append(statement)
+                self.history.append(statement) # or should we append the unmodified statement?
         finally:
             if statekeeper:
                 if redirect == self._TO_PASTE_BUFFER: