Merge lp:~maddevelopers/mg5amcnlo/path_completion into lp:~madteam/mg5amcnlo/trunk

[Olivier Mattelaer]

change the path completion which was not working before (at least on my mac)

for example in
import model
or in
history

This is not a blokker so I propose to merge it in the trunk but not creating a release for this very minor point.

[Johan Alwall (johan-alwall)]

I did bin/mg5 and tried
import model ./<tab>
and got
./heft ./mssm ./sm ./triplet_diquarks ./uutt_sch_4fermion ./uutt_tch_4fermion
./uutt_tch_scalar ./sextet_diquarks
which is not what I would have expected - I would expect ./ to mean "this directory", i.e., the mg5 root directory in this case. Is that the behavior you had planned?

review: Needs Information

[lp:~maddevelopers/mg5amcnlo/path_completion]

79. By Olivier Mattelaer on 2011-03-02

fix also import model (the fix for history didn't fix it for import model)

[Olivier Mattelaer (olivier-mattelaer)]

Thanks this is corrected.

[Johan Alwall (johan-alwall)]

Great job Olivier, this works fine now. In the long run, since we keep coming back to the completion issues, we (meaning you of course ;-)) should probably create some tests for it.

Johan

review: Approve

=== modified file 'madgraph/interface/cmd_interface.py'
--- madgraph/interface/cmd_interface.py	2011-01-27 12:30:18 +0000
+++ madgraph/interface/cmd_interface.py	2011-03-02 22:48:27 +0000
@@ -984,16 +984,22 @@
 
         if base_dir is None:
             base_dir = os.getcwd()
+            
+        prefix, text = os.path.split(text)
+        base_dir = os.path.join(base_dir, prefix)
+        if prefix:
+            prefix += os.path.sep
+        
 
         if only_dirs:
-            completion = [f
+            completion = [prefix + f
                           for f in os.listdir(base_dir)
                           if f.startswith(text) and \
                           os.path.isdir(os.path.join(base_dir, f)) and \
                           (not f.startswith('.') or text.startswith('.'))
                           ]
         else:
-            completion = [f
+            completion = [ prefix + f
                           for f in os.listdir(base_dir)
                           if f.startswith(text) and \
                           os.path.isfile(os.path.join(base_dir, f)) and \
@@ -1001,15 +1007,15 @@
                           ]
 
             completion = completion + \
-                         [f + os.path.sep
+                         [prefix + f + os.path.sep
                           for f in os.listdir(base_dir)
                           if f.startswith(text) and \
                           os.path.isdir(os.path.join(base_dir, f)) and \
                           (not f.startswith('.') or text.startswith('.'))
                           ]
 
-        completion += [f for f in ['.'+os.path.sep, '..'+os.path.sep] if \
-                       f.startswith(text)]
+        completion += [prefix + f for f in ['.'+os.path.sep, '..'+os.path.sep] if \
+                       f.startswith(text) and not prefix.startswith('.')]
 
         return completion
 
@@ -1265,16 +1271,17 @@
             return self.list_completion(text, self._import_formats)
 
         # Directory continuation
-        if args[-1].endswith(os.path.sep):
+        if os.path.sep in args[-1] + text:
             if args[1].startswith('model'):
-                return self.path_completion(text,
-                                    os.path.join('.',*[a for a in args if \
-                                                      a.endswith(os.path.sep)]),
-                                    only_dirs = True)
+                # Directory continuation
+                return self.path_completion(text, os.path.join('.',*[a for a in args \
+                                                                    if a.endswith(os.path.sep)]),
+                                                only_dirs = True)
             else:
                 return self.path_completion(text,
                                     os.path.join('.',*[a for a in args if \
                                                       a.endswith(os.path.sep)]))
+
         # Model directory name if directory is not given
         if len(split_arg(line[0:begidx])) == 2:
             if args[1] == 'model':