[TIC-CORE] merge master into develop 52/125452/1
authorChulwoo Shin <cw1.shin@samsung.com>
Mon, 17 Apr 2017 08:40:29 +0000 (17:40 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Mon, 17 Apr 2017 08:40:29 +0000 (17:40 +0900)
Merge remote-tracking branch 'origin/master' into develop

Change-Id: I518ca1f188792aea8825f10f078ea6d096a23e37

tic/parser/view_parser.py

index 5ed1d0c..59603b4 100644 (file)
@@ -1,4 +1,6 @@
 import logging
+import requests
+import re
 from operator import itemgetter
 from tic.utils.rpmmisc import meetRequireVersion
 
@@ -26,8 +28,10 @@ def make_view_data(pkg_group):
     
     def set_meta_require(meta_info):
         meta_nodes = meta_info.get('nodes')
+        children = set()
         for child_meta in meta_nodes:
             set_meta_require(child_meta)
+            children.add(child_meta['metaname'])
         
         duplicate = set()
         pkg_info = pkg_dict[meta_info['metaname']]
@@ -48,17 +52,86 @@ def make_view_data(pkg_group):
                         
                     for pkg in targets:
                         # The meta-pkg of the other group are excluded.
-                        if not pkg.get('meta') and pkg['name'] not in duplicate:
+                        if pkg['name'] not in duplicate:
                             refer_count[pkg['id']] += 1
                             duplicate.add(pkg['name'])
-                            meta_nodes.append(make_node(pkg, meta_info.get('category')))
-        meta_nodes.sort()
+
+                            if pkg.get('meta'):
+                                if not pkg['name'] in children:
+                                    meta_nodes.append(make_linked_meta_node(pkg['name'], pkg['summary']))
+                            else:
+                                meta_nodes.append(make_node(pkg, meta_info.get('category')))
+        # Added 'zz' to non meta-package because they are to be listed last
+        meta_nodes = sorted(meta_nodes, key = lambda k: 'aa'+k['metaname'] if 'metaname' in k else 'zz'+k['text'])
+        meta_info['nodes'] = meta_nodes
+
+        if meta_info['metaname'] =='building-blocks-sub2-Preset_iot-examples-3_RPI3_headless_devboard':
+            print(pkg_info)
     def make_node(pkg_info, category=None):
         n = dict(text=pkg_info['name'], nodes=[])
         if category: n['category'] = category
         return n
     def make_meta_node(pkgname, viewtext):
         return dict(text=viewtext, metaname=pkgname, nodes=[])
+    def make_linked_meta_node(pkgname, viewtext):
+        return dict(text='<i>'+viewtext+'</i>', metaname=pkgname, nodes=[])
+    def is_blank_ui_meta_node(pkgname):
+        return (pkgname[-8:-2] == '__UI__')
+    def handle_ui_meta_node(tag, node):
+        node['selectable'] = False
+        node['hideCheckbox'] = True
+        if tag == 'BR' or tag == 'br':
+            node['text'] = ''
+        elif tag == 'HR' or tag == 'hr':
+            node['text'] = '<hr style="margin-bottom: 0px; margin-top: 0px; border-style: inset; border-width: 3px" />'
+        elif tag == 'SD' or tag == 'sd':
+            node['text'] = ''
+            node['backColor'] = '#101010'
+        elif tag == 'SM' or tag == 'sm':
+            # Keep the summary text
+            node['text'] = node['text']
+        elif tag == 'HT' or tag == 'ht':
+            # Keep the summary (TODO: verify the usage of HTML tags.)
+            node['text'] = node['text'] # Do we need conversion?
+        else:
+            node['text'] = ''
+        return node
+    def handle_description(node):
+        if 'metaname' in node:
+            name = node['metaname']
+            pkg_info = pkg_dict[name]
+            desc = pkg_info.get('description')
+            if desc[0:10] == '__KS_URL__':
+                logger.info("Processing "+name+" for its description: "+pkg_info.get('description'))
+                # Extract URL from __KS_URL__
+                ksURL = desc[11:].splitlines()[0].strip()
+                # Omit the first line with __KS_URL__ from showing.
+                pkg_info['description'] = desc[len(desc.splitlines(True)[0]):]
+
+                # Search for filename if directory is given
+                # e.g., Convert http://a.com/a/ to https://a.com/a/blahblah.ks
+                # Works for file-indexing html
+                if ksURL[-3:].lower() != ".ks":
+                    if ksURL[-1:] != "/":
+                        ksURL += "/"
+                    r = requests.get(ksURL)
+                    m = re.search('>([^<]*\\.ks)\\s*<', r.text)
+                    if not m.group(1):
+                        m = re.search('"([^"]*\\.ks)\\s*"', r.text)
+                        if not m.group(1):
+                            m = re.search("'([^']*\\.ks)\\s*'", r.text)
+                            if not m.group(1):
+                                node['icon'] = 'glyphicon glyphicon-remove-sign'
+                                node['tooltip'] = 'Cannot find image base from' + ksURL
+                                return node
+                    ksURL += m.group(1)
+                node['tooltip'] = 'Image base from '+ksURL
+                node['ks'] = ksURL
+            elif desc[0:10] == '__EXPAND__':
+                # Omit the first line with __EXPAND__ from showing.
+                pkg_info['description'] = desc[len(desc.splitlines(True)[0]):]
+                node['state'] = { 'expanded': True }
+        return node
 
     # view_data for tree view on web-ui
     view_data = []
@@ -84,8 +157,13 @@ def make_view_data(pkg_group):
     if meta_info.get('category'):
         for category in meta_info['category']:
             c_rpm = pkg_dict[category[0]]
-            for suggest in c_rpm.get('suggests'):
-                category_dict[suggest['name']] = category[1]
+            if hasattr(c_rpm.get('suggests'), '__iter__'):
+                for suggest in c_rpm.get('suggests'):
+                    category_dict[suggest['name']] = category[1]
+            else:
+                logger.info(c_rpm.get('suggests'))
+                logger.info(c_rpm.get('name'))
+
     
     # make tree of meta
     for root in meta_info['root']:
@@ -93,15 +171,23 @@ def make_view_data(pkg_group):
         view_ref[root[0]] = root_node
         if root[0] in category_dict:
             root_node['category'] = category_dict[root[0]]
+        if is_blank_ui_meta_node(root[0]):
+            name = root[0]
+            sub1_node = handle_ui_meta_node(name[-2:], root_node)
+        root_node = handle_description(root_node)
         view_data.append(root_node)
         
     for sub1 in meta_info['sub1']:
         sub1_node = make_meta_node(sub1[0], sub1[2])
         view_ref[sub1[0]] = sub1_node
+        if is_blank_ui_meta_node(sub1[0]):
+            name = sub1[0]
+            sub1_node = handle_ui_meta_node(name[-2:], sub1_node)
+        sub1_node = handle_description(sub1_node)
         # search root
         if sub1[1] in view_ref:
             # add to root node
-            if view_ref[sub1[1]]['category']:
+            if 'category' in view_ref[sub1[1]] and view_ref[sub1[1]]['category']:
                 sub1_node['category'] = view_ref[sub1[1]]['category']
             view_ref[sub1[1]]['nodes'].append(sub1_node)
         else:
@@ -111,9 +197,13 @@ def make_view_data(pkg_group):
     for sub2 in meta_info['sub2']:
         sub2_node = make_meta_node(sub2[0], sub2[3])
         view_ref[sub2[0]] = sub2_node
+        if is_blank_ui_meta_node(sub2[0]):
+            name = sub2[0]
+            sub1_node = handle_ui_meta_node(name[-2:], sub2_node)
+        sub2_node = handle_description(sub2_node)
         # search sub1
         if sub2[2] in view_ref:
-            if view_ref[sub2[2]]['category']:
+            if 'category' in view_ref[sub2[2]] and view_ref[sub2[2]]['category']:
                 sub2_node['category'] = view_ref[sub2[2]]['category']
             view_ref[sub2[2]]['nodes'].append(sub2_node)
         # search root    
@@ -132,13 +222,14 @@ def make_view_data(pkg_group):
         
     #The remaining rpms are grouped into a MISC tree
     misc_info = {}
-    misc_info['text'] = 'ETC'
+    misc_info['text'] = 'Advanced (individual packages)'
     misc_info['nodes'] = []
     for k, v in pkg_dict.iteritems():
         # Pkg is not referenced from Meta-pkg
         if not v.get('meta') and refer_count[v['id']] == 0:
             misc_info['nodes'].append(make_node(v))
+    misc_info['nodes'] = sorted(misc_info['nodes'], key = lambda k: k['metaname'] if 'metaname' in k else k['text'])
 
     view_data.append(misc_info)
     logger.info('meta: %d, misc: %d', len(view_ref), len(misc_info['nodes']))
-    return view_data
\ No newline at end of file
+    return view_data