moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add countWithAbbr and countAbbr format specifiers

This commit is contained in:
Bryan Ashby 2017-09-09 13:59:23 -06:00
parent d545c86616
commit 9d09390561
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/string_format.js
View File

@ -2,12 +2,15 @@
'use strict'; 'use strict';
const EnigError = require('./enig_error.js').EnigError; const EnigError = require('./enig_error.js').EnigError;
const pad = require('./string_util.js').pad;
const stylizeString = require('./string_util.js').stylizeString; const {
const renderStringLength = require('./string_util.js').renderStringLength; pad,
const renderSubstr = require('./string_util.js').renderSubstr; stylizeString,
const formatByteSize = require('./string_util.js').formatByteSize; renderStringLength,
const formatByteSizeAbbr = require('./string_util.js').formatByteSizeAbbr; renderSubstr,
formatByteSize, formatByteSizeAbbr,
formatCount, formatCountAbbr,
} = require('./string_util.js');
// deps // deps
const _ = require('lodash'); const _ = require('lodash');
@ -273,6 +276,9 @@ const transformers = {
sizeWithAbbr : (n) => formatByteSize(n, true, 2), sizeWithAbbr : (n) => formatByteSize(n, true, 2),
sizeWithoutAbbr : (n) => formatByteSize(n, false, 2), sizeWithoutAbbr : (n) => formatByteSize(n, false, 2),
sizeAbbr : (n) => formatByteSizeAbbr(n), sizeAbbr : (n) => formatByteSizeAbbr(n),
countWithAbbr : (n) => formatCount(n, true, 0),
countWithoutAbbr : (n) => formatCount(n, false, 0),
countAbbr : (n) => formatCountAbbr(n),
}; };
function transformValue(transformerName, value) { function transformValue(transformerName, value) {

29
core/string_util.js
View File

@ -23,6 +23,8 @@ exports.renderSubstr = renderSubstr;
exports.renderStringLength = renderStringLength; exports.renderStringLength = renderStringLength;
exports.formatByteSizeAbbr = formatByteSizeAbbr; exports.formatByteSizeAbbr = formatByteSizeAbbr;
exports.formatByteSize = formatByteSize; exports.formatByteSize = formatByteSize;
exports.formatCountAbbr = formatCountAbbr;
exports.formatCount = formatCount;
exports.cleanControlCodes = cleanControlCodes; exports.cleanControlCodes = cleanControlCodes;
exports.isAnsi = isAnsi; exports.isAnsi = isAnsi;
exports.isAnsiLine = isAnsiLine; exports.isAnsiLine = isAnsiLine;
@ -316,21 +318,40 @@ function renderStringLength(s) {
return len; return len;
} }
const SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ]; // :) const BYTE_SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ]; // :)
function formatByteSizeAbbr(byteSize) { function formatByteSizeAbbr(byteSize) {
if(0 === byteSize) { if(0 === byteSize) {
return SIZE_ABBRS[0]; // B return BYTE_SIZE_ABBRS[0]; // B
} }
return SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))]; return BYTE_SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))];
} }
function formatByteSize(byteSize, withAbbr = false, decimals = 2) { function formatByteSize(byteSize, withAbbr = false, decimals = 2) {
const i = 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024)); const i = 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024));
let result = parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals)); let result = parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals));
if(withAbbr) { if(withAbbr) {
result += ` ${SIZE_ABBRS[i]}`; result += ` ${BYTE_SIZE_ABBRS[i]}`;
}
return result;
}
const COUNT_ABBRS = [ '', 'K', 'M', 'B', 'T', 'P', 'E', 'Z', 'Y' ];
function formatCountAbbr(count) {
if(count < 1000) {
return '';
}
return COUNT_ABBRS[Math.floor(Math.log(count) / Math.log(1000))];
}
function formatCount(count, withAbbr = false, decimals = 2) {
const i = 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000));
let result = parseFloat((count / Math.pow(1000, i)).toFixed(decimals));
if(withAbbr) {
result += `${COUNT_ABBRS[i]}`;
} }
return result; return result;
} }