[GRASS-SVN] r67901 - grass/trunk/scripts/g.extension

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-02-20 03:49:56 -0800 (Sat, 20 Feb 2016)
New Revision: 67901

Modified:
   grass/trunk/scripts/g.extension/g.extension.py
Log:
g.extension: implemenent flags combination -ag to print installed extension in shell script style (useful in wxGUI)

Modified: grass/trunk/scripts/g.extension/g.extension.py
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.py	2016-02-20 10:45:35 UTC (rev 67900)
+++ grass/trunk/scripts/g.extension/g.extension.py	2016-02-20 11:49:56 UTC (rev 67901)
@@ -120,7 +120,8 @@
 
 #%rules
 #% required: extension, -l, -c, -g, -a
-#% exclusive: extension, -l, -c, -g, -a
+#% exclusive: extension, -l, -c, -g
+#% exclusive: extension, -l, -c, -a
 #%end
 
 # TODO: solve addon-extension(-module) confusion
@@ -303,7 +304,17 @@
         return []
     ret = list()
     for tnode in tree.findall('task'):
-        ret.append(tnode.get('name').strip())
+        if flags['g']:
+            desc, keyw = get_optional_params(tnode)
+            ret.append('name={}'.format(tnode.get('name').strip()))
+            ret.append('description={}'.format(desc))
+            ret.append('keywords={}'.format(keyw))
+            ret.append('bin={}'.format(','.join(
+                get_module_executables(tnode))
+            ))
+        else:
+            ret.append(tnode.get('name').strip())
+    
     return ret
 
 # list extensions (read XML file from grass.osgeo.org/addons)
@@ -381,7 +392,35 @@
 
     return tlist
 
+def get_module_files(mnode):
+    """Return list of module files
 
+    :param mnode: XML node for a module
+    """
+    flist = []
+    for file_node in mnode.find('binary').findall('file'):
+        filepath = file_node.text
+        flist.append(filepath)
+
+    return flist
+
+def get_module_executables(mnode):
+    """Return list of module executables
+
+    :param mnode: XML node for a module
+    """
+    flist = []
+    for filepath in get_module_files(mnode):
+        if filepath.startswith(options['prefix'] + os.path.sep + 'bin') or \
+           (sys.platform != 'win32' and \
+            filepath.startswith(options['prefix'] + os.path.sep + 'scripts')):
+            filename = os.path.basename(filepath)
+            if sys.platform == 'win32':
+                filename = os.path.splitext(filename)[0]
+            flist.append(filename)
+    
+    return flist
+
 def get_optional_params(mnode):
     """Return description and keywords as a tuple
 
@@ -1217,8 +1256,7 @@
             for task in tree.findall('task'):
                 if name == task.get('name') and \
                         task.find('binary') is not None:
-                    for file_node in task.find('binary').findall('file'):
-                        flist.append(file_node.text)
+                    flist = get_module_files(task)
                     break
 
             if flist:
@@ -1639,7 +1677,7 @@
                                                to_system=flags['s'])
 
     # list available extensions
-    if flags['l'] or flags['c'] or flags['g']:
+    if flags['l'] or flags['c'] or (flags['g'] and not flags['a']):
         # using dummy module, we don't need any module URL now,
         # but will work only as long as the function does not check
         # if the URL is actually valid or something