Merge lp:~gesha/linaro-license-protection/1218356 into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds git description tab on snapshots/releases with projects information from annotated source manifest.

[lp:~gesha/linaro-license-protection/1218356]

217. By Georgy Redkozubov on 2013-09-17

Adds git description tab with data from annotated source manifest for passing to android-build.l.o.

[Milo Casagrande (milo)]

Hey Georgy,

thanks for working on this.
It looks good to go, the only comment I have is here:

+ for i, n in enumerate(nodes):
+ if n.nodeType == n.COMMENT_NODE:
+ comment = nodes[i]
+ commentedNode = nodes[i + 2]
+ text += line % (commentedNode.getAttribute('name'),
+ comment.data.strip())
+

Can you give more meaningful name to "i" and "n"? "index" and "node" should be fine I guess.
In case, please do when merging.

Thanks.

review: Approve

=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2013-07-30 08:58:14 +0000
+++ license_protected_downloads/views.py	2013-09-17 16:38:31 +0000
@@ -33,6 +33,7 @@
 import config
 from common import safe_path_join
 from group_auth_common import GroupAuthError
+import xml.dom.minidom as dom
 
 
 LINARO_INCLUDE_FILE_RE = re.compile(
@@ -528,6 +529,9 @@
         download = None
         if 'dl' in request.GET:
             download = request.GET['dl']
+        rendered_files = RenderTextFiles.find_and_render(path)
+        if os.path.exists(os.path.join(path, settings.ANNOTATED_XML)):
+            rendered_files["Git Descriptions"] = render_descriptions(path)
 
         return render_to_response('dir_template.html',
                                   {'dirlist': dir_list(url, path),
@@ -536,8 +540,7 @@
                                    'revno': bzr_version.get_my_bzr_revno(),
                                    'header_content': header_content,
                                    'request': request,
-                                   'rendered_files':
-                                   RenderTextFiles.find_and_render(path)
+                                   'rendered_files': rendered_files
                                    })
 
     # If the file listing doesn't contain the file requested for download,
@@ -583,7 +586,11 @@
 
     path = result[1]
 
-    return HttpResponse(json.dumps(RenderTextFiles.find_and_render(path)))
+    rendered_files = RenderTextFiles.find_and_render(path)
+    if os.path.exists(os.path.join(path, settings.ANNOTATED_XML)):
+        rendered_files["Git Descriptions"] = render_descriptions(path)
+
+    return HttpResponse(json.dumps(rendered_files))
 
 
 def get_remote_static(request):
@@ -669,3 +676,25 @@
         data = json.dumps({"licenses": license_list})
 
     return HttpResponse(data, mimetype='application/json')
+
+
+def render_descriptions(path):
+    """
+       Extracts project name and its description from annotated source manifest
+       and returns html string to include in tab.
+    """
+    text = '<br>'
+    line = '<strong>Project:</strong> "%s", ' \
+           '<strong>Description:</strong> "%s"<br>'
+    filename = os.path.join(path, settings.ANNOTATED_XML)
+    xmldoc = dom.parse(filename)
+    nodes = xmldoc.documentElement.childNodes
+
+    for i, n in enumerate(nodes):
+        if n.nodeType == n.COMMENT_NODE:
+            comment = nodes[i]
+            commentedNode = nodes[i + 2]
+            text += line % (commentedNode.getAttribute('name'),
+                            comment.data.strip())
+
+    return text
 
=== modified file 'settings.py'
--- settings.py	2013-07-30 09:20:02 +0000
+++ settings.py	2013-09-17 16:38:31 +0000
@@ -255,3 +255,5 @@
         f.write(local_settings_content)
 
     from local_settings import *
+
+ANNOTATED_XML = 'source-manifest-ann.xml'