Merge branch 'fkoester-improved-filesize'

Author: Jonas Sciangula Street

dist/angular-filemanager.min.js

@@ -18,4 +18,23 @@
                 (input.toLocaleString || input.toString).apply(input);
         };
     }]);
+
+    app.filter('humanReadableFileSize', ['$filter', 'fileManagerConfig', function($filter, fileManagerConfig) {
+      // See https://en.wikipedia.org/wiki/Binary_prefix
+      var decimalByteUnits = [' kB', ' MB', ' GB', ' TB', 'PB', 'EB', 'ZB', 'YB'];
+      var binaryByteUnits = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+
+      return function(input) {
+        var i = -1;
+        var fileSizeInBytes = input;
+
+        do {
+          fileSizeInBytes = fileSizeInBytes / 1024;
+          i++;
+        } while (fileSizeInBytes > 1024);
+
+        var result = fileManagerConfig.useBinarySizePrefixes ? binaryByteUnits[i] : decimalByteUnits[i];
+        return Math.max(fileSizeInBytes, 0.1).toFixed(1) + ' ' + result;
+      };
+    }]);
 })(angular);

src/js/filters/filters.js

@@ -37,6 +37,7 @@
             },
 
             showSizeForDirectories: false,
+            useBinarySizePrefixes: false,
 
             previewImagesInModal: true,
             enablePermissionsRecursive: true,

src/js/providers/config.js

@@ -1,6 +1,6 @@
 <div class="iconset clearfix">
     <div class="col-120" ng-repeat="item in fileNavigator.fileList | filter: query | orderBy: orderProp" ng-show="!fileNavigator.requesting && !fileNavigator.error">
-        <a href="" class="thumbnail text-center" ng-click="smartClick(item)" ng-right-click="touch(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
+        <a href="" class="thumbnail text-center" ng-click="smartClick(item)" ng-right-click="touch(item)" title="{{item.model.name}} ({{item.model.size | humanReadableFileSize}})">
             <div class="item-icon">
                 <i class="glyphicon glyphicon-folder-open" ng-show="item.model.type === 'dir'"></i>
                 <i class="glyphicon glyphicon-file" ng-show="item.model.type === 'file'"></i>

src/templates/main-icons.html

@@ -31,7 +31,7 @@
         </tr>
         <tr ng-repeat="item in fileNavigator.fileList | orderBy:predicate:reverse" ng-show="!fileNavigator.requesting && item.model.type === 'dir'">
             <td>
-                <a href="" ng-click="fileNavigator.folderClick(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
+                <a href="" ng-click="fileNavigator.folderClick(item)" title="{{item.model.name}} ({{item.model.size | humanReadableFileSize}})">
                     <i class="glyphicon glyphicon-folder-close"></i>
                     {{item.model.name | strLimit : 32}}
                 </a>

src/templates/main-table-modal.html

@@ -46,16 +46,14 @@
         </tr>
         <tr ng-repeat="item in fileNavigator.fileList | filter: {model:{name: query}} | orderBy:predicate:reverse" ng-show="!fileNavigator.requesting">
             <td ng-right-click="touch(item)">
-                <a href="" ng-click="smartClick(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
+                <a href="" ng-click="smartClick(item)" title="{{item.model.name}} ({{item.model.size | humanReadableFileSize}})">
                     <i class="glyphicon glyphicon-folder-close" ng-show="item.model.type === 'dir'"></i>
                     <i class="glyphicon glyphicon-file" ng-show="item.model.type === 'file'"></i>
                     {{item.model.name | strLimit : 64}}
                 </a>
             </td>
             <td class="hidden-xs">
-              <span ng-show="item.model.type !== 'dir' || config.showSizeForDirectories">
-                {{item.model.sizeKb()}}kb
-              </span>
+                {{item.model.size | humanReadableFileSize }}
             </td>
             <td class="hidden-sm hidden-xs" ng-hide="config.hideDate">
                 {{item.model.date | formatDate }}