Merge lp:~gesha/linaro-license-protection/human-readable-size into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

As part of updating template to "apache generated" style this branch adds displaying filesize in human readable format.
It's more appearance improvement then necessity :)

[Stevan Radaković (stevanr)]

Looks good.
Approve +1.

review: Approve

=== modified file 'license_protected_downloads/tests/test_views.py'
--- license_protected_downloads/tests/test_views.py	2012-08-24 14:17:02 +0000
+++ license_protected_downloads/tests/test_views.py	2012-08-26 11:42:19 +0000
@@ -10,6 +10,7 @@
 from license_protected_downloads import bzr_version
 from license_protected_downloads.buildinfo import BuildInfo
 from license_protected_downloads.views import _insert_license_into_db
+from license_protected_downloads.views import _sizeof_fmt
 from license_protected_downloads.config import INTERNAL_HOSTS
 
 THIS_DIRECTORY = os.path.dirname(os.path.abspath(__file__))
@@ -479,5 +480,13 @@
         # this test should not cause an exception. Anything else is a pass.
         self.assertEqual(response.status_code, 200)
 
+    def test_sizeof_fmt(self):
+        self.assertEqual(_sizeof_fmt(1), '1')
+        self.assertEqual(_sizeof_fmt(1234), '1.2K')
+        self.assertEqual(_sizeof_fmt(1234567), '1.2M')
+        self.assertEqual(_sizeof_fmt(1234567899), '1.1G')
+        self.assertEqual(_sizeof_fmt(1234567899999), '1.1T')
+
+
 if __name__ == '__main__':
     unittest.main()
 
=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2012-08-24 14:13:10 +0000
+++ license_protected_downloads/views.py	2012-08-26 11:42:19 +0000
@@ -41,6 +41,19 @@
     return False
 
 
+def _sizeof_fmt(num):
+    ''' Returns in human readable format for num.
+    '''
+    if num < 1024 and num > -1024:
+        return str(num)
+    num /= 1024.0
+    for x in ['K', 'M', 'G']:
+        if num < 1024.0 and num > -1024.0:
+            return "%3.1f%s" % (num, x)
+        num /= 1024.0
+    return "%3.1f%s" % (num, 'T')
+
+
 def dir_list(url, path):
     files = os.listdir(path)
     files.sort()
@@ -87,7 +100,7 @@
         license_digest_list = is_protected(pathname)
         license_list = License.objects.all_with_hashes(license_digest_list)
         listing.append({'name': name,
-                        'size': size,
+                        'size': _sizeof_fmt(size),
                         'type': type,
                         'mtime': mtime,
                         'license_digest_list': license_digest_list,