Ticket #8733: 8733-filesize-formats.diff

django/template/defaultfilters.py

@@ -7 +7 @@
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
 
+from django.utils.functional import curry
+
 from django.template import Variable, Library
 from django.conf import settings
 from django.utils.translation import ugettext, ungettext
@@ -723 +725 @@
 # MISC            #
 ###################
 
-def filesizeformat(bytes):
+def __byte_size(bytes, base, unit, prefixes='KMGT'):
     """
-    Formats the value like a 'human-readable' file size (i.e. 13 KB, 4.1 MB,
-    102 bytes, etc).
+    Formats the data size in bytes as a human-readable value.
+    
+    Because there are different schemes used in for this formatting in different
+    situations, this is generalised: the most suitable power of 'base' is found
+    and the value is displayed to 1 decimal place, with the corresponding prefix
+    and unit as given.
     """
     try:
         bytes = float(bytes)
     except TypeError:
         return u"0 bytes"
 
-    if bytes < 1024:
+    if bytes < base:
         return ungettext("%(size)d byte", "%(size)d bytes", bytes) % {'size': bytes}
-    if bytes < 1024 * 1024:
-        return ugettext("%.1f KB") % (bytes / 1024)
-    if bytes < 1024 * 1024 * 1024:
-        return ugettext("%.1f MB") % (bytes / (1024 * 1024))
-    return ugettext("%.1f GB") % (bytes / (1024 * 1024 * 1024))
-filesizeformat.is_safe = True
 
+    cbase = 1
+    for prefix in prefixes:
+        cbase *= base
+        if bytes < (cbase * base):
+            break
+    return "%.1f %s%s" % (bytes / cbase, prefix, unit)
+
+filesizeformat = curry(__byte_size, base=1024, unit='B')
+filesize = curry(__byte_size, base=1000, unit='B', prefixes='kMGT')
+memorysize = curry(__byte_size, base=1024, unit='iB')
+
+
 def pluralize(value, arg=u's'):
     """
     Returns a plural suffix if the value is not 1. By default, 's' is used as
@@ -816 +828 @@
 register.filter(escape)
 register.filter(escapejs)
 register.filter(filesizeformat)
+register.filter(filesize)
+register.filter(memorysize)
 register.filter(first)
 register.filter(fix_ampersands)
 register.filter(floatformat)