free output is now aligned and shows percent used

This commit is contained in:
Olivier Gagnon 2019-03-29 12:26:25 -04:00
parent 5592a8bc96
commit 92f7d12c0e

@ -1640,9 +1640,15 @@ let Terminal = {
postError("Incorrect usage of free command. Usage: free"); postError("Incorrect usage of free command. Usage: free");
return; return;
} }
post("Total: " + numeralWrapper.format(Player.getCurrentServer().maxRam, '0.00') + " GB"); const ram = numeralWrapper.format(Player.getCurrentServer().maxRam, '0.00');
post("Used: " + numeralWrapper.format(Player.getCurrentServer().ramUsed, '0.00') + " GB"); const used = numeralWrapper.format(Player.getCurrentServer().ramUsed, '0.00');
post("Available: " + numeralWrapper.format(Player.getCurrentServer().maxRam - Player.getCurrentServer().ramUsed, '0.00') + " GB"); const avail = numeralWrapper.format(Player.getCurrentServer().maxRam - Player.getCurrentServer().ramUsed, '0.00');
const maxLength = Math.max(ram.length, Math.max(used.length, avail.length));
const usedPercent = numeralWrapper.format(Player.getCurrentServer().ramUsed/Player.getCurrentServer().maxRam*100, '0.00');
post(`Total: ${" ".repeat(maxLength-ram.length)}${ram} GB`);
post(`Used: ${" ".repeat(maxLength-used.length)}${used} GB (${usedPercent}%)`);
post(`Available: ${" ".repeat(maxLength-avail.length)}${avail} GB`);
}, },
executeKillCommand: function(commandArray) { executeKillCommand: function(commandArray) {