Changeset 226

Timestamp:

06/10/09 11:02:47 (3 years ago)

Author:

rkuck

Message:

Added edit() command to avango-inspect

This will open an editor defined via the AVANGO_EDITOR evironment variable
providing the file to edit as the first parameter. The editor should run in
the foreground. A shell script for the popular 'gvim' editor is provided as
an example.

Location:

trunk

Files:

• avango-inspector/src/avango/inspector/__init__.py (modified) (6 diffs)
• examples/inspector/SConscript (modified) (1 diff)
• examples/inspector/gvim-foreground.sh (added)

trunk/avango-inspector/src/avango/inspector/__init__.py

@@ -6 +6 @@
 import sys
 import cStringIO
+import subprocess
+import os
+import tempfile
 
 import avango.nodefactory
 nodes = avango.nodefactory.NodeFactory(module=__name__)
+
+def _edit(data = ""):
+    result = data
+    editor = os.environ.get('AVANGO_EDITOR', '')
+    if not editor:
+        return result
+    try:
+        buffer = tempfile.mkstemp(suffix = '.py')
+        os.write(buffer[0], data)
+        os.close(buffer[0])
+        subprocess.call([editor, buffer[1]])
+        file = open(buffer[1])
+        result = file.read()
+    finally:
+        os.unlink(buffer[1])
+    return result
 
 class Instances(object):
@@ -21 +40 @@
         self.always_evaluate(True)
 
-        self.sandbox = { 'inst': Instances() }
+        self.sandbox = { 'inst': Instances(), 'edit': self._edit }
 
         self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
@@ -85 +104 @@
         self.sandbox['field'] = field
 
+        self._exec(self.entry_field.get_text())
+        self.entry_field.set_text("")
+
+        self.update_model()
+
+    def _exec(self, cmd):
+        self.output.insert_with_tags(self.output.get_end_iter(), cmd+"\n", self.output_command_tag)
+
         stdout = sys.stdout 
         redirected_stdout = cStringIO.StringIO()
@@ -93 +120 @@
 
         try:
-            exec self.entry_field.get_text() in globals(), self.sandbox
+            exec cmd in globals(), self.sandbox
         except:
             cls, obj, traceback = sys.exc_info()
@@ -101 +128 @@
         sys.stderr = stderr
 
-        self.output.insert_with_tags(self.output.get_end_iter(), self.entry_field.get_text()+"\n", self.output_command_tag)
         self.output.insert_with_tags(self.output.get_end_iter(), redirected_stderr.getvalue(), self.output_error_tag)
         self.output.insert(self.output.get_end_iter(), redirected_stdout.getvalue())
-        self.entry_field.set_text("")
-
-        self.update_model()
 
     def handle_output_scroll(self, widget, data=None):
@@ -132 +155 @@
         self.view.expand_all()
 
+    def _edit(self):
+        cmds = _edit()
+        self._exec(cmds)
+
 
     @avango.script.field_has_changed(Children)

trunk/examples/inspector/SConscript

@@ -30 +30 @@
 files = Split('''
               inspector.py
+              gvim-foreground.sh
               ''')