Merge pull request #489 from lvotypko/human-readable-filesize

Human readable size of files

core/src/main/java/hudson/Functions.java

@@ -93,6 +93,7 @@ import java.lang.reflect.ParameterizedType;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -1494,4 +1495,30 @@ public class Functions {
     public String getUserAvatar(User user, String avatarSize) {
         return getAvatar(user,avatarSize);
     }
+    
+    
+    /**
+     * Returns human readable information about file size
+     * 
+     * @param file size in bytes
+     * @return file size in appropriate unit
+     */
+    public static String humanReadableByteSize(long size){
+        String measure = "B";
+        Double number = new Double(size);
+        if(number>=1024){
+            number = number/1024;
+            measure = "KB";
+            if(number>=1024){
+                number = number/1024;
+                measure = "MB";
+                if(number>=1024){
+                    number=number/1024;
+                    measure = "GB";
+                }
+            }
+        }
+        DecimalFormat format = new DecimalFormat("##.00");
+        return format.format(number) + " " + measure;
+    }
 }

core/src/main/java/hudson/model/Run.java

@@ -1118,6 +1118,10 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
             return length;
         }
         
+        public long getFileSize(){
+            return Long.decode(length);
+        }
+
         public String getTreeNodeId() {
             return treeNodeId;
         }

core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly

@@ -71,7 +71,7 @@ THE SOFTWARE.
                   </td>
                   <j:if test="${!x.folder}">
                     <td class="fileSize">
-                      ${x.getSize()}
+                      ${h.humanReadableByteSize(x.getSize())}
                     </td>
                     <td>
                       <j:if test="${x.readable}">

core/src/main/resources/lib/hudson/artifactList.jelly

@@ -57,7 +57,7 @@ THE SOFTWARE.
                     <a href="${baseURL}artifact/${f.href}">${f.displayPath}</a>
                   </td>
                   <td class="fileSize">
-                    ${f.length}
+                    ${h.humanReadableByteSize(f.getFileSize())}
                   </td>
                   <td>
                     <a href="${baseURL}artifact/${f.href}/*fingerprint*/">