Treating bytes as cardinal numbers

Implementing a regex test instead of a string comparison

Author: avoidwork

lib/filesize.js

@@ -6,14 +6,15 @@
  * @license BSD-3 <https://raw.github.com/avoidwork/filesize.js/master/LICENSE>
  * @link http://filesizejs.com
  * @module filesize
- * @version 1.9.1
+ * @version 1.9.2
  */
 ( function ( global ) {
 	"use strict";
 
 	var base    = 10,
 	    right   = /\.(.*)/,
 	    bit     = /b$/,
+	    byte    = /^B$/,
 	    zero    = /^0$/,
 	    options = {
 	    	all : {
@@ -38,6 +39,7 @@
 	function filesize (arg) {
 		var result = "",
 		    bits   = true,
+		    skip   = false,
 		    i, neg, num, pos, short, size, sizes, suffix, z;
 
 		// Determining arguments
@@ -71,11 +73,7 @@
 
 		// Zero is now a special case because bytes divide by 1
 		if ( num === 0 ) {
-			if ( short ) {
-				pos = 0;
-			}
-
-			result = Number( 0 ).toFixed( pos ) + "B";
+			result = Number( 0 ).toFixed( 0 ) + "B";
 		}
 		else {
 			if ( bits ) {
@@ -92,9 +90,15 @@
 				suffix = sizes[i][0];
 
 				if ( num >= size ) {
+					// Treating bytes as cardinal
+					if ( byte.test( suffix ) ) {
+						skip = true;
+						pos  = 0;
+					}
+
 					result = ( num / size ).toFixed( pos );
 
-					if ( short ) {
+					if ( !skip && short ) {
 						if ( bits && bit.test( suffix ) ) {
 							suffix = suffix.toLowerCase();
 						}

lib/filesize.min.js

@@ -1,7 +1,7 @@
 {
   "name": "filesize",
   "description": "JavaScript library to generate a human readable String describing the file size",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "homepage": "http://filesizejs.com",
   "author": {
     "name": "Jason Mulligan",

package.json

@@ -4,6 +4,7 @@
 	var base    = 10,
 	    right   = /\.(.*)/,
 	    bit     = /b$/,
+	    byte    = /^B$/,
 	    zero    = /^0$/,
 	    options = {
 	    	all : {
@@ -28,6 +29,7 @@
 	function filesize (arg) {
 		var result = "",
 		    bits   = true,
+		    skip   = false,
 		    i, neg, num, pos, short, size, sizes, suffix, z;
 
 		// Determining arguments
@@ -61,11 +63,7 @@
 
 		// Zero is now a special case because bytes divide by 1
 		if ( num === 0 ) {
-			if ( short ) {
-				pos = 0;
-			}
-
-			result = Number( 0 ).toFixed( pos ) + "B";
+			result = Number( 0 ).toFixed( 0 ) + "B";
 		}
 		else {
 			if ( bits ) {
@@ -82,9 +80,15 @@
 				suffix = sizes[i][0];
 
 				if ( num >= size ) {
+					// Treating bytes as cardinal
+					if ( byte.test( suffix ) ) {
+						skip = true;
+						pos  = 0;
+					}
+
 					result = ( num / size ).toFixed( pos );
 
-					if ( short ) {
+					if ( !skip && short ) {
 						if ( bits && bit.test( suffix ) ) {
 							suffix = suffix.toLowerCase();
 						}

src/filesize.js

@@ -16,7 +16,7 @@ exports["filesize"] = {
 
 		test.equal(filesize(this.Kb),                "3.91Kb",   "Should be '3.91Kb'");
 		test.equal(filesize(this.Kb, 1),             "3.9Kb",    "Should be '3.9Kb'");
-		test.equal(filesize(this.Kb, 1, false),      "500.0B",   "Should be '500.0B'");
+		test.equal(filesize(this.Kb, 1, false),      "500B",     "Should be '500B'");
 		test.equal(filesize(this.Kb, true),          "3.9k",     "Should be '3.9k'");
 		test.equal(filesize(this.Kb, true, false),   "500B",     "Should be '500B'");
 
@@ -38,14 +38,14 @@ exports["filesize"] = {
 		test.equal(filesize(this.neg, true),         "-1K",      "Should be '-1KB'");
 		test.equal(filesize(this.neg, true, false),  "-1K",      "Should be '-1KB'");
 
-		test.equal(filesize(this.byte),              "1.00B",    "Should be '1.00B'");
-		test.equal(filesize(this.byte, 1),           "1.0B",     "Should be '1.0B'");
-		test.equal(filesize(this.byte, 1, false),    "1.0B",     "Should be '1.0B'");
+		test.equal(filesize(this.byte),              "1B",       "Should be '1B'");
+		test.equal(filesize(this.byte, 1),           "1B",       "Should be '1B'");
+		test.equal(filesize(this.byte, 1, false),    "1B",       "Should be '1B'");
 		test.equal(filesize(this.byte, true),        "1B",       "Should be '1B'");
 		test.equal(filesize(this.byte, true, false), "1B",       "Should be '1B'");
 
-		test.equal(filesize(this.zero),              "0.00B",    "Should be '0.00B'");
-		test.equal(filesize(this.zero, 1),           "0.0B",     "Should be '0.0B'");
+		test.equal(filesize(this.zero),              "0B",       "Should be '0B'");
+		test.equal(filesize(this.zero, 1),           "0B",       "Should be '0B'");
 		test.equal(filesize(this.zero, true),        "0B",       "Should be '0B'");
 
 		test.done();