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

[Zygmunt Krynicki]

This is a small branch I did locally for testing BUILD-INFO support.

It extends the directory listing to show the license that is required to
download something. I'm not sure if you want to get it applied but it could be
useful for others so I though I would post it.

[James Tunnicliffe (dooferlad)]

Looks good. Thanks for working on this - it was on our TODO list, so thanks for ticking that item off :-)

review: Approve

[James Tunnicliffe (dooferlad)]

You may want to stop inserting tabs into python though... PEP8 gets a bit angry over mixing tabs and spaces!

[Zygmunt Krynicki (zyga)]

Sorry about that, wrong editor

=== modified file 'license_protected_downloads/models.py'
--- license_protected_downloads/models.py	2012-07-11 11:56:10 +0000
+++ license_protected_downloads/models.py	2012-07-27 14:10:45 +0000
@@ -1,10 +1,28 @@
 from django.db import models
 
 
+class LicenseManager(models.Manager):
+	"""
+	Model manager for License model.
+
+	Provides additional convenience method
+	"""
+
+	def all_with_hashes(self, hash_list):
+		"""
+		Produce a list of licenses that match the specified list of hashes.
+		The main use case is to convert license digest to something the user
+		can relate to.
+		"""
+		return self.all().filter(digest__in=hash_list)
+
+
 class License(models.Model):
     digest = models.CharField(max_length=40)
     text = models.TextField()
     theme = models.CharField(max_length=60)
 
+    objects = LicenseManager()
+
     def __unicode__(self):
         return self.digest

=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2012-07-11 13:13:56 +0000
+++ license_protected_downloads/views.py	2012-07-27 14:10:45 +0000
@@ -64,10 +64,16 @@
         size = os.path.getsize(file)
         if not re.search(r'^/', url) and url != '':
             url = '/' + url
+
+        pathname = os.path.join(path, name)
+        license_digest_list = is_protected(pathname)
+        license_list = License.objects.all_with_hashes(license_digest_list)
         listing.append({'name': name,
                         'size': size,
                         'type': type,
                         'mtime': mtime,
+                        'license_digest_list': license_digest_list,
+                        'license_list': license_list,
                         'url': url + '/' + name})
     return listing
 

=== modified file 'manage.py' (properties changed: -x to +x)
=== modified file 'templates/dir_template.html'
--- templates/dir_template.html	2012-06-27 15:49:28 +0000
+++ templates/dir_template.html	2012-07-27 14:10:45 +0000
@@ -3,7 +3,7 @@
 {% block content %}
 <table>
   <tr>
-    <th></th><th>Name</th><th>Last modified</th><th>Size</th>
+    <th></th><th>Name</th><th>License</th><th>Last modified</th><th>Size</th>
     <tr><th colspan="5"><hr></th>
   </tr>
   {% if up_dir != None %}
@@ -14,6 +14,7 @@
       <td><a href="{{ up_dir }}">Parent Directory</a></td>
       <td></td>
       <td></td>
+      <td></td>
     </tr>
   {% endif %}
 
@@ -23,6 +24,15 @@
        <img src="{{ STATIC_URL }}/static/{{ value.type }}.png" alt="{{ value.type }}"/>
     </td>
     <td><a href="{{ value.url }}">{{ value.name }}</a></td>
+    <td>
+      {% if value.license_digest_list == "OPEN" %}
+        <i>open</i>
+      {% else %}
+      {% for license in value.license_list %}
+      {{ license.theme }}
+      {% endfor %}
+      {% endif %}
+    </td>
     <td>{{ value.mtime }}</td>
     <td>{% if value.type != 'folder' %}{{ value.size }}{% endif %}</td>
   </tr>