ipy_leo: rename wb..val => wb..v, %leo now opens a file in leo

IPython/Extensions/ipy_leo.py

@@ -53,7 +53,9 b' def all_cells():'
     
 
 class TrivialLeoWorkbook:
-    """ class to find cells """
+    """ class to find cells with simple syntax
+    
+    """
     def __getattr__(self, key):
         cells = all_cells()
         p = cells[key]
@@ -80,21 +82,29 b' class LeoNode(object):'
     def get_h(self): return self.p.headString()
     def set_h(self,val):
         print "set head",val 
+        c.beginUpdate() 
+        try:
         c.setHeadString(self.p,val)
+        finally:
+            c.endUpdate()
         
     h = property( get_h, set_h)  
 
     def get_b(self): return self.p.bodyString()
     def set_b(self,val):
         print "set body",val 
+        c.beginUpdate()
+        try: 
         c.setBodyString(self.p, val)
+        finally:
+            c.endUpdate()
     
     b = property(get_b, set_b)
     
     def set_val(self, val):
         self.b = pprint.pformat(val)
         
-    val = property(lambda self: ip.ev(self.b.strip()), set_val)
+    v = property(lambda self: ip.ev(self.b.strip()), set_val)
     
     def set_l(self,val):
         self.b = '\n'.join(val )
@@ -130,6 +140,9 b' def workbook_complete(obj, prev):'
     
 
 def add_var(varname, value = _dummyval):
+    c.beginUpdate()
+    try:
+        
     nodename = '@ipy-var ' + varname
     p2 = g.findNodeAnywhere(c,nodename)
     if not c.positionExists(p2):
@@ -145,11 +158,15 b' def add_var(varname, value = _dummyval):'
         formatted = format_for_leo(val)
         c.setBodyString(p2,formatted)
     return p2
+    finally:
+        c.endUpdate()
 
 def add_file(self,fname):
     p2 = c.currentPosition().insertAfter()
 
 def push_script(p):
+    c.beginUpdate()
+    try:
     ohist = ip.IP.output_hist 
     hstart = len(ip.IP.input_hist)
     script = g.getScript(c,p,useSelectedText=False,forcePythonSentinels=False,useSentinels=False)
@@ -173,6 +190,8 b' def push_script(p):'
     
     if not has_output:
         g.es('ipy run: %s' %( p.headString(),), tabName = 'IPython')
+    finally:
+        c.endUpdate()
     
     
 def eval_body(body):
@@ -190,10 +209,6 b' def push_variable(p,varname):'
     g.es('ipy var: %s' % (varname,), tabName = "IPython")
     
 def push_from_leo(p):
-    # headstring without @ are just scripts
-    if not p.headString().startswith('@'):
-        push_script(p)
-        return
     tup = p.headString().split(None,1)
     # @ipy foo is variable foo
     if len(tup) == 2 and tup[0] == '@ipy':
@@ -201,15 +216,33 b' def push_from_leo(p):'
         push_variable(p,varname)
         return
     
+    push_script(p)
+    return
+    
+    
 ip.user_ns['leox'].push = push_from_leo    
     
 def leo_f(self,s):
-    ip = self.getapi()
-    s = s.strip()
-    if s in ip.user_ns:
-        add_var(s)
-    elif os.path.isfile(s):
-        # todo open file
-        pass
+    """ open file(s) in Leo
+    
+    Takes an mglob pattern, e.g. '%leo *.cpp' or %leo 'rec:*.cpp'  
+    """
+    import os
+    from IPython.external import mglob
+    
+    files = mglob.expand(s)
+    c.beginUpdate()
+    try:
+        for fname in files:
+            p = g.findNodeAnywhere(c,'@auto ' + fname)
+            if not p:
+                p = c.currentPosition().insertAfter()
+            
+            p.setHeadString('@auto ' + fname)
+            if os.path.isfile(fname):
+                c.setBodyString(p,open(fname).read())
+            c.selectPosition(p)
+    finally:
+        c.endUpdate()
 
 ip.expose_magic('leo',leo_f)