Improve bytes formatting.
Also may or may not perform a bit better. Most likely the former.
This commit is contained in:
parent
09120284c5
commit
0f4ddbd155
@ -1,25 +1,31 @@
|
|||||||
angular
|
(function() {
|
||||||
.module('webui.filters.bytes', [])
|
function fmtlen(len) {
|
||||||
.filter('changeLength', function() {
|
len = +len; // coerce to number
|
||||||
return function(len, pref) {
|
if (len <= 1024) {
|
||||||
len = parseFloat(len);
|
return len.toFixed(0) + " B";
|
||||||
if (len <= (1<<10)) return len.toFixed(1) + " " + pref;
|
}
|
||||||
else if(len <= (1<<20)) return (len/(1<<10)).toFixed(1) + " K" + pref;
|
len /= 1024;
|
||||||
else if(len <= (1<<30)) return (len/(1<<20)).toFixed(1) + " M" + pref;
|
if (len <= 1024) {
|
||||||
else return (len/(1<<30)).toFixed(1) + " G" + pref;
|
return len.toFixed(1) + " KB"
|
||||||
};
|
}
|
||||||
})
|
len /= 1024;
|
||||||
.filter('blength', ['$filter', function(filter) {
|
if (len <= 1024) {
|
||||||
return function(len) {
|
return len.toFixed(2) + " MB";
|
||||||
return filter('changeLength')(len, 'B');
|
}
|
||||||
};
|
len /= 1024;
|
||||||
}])
|
return len.toFixed(3) + " GB";
|
||||||
.filter('bspeed', ['$filter', function(filter) {
|
}
|
||||||
|
|
||||||
|
angular .module('webui.filters.bytes', [])
|
||||||
|
.filter('blength', ['$filter', function(filter) {
|
||||||
|
return fmtlen;
|
||||||
|
}])
|
||||||
|
.filter('bspeed', ['$filter', function(filter) {
|
||||||
return function(speed) {
|
return function(speed) {
|
||||||
return filter('changeLength')(speed, 'B/s');
|
return fmtlen(speed) + "/s";
|
||||||
};
|
};
|
||||||
}])
|
}])
|
||||||
.filter('time', function() {
|
.filter('time', function() {
|
||||||
function pad(f) {
|
function pad(f) {
|
||||||
return ("0" + f).substr(-2);
|
return ("0" + f).substr(-2);
|
||||||
}
|
}
|
||||||
@ -36,5 +42,6 @@ angular
|
|||||||
var days = Math.floor(time / 86400);
|
var days = Math.floor(time / 86400);
|
||||||
return days + "::" + pad(hrs) + ":" + pad(mins) + ":" + pad(secs);
|
return days + "::" + pad(hrs) + ":" + pad(mins) + ":" + pad(secs);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
})();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user