Changing the method of generating result

avoidwork · Mar 1, 2014 · 98f34a1 · 98f34a1
1 parent d5a1f9d
commit 98f34a1
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 92 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,7 +19,7 @@ module.exports = function(grunt) {
 					"<banner>",
 					"src/intro.js",
 					"src/filesize.js",
-					"src/options.js",
+					"src/si.js",
 					"src/outro.js"
 				],
 				dest : "lib/filesize.js"

diff --git a/lib/filesize.js b/lib/filesize.js
@@ -6,13 +6,12 @@
  * @license BSD-3 <https://raw.github.com/avoidwork/filesize.js/master/LICENSE>
  * @link http://filesizejs.com
  * @module filesize
- * @version 2.0.1
+ * @version 2.0.2
  */
 ( function ( global ) {
 "use strict";
 
 var bit   = /b$/,
-    bite  = /^B$/,
     radix = 10,
     right = /\.(.*)/,
     zero  = /^0$/;
@@ -28,8 +27,7 @@ var bit   = /b$/,
 function filesize ( arg, descriptor ) {
 	var result = "",
 	    skip   = false,
-	    i      = 6,
-	    base, bits, neg, num, round, size, sizes, unix, spacer, suffix, z, suffixes;
+	    e, base, bits, ceil, neg, num, round, unix, spacer, suffix, z, suffixes;
 
 	if ( isNaN( arg ) ) {
 		throw new Error( "Invalid arguments" );
@@ -44,6 +42,7 @@ function filesize ( arg, descriptor ) {
 	suffixes   = descriptor.suffixes !== undefined ? descriptor.suffixes : {};
 	num        = Number( arg );
 	neg        = ( num < 0 );
+	ceil       = base > 2 ? 1000 : 1024;
 
 	// Flipping a negative number to determine the size
 	if ( neg ) {
@@ -61,45 +60,50 @@ function filesize ( arg, descriptor ) {
 		}
 	}
 	else {
-		sizes = options[base][bits ? "bits" : "bytes"];
+		e = Math.floor( Math.log( num ) / Math.log( 1000 ) );
 
-		while ( i-- ) {
-			size   = sizes[i][1];
-			suffix = sizes[i][0];
-
-			if ( num >= size ) {
-				// Treating bytes as cardinal
-				if ( bite.test( suffix ) ) {
-					skip  = true;
-					round = 0;
-				}
+		if ( base === 2 ) {
+			result = num / Math.pow( 2, ( e * 10 ) );
+		}
+		else {
+			result = num / Math.pow( 1000, e );
+		}
 
-				result = ( num / size ).toFixed( round );
+		if ( bits ) {
+			result = ( result * 8 );
 
-				if ( !skip && unix ) {
-					if ( bits && bit.test( suffix ) ) {
-						suffix = suffix.toLowerCase();
-					}
+			if ( result > ceil ) {
+				result = result / ceil;
+				e++;
+			}
+		}
 
-					suffix = suffix.charAt( 0 );
-					z      = right.exec( result );
+		result = result.toFixed( e > 0 ? round : 0 );
+		suffix = si[bits ? "bits" : "bytes"][e];
 
-					if ( !bits && suffix === "k" ) {
-						suffix = "K";
-					}
+		if ( !skip && unix ) {
+			if ( bits && bit.test( suffix ) ) {
+				suffix = suffix.toLowerCase();
+			}
 
-					if ( z !== null && z[1] !== undefined && zero.test( z[1] ) ) {
-						result = parseInt( result, radix );
-					}
+			suffix = suffix.charAt( 0 );
+			z      = right.exec( result );
 
-					result += spacer + ( suffixes[suffix] || suffix );
-				}
-				else if ( !unix ) {
-					result += spacer + ( suffixes[suffix] || suffix );
-				}
+			if ( suffix === "B" ) {
+				suffix = "";
+			}
+			else if ( !bits && suffix === "k" ) {
+				suffix = "K";
+			}
 
-				break;
+			if ( z !== null && z[1] !== undefined && zero.test( z[1] ) ) {
+				result = parseInt( result, radix );
 			}
+
+			result += spacer + ( suffixes[suffix] || suffix );
+		}
+		else if ( !unix ) {
+			result += spacer + ( suffixes[suffix] || suffix );
 		}
 	}
 
@@ -112,19 +116,13 @@ function filesize ( arg, descriptor ) {
 }
 
 /**
- * Size options
+ * SI suffixes
  *
  * @type {Object}
  */
-var options = {
-	2 : {
-		bits  : [["B", 1], ["kb", 128],  ["Mb", 131072],  ["Gb", 134217728],  ["Tb", 137438953472],  ["Pb", 140737488355328]],
-		bytes : [["B", 1], ["kB", 1024], ["MB", 1048576], ["GB", 1073741824], ["TB", 1099511627776], ["PB", 1125899906842624]]
-	},
-	10 : {
-		bits  : [["B", 1], ["kb", 125],  ["Mb", 125000],  ["Gb", 125000000],  ["Tb", 125000000000],  ["Pb", 125000000000000]],
-		bytes : [["B", 1], ["kB", 1000], ["MB", 1000000], ["GB", 1000000000], ["TB", 1000000000000], ["PB", 1000000000000000]]
-	}
+var si = {
+	bits  : ["B", "kb", "Mb", "Gb", "Tb", "Pb"],
+	bytes : ["B", "kB", "MB", "GB", "TB", "PB"]
 };
 
 // CommonJS, AMD, script tag

diff --git a/lib/filesize.map b/lib/filesize.map
@@ -1,8 +1,8 @@
 {
 "version":3,
 "file":"filesize.min.js",
-"lineCount":10,
-"mappings":"A;;;;;;;AAUE,SAAS,CAAEA,CAAF,CAAW,CAiBtBC,QAASA,EAAS,CAAEC,CAAF,CAAOC,CAAP,CAAoB,CAAA,IACjCC,EAAS,EADwB,CAEjCC,EAAS,CAAA,CAFwB,CAGjCC,EAAS,CAHwB,CAIjCC,CAJiC,CAI3BC,CAJ2B,CAIrBC,CAJqB,CAIhBC,CAJgB,CAIXC,CAJW,CAIJC,CAJI,CAIEC,CAJF,CAISC,CAJT,CAIeC,CAJf,CAIkCC,CAEvE,IAAKC,KAAA,CAAOf,CAAP,CAAL,CACC,KAAUgB,MAAJ,CAAW,mBAAX,CAAN,CAGDf,CAAA,CAAaA,CAAb,EAA2B,EAC3BK,EAAA,CAAmC,CAAA,CAAnC,GAAeL,CAAAK,KACfM,EAAA,CAAmC,CAAA,CAAnC,GAAeX,CAAAW,KACfP,EAAA,CAAqCY,IAAAA,EAAxB,GAAAhB,CAAAI,KAAA,CAAoCJ,CAAAI,KAApC,CAA0DO,CAAA,CAAO,CAAP,CAAY,EACnFH,EAAA,CAAqCQ,IAAAA,EAAxB,GAAAhB,CAAAQ,MAAA,CAAoCR,CAAAQ,MAApC,CAA0DG,CAAA,CAAO,CAAP,CAAY,CACnFC,EAAA,CAAqCI,IAAAA,EAAxB,GAAAhB,CAAAY,OAAA,CAAoCZ,CAAAY,OAApC,CAA0DD,CAAA,CAAO,EAAP,CAAY,GACnFE,EAAA,CAAqCG,IAAAA,EAAxB,GAAAhB,CAAAa,SAAA,CAAoCb,CAAAa,SAApC,CAA0D,EACvEN,EAAA,CAAaU,MAAA,CAAQlB,CAAR,CAIb,EAHAO,CAGA,CAHqB,CAGrB,CAHeC,CAGf,IACCA,CADD,CACO,CAACA,CADR,CAKA,IAAa,CAAb,GAAKA,CAAL,CACMI,CAAL,CACCV,CADD,CACU,GADV,EAICiB,CACA,CADS,GACT,CAAAjB,CAAA,CAAS,GAAT,CAAeW,CAAf,EAA0BC,CAAA,CAASK,CAAT,CAA1B,EAA8CA,CAA9C,CALD,CADD,KAYC,KAFAR,CAEA,CAFQS,CAAA,CAAQf,CAAR,CAAA,CAAcC,CAAA,CAAO,MAAP,CAAgB,OAA9B,CAER,CAAQF,CAAA,EAAR,CAAA,CAIC,GAHAM,CAGK,CAHIC,CAAA,CAAMP,CAAN,CAAA,CAAS,CAAT,CAGJ,CAFLe,CAEK,CAFIR,CAAA,CAAMP,CAAN,CAAA,CAAS,CAAT,CAEJ,CAAAI,CAAA,EAAOE,CAAZ,CAAmB,CAEbW,CAAAC,KAAA,CAAWH,CAAX,CAAL,GACChB,CACA,CADQ,CAAA,CACR,CAAAM,CAAA,CAAQ,CAFT,CAKAP,EAAA,CAAWqB,CAAAf,CAAAe,CAAMb,CAANa,SAAA,CAAsBd,CAAtB,CAELN,EAAAA,CAAN,EAAcS,CAAd,EACMN,CAeL,EAfakB,CAAAF,KAAA,CAAUH,CAAV,CAeb,GAdCA,CAcD,CAdUA,CAAAM,YAAA,EAcV;AAXAN,CAWA,CAXSA,CAAAO,OAAA,CAAe,CAAf,CAWT,CAVAC,CAUA,CAVSC,CAAAC,KAAA,CAAY3B,CAAZ,CAUT,CARMI,CAQN,EARyB,GAQzB,GARca,CAQd,GAPCA,CAOD,CAPU,GAOV,EAJW,IAIX,GAJKQ,CAIL,EAJ4BV,IAAAA,EAI5B,GAJmBU,CAAA,CAAE,CAAF,CAInB,EAJyCG,CAAAR,KAAA,CAAWK,CAAA,CAAE,CAAF,CAAX,CAIzC,GAHCzB,CAGD,CAHU6B,QAAA,CAAU7B,CAAV,CAAkB8B,CAAlB,CAGV,EAAA9B,CAAA,EAAUW,CAAV,EAAqBC,CAAA,CAASK,CAAT,CAArB,EAAyCA,CAAzC,CAhBD,EAkBWP,CAlBX,GAmBCV,CAnBD,EAmBWW,CAnBX,EAmBsBC,CAAA,CAASK,CAAT,CAnBtB,EAmB0CA,CAnB1C,EAsBA,MA/BkB,CAqChBZ,CAAL,GACCL,CADD,CACU,GADV,CACgBA,CADhB,CAIA,OAAOA,EAnF8B,CAjBhB,IAGlBsB,EAAQ,IAHU,CAIlBH,EAAQ,KAJU,CAKlBW,EAAQ,EALU,CAMlBJ,EAAQ,QANU,CAOlBE,EAAQ,KAPU,CA4GlBV,EAAU,GACT,MACK,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,GAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,MAAP,CAAzB,CAA0C,CAAC,IAAD,CAAO,SAAP,CAA1C,CAA8D,CAAC,IAAD,CAAO,YAAP,CAA9D,CAAqF,CAAC,IAAD,CAAO,cAAP,CAArF,CADL,OAEK,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,IAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,OAAP,CAAzB,CAA0C,CAAC,IAAD,CAAO,UAAP,CAA1C,CAA8D,CAAC,IAAD,CAAO,aAAP,CAA9D,CAAqF,CAAC,IAAD,CAAO,eAAP,CAArF,CAFL,CADS,IAKR,MACI,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,GAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,KAAP,CAAzB,CAA0C,CAAC,IAAD,CAAO,KAAP,CAA1C,CAA8D,CAAC,IAAD,CAAO,KAAP,CAA9D,CAAqF,CAAC,IAAD,CAAO,MAAP,CAArF,CADJ;MAEI,CAAC,CAAC,GAAD,CAAM,CAAN,CAAD,CAAW,CAAC,IAAD,CAAO,GAAP,CAAX,CAAyB,CAAC,IAAD,CAAO,GAAP,CAAzB,CAA0C,CAAC,IAAD,CAAO,GAAP,CAA1C,CAA8D,CAAC,IAAD,CAAO,IAAP,CAA9D,CAAqF,CAAC,IAAD,CAAO,IAAP,CAArF,CAFJ,CALQ,CAYU,YAAxB,GAAK,MAAOa,QAAZ,CACCC,MAAAD,QADD,CACkBlC,CADlB,CAG4B,UAAvB,GAAK,MAAOoC,OAAZ,CACJA,MAAA,CAAQ,QAAS,EAAG,CACnB,MAAOpC,EADY,CAApB,CADI,CAMJD,CAAAC,SANI,CAMcA,CAjIG,CAApB,CAAA,CAoIG,IApIH;",
+"lineCount":9,
+"mappings":"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",
 "sources":["filesize.js"],
-"names":["global","filesize","arg","descriptor","result","skip","i","base","bits","neg","num","round","size","sizes","unix","spacer","suffixes","isNaN","Error","undefined","Number","suffix","options","bite","test","toFixed","bit","toLowerCase","charAt","z","right","exec","zero","parseInt","radix","exports","module","define"]
+"names":["global","filesize","arg","descriptor","result","e","bits","ceil","neg","num","round","unix","spacer","suffixes","isNaN","Error","base","undefined","Number","suffix","Math","floor","log","pow","toFixed","si","bit","test","toLowerCase","charAt","z","right","exec","zero","parseInt","radix","exports","module","define"]
 }
diff --git a/lib/filesize.min.js b/lib/filesize.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "filesize",
   "description": "JavaScript library to generate a human readable String describing the file size",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "homepage": "http://filesizejs.com",
   "author": {
     "name": "Jason Mulligan",

diff --git a/src/filesize.js b/src/filesize.js
@@ -9,8 +9,7 @@
 function filesize ( arg, descriptor ) {
 	var result = "",
 	    skip   = false,
-	    i      = 6,
-	    base, bits, neg, num, round, size, sizes, unix, spacer, suffix, z, suffixes;
+	    e, base, bits, ceil, neg, num, round, unix, spacer, suffix, z, suffixes;
 
 	if ( isNaN( arg ) ) {
 		throw new Error( "Invalid arguments" );
@@ -25,6 +24,7 @@ function filesize ( arg, descriptor ) {
 	suffixes   = descriptor.suffixes !== undefined ? descriptor.suffixes : {};
 	num        = Number( arg );
 	neg        = ( num < 0 );
+	ceil       = base > 2 ? 1000 : 1024;
 
 	// Flipping a negative number to determine the size
 	if ( neg ) {
@@ -42,45 +42,50 @@ function filesize ( arg, descriptor ) {
 		}
 	}
 	else {
-		sizes = options[base][bits ? "bits" : "bytes"];
+		e = Math.floor( Math.log( num ) / Math.log( 1000 ) );
 
-		while ( i-- ) {
-			size   = sizes[i][1];
-			suffix = sizes[i][0];
-
-			if ( num >= size ) {
-				// Treating bytes as cardinal
-				if ( bite.test( suffix ) ) {
-					skip  = true;
-					round = 0;
-				}
+		if ( base === 2 ) {
+			result = num / Math.pow( 2, ( e * 10 ) );
+		}
+		else {
+			result = num / Math.pow( 1000, e );
+		}
 
-				result = ( num / size ).toFixed( round );
+		if ( bits ) {
+			result = ( result * 8 );
 
-				if ( !skip && unix ) {
-					if ( bits && bit.test( suffix ) ) {
-						suffix = suffix.toLowerCase();
-					}
+			if ( result > ceil ) {
+				result = result / ceil;
+				e++;
+			}
+		}
 
-					suffix = suffix.charAt( 0 );
-					z      = right.exec( result );
+		result = result.toFixed( e > 0 ? round : 0 );
+		suffix = si[bits ? "bits" : "bytes"][e];
 
-					if ( !bits && suffix === "k" ) {
-						suffix = "K";
-					}
+		if ( !skip && unix ) {
+			if ( bits && bit.test( suffix ) ) {
+				suffix = suffix.toLowerCase();
+			}
 
-					if ( z !== null && z[1] !== undefined && zero.test( z[1] ) ) {
-						result = parseInt( result, radix );
-					}
+			suffix = suffix.charAt( 0 );
+			z      = right.exec( result );
 
-					result += spacer + ( suffixes[suffix] || suffix );
-				}
-				else if ( !unix ) {
-					result += spacer + ( suffixes[suffix] || suffix );
-				}
+			if ( suffix === "B" ) {
+				suffix = "";
+			}
+			else if ( !bits && suffix === "k" ) {
+				suffix = "K";
+			}
 
-				break;
+			if ( z !== null && z[1] !== undefined && zero.test( z[1] ) ) {
+				result = parseInt( result, radix );
 			}
+
+			result += spacer + ( suffixes[suffix] || suffix );
+		}
+		else if ( !unix ) {
+			result += spacer + ( suffixes[suffix] || suffix );
 		}
 	}
 

diff --git a/src/intro.js b/src/intro.js
@@ -2,7 +2,6 @@
 "use strict";
 
 var bit   = /b$/,
-    bite  = /^B$/,
     radix = 10,
     right = /\.(.*)/,
     zero  = /^0$/;
diff --git a/src/si.js b/src/si.js
@@ -0,0 +1,9 @@
+/**
+ * SI suffixes
+ *
+ * @type {Object}
+ */
+var si = {
+	bits  : ["B", "kb", "Mb", "Gb", "Tb", "Pb"],
+	bytes : ["B", "kB", "MB", "GB", "TB", "PB"]
+};
diff --git a/test/filesize_test.js b/test/filesize_test.js
@@ -41,9 +41,9 @@ exports["filesize"] = {
 		test.equal(filesize(this.byte, {base: 2, round: 1}),                    "1 B",      "Should be '1 B'");
 		test.equal(filesize(this.byte, {base: 2, round: 1, spacer: ""}),        "1B",       "Should be '1B'");
 		test.equal(filesize(this.byte, {base: 2, unix: true}),                  "1",        "Should be '1'");
-		test.equal(filesize(this.byte, {base: 2, bits :true}),                  "1 B",      "Should be '1 B'");
-		test.equal(filesize(this.byte, {base: 2, round: 1, bits: true}),        "1 B",      "Should be '1 B'");
-		test.equal(filesize(this.byte, {base: 2, unix: true, bits: true}),      "1",        "Should be '1'");
+		test.equal(filesize(this.byte, {base: 2, bits :true}),                  "8 B",      "Should be '8 B'");
+		test.equal(filesize(this.byte, {base: 2, round: 1, bits: true}),        "8 B",      "Should be '8 B'");
+		test.equal(filesize(this.byte, {base: 2, unix: true, bits: true}),      "8",        "Should be '8'");
 
 		test.equal(filesize(this.zero, {base: 2, base: 2}),                     "0 B",      "Should be '0 B'");
 		test.equal(filesize(this.zero, {base: 2, round: 1}),                    "0 B",      "Should be '0 B'");
@@ -86,9 +86,9 @@ exports["filesize"] = {
 		test.equal(filesize(this.byte, {round: 1}),                    "1 B",      "Should be '1 B'");
 		test.equal(filesize(this.byte, {round: 1, spacer: ""}),        "1B",       "Should be '1B'");
 		test.equal(filesize(this.byte, {unix: true}),                  "1",        "Should be '1'");
-		test.equal(filesize(this.byte, {bits :true}),                  "1 B",      "Should be '1 B'");
-		test.equal(filesize(this.byte, {round: 1, bits: true}),        "1 B",      "Should be '1 B'");
-		test.equal(filesize(this.byte, {unix: true, bits: true}),      "1",        "Should be '1'");
+		test.equal(filesize(this.byte, {bits :true}),                  "8 B",      "Should be '8 B'");
+		test.equal(filesize(this.byte, {round: 1, bits: true}),        "8 B",      "Should be '8 B'");
+		test.equal(filesize(this.byte, {unix: true, bits: true}),      "8",        "Should be '8'");
 
 		test.equal(filesize(this.zero),                                "0 B",      "Should be '0 B'");
 		test.equal(filesize(this.zero, {round: 1}),                    "0 B",      "Should be '0 B'");