dataSize format displayer decimal option

overlookmotel · Jun 21, 2019 · 2e20789 · 2e20789
1 parent e38e121
commit 2e20789
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -732,3 +732,4 @@ No changes. Erroneous version bump.
 ## Next
 
 * Fix: `dataSize` format displayer indicate sizes are binary (GiB not GB)
+* `dataSize` format displayer `decimal` option
diff --git a/lib/forms/displayers.js b/lib/forms/displayers.js
@@ -67,17 +67,24 @@ exports = module.exports = {
 	},
 
 	dataSize: function(val, options) {
-		var sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB'];
+		var sizes, divisor;
+		if (options.decimal) {
+			sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
+			divisor = 1000;
+		} else {
+			sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB'];
+			divisor = 1024;
+		}
 
 		var result,
 			v = val;
 		_.forEach(sizes, function(size) {
-			if (v < 1024) {
+			if (v < divisor) {
 				result = v.toPrecision(3) + ' ' + size;
 				return false;
 			}
 
-			v = v / 1024;
+			v = v / divisor;
 		});
 
 		if (!result) result = v.toPrecision(3) + ' ' + sizes[sizes.length - 1];