Ticket #2466: filesize.diff

django/contrib/humanize/templatetags/humanize.py

@@ -62 +62 @@
         return value
     return ('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine')[value-1]
 register.filter(apnumber)
+
+
+def filesize(value):
+   """
+   Used to convert filesizes returned by get_XXX_size on FileFields
+   For sizes under a megabyte, it returns the number of kilobytes, with
+   two numbers after the decimal, and 'KB' on the end.
+   Over a megabyte and under a gigabyte returns the number of megabytes,
+   with two numbers after the decimal, and 'MB' on the end.
+   Over a gigabyte returns the number of gigabytes with two numbers
+   after the decimal, and a 'GB' on the end
+   """
+   try:
+        value = int(value)
+   except ValueError:
+       return value
+
+   if value < 0:
+       return value
+
+   if 0 <= value < 1000000:
+       return "%.2fKB" % (value/1000.0)
+   elif 1000000 <= value < 1000000000:
+       return "%.2fMB" % (value/1000000.0)
+   else:
+       return "%.2fGB" % (value/1000000000.0)
+
+register.filter(filesize)