From b38e0c7b603fe407869910bffd270844a75fcbfd Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@laposte.net>
Date: Sun, 29 Mar 2020 21:22:31 +0200
Subject: [PATCH] improve MemoryUtil

---
 .../fr/pandacube/util/MinecraftWebUtil.java   |  2 +-
 .../util/measurement/MemoryUtil.java          | 74 +++++++++++++++----
 2 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/src/main/java/fr/pandacube/util/MinecraftWebUtil.java b/src/main/java/fr/pandacube/util/MinecraftWebUtil.java
index 2724522..bf0a0f3 100644
--- a/src/main/java/fr/pandacube/util/MinecraftWebUtil.java
+++ b/src/main/java/fr/pandacube/util/MinecraftWebUtil.java
@@ -24,7 +24,7 @@ public class MinecraftWebUtil {
 			if (c == code_prefix && (i<ligne.length()-1)) {
 				i++;
 				c = ligne.charAt(i);
-				if (color_char.contains(new Character(c).toString().toLowerCase())) {
+				if (color_char.contains(new String(new char[] {Character.toLowerCase(c)}))) {
 					if (bold) {
 						builder += "</span>";
 						bold = false;
diff --git a/src/main/java/fr/pandacube/util/measurement/MemoryUtil.java b/src/main/java/fr/pandacube/util/measurement/MemoryUtil.java
index 36b6f32..53c1358 100644
--- a/src/main/java/fr/pandacube/util/measurement/MemoryUtil.java
+++ b/src/main/java/fr/pandacube/util/measurement/MemoryUtil.java
@@ -3,30 +3,72 @@ package fr.pandacube.util.measurement;
 import java.text.DecimalFormat;
 
 public class MemoryUtil {
+	
+	public enum MemoryUnit {
+		B(1, 1, null),
+		KB(1024, 1000, "k"),
+		MB(1024 * 1024, 1000_000, "M"),
+		GB(1024 * 1024 * 1024, 1000_000_000, "G");
+
+		final long valueTrad;
+		final long valueSI;
+		final String unitMultiplier;
+		
+		public long toUnitRound(long byteCount, boolean si) {
+			return byteCount / value(si);
+		}
+		
+		public double toUnit(long byteCount, boolean si) {
+			return byteCount / (double)value(si);
+		}
+		
+		public long value(boolean si) {
+			return si ? valueSI : valueTrad;
+		}
+		
+		public String unit(boolean si) {
+			return unitMultiplier == null ? "o" : (unitMultiplier + (si ? "o" : "io"));
+		}
+		
+		private MemoryUnit(long vTrad, long vSI, String uMult) {
+			valueTrad = vTrad;
+			valueSI = vSI;
+			unitMultiplier = uMult;
+		}
+	}
 
 	private static final DecimalFormat format = new DecimalFormat("#####0.00");
 
-	public static String humanReadableSize(long octet, boolean si) {
+	public static String humanReadableSize(long octet, MemoryUnit roundTo, boolean si) {
 		
 		boolean neg = octet < 0;
 
-		double size = Math.abs(octet);
-
-		int diveBy = si ? 1000 : 1024;
-
-		if (size < diveBy) return (neg ? "-" : "") + size + "o";
-		size /= diveBy;
-		if (size < diveBy) return (neg ? "-" : "") + format.format(size) + (si ? "ko" : "kio");
-		size /= diveBy;
-		if (size < diveBy) return (neg ? "-" : "") + format.format(size) + (si ? "Mo" : "Mio");
-		size /= diveBy;
-		if (size < diveBy) return (neg ? "-" : "") + format.format(size) + (si ? "Go" : "Gio");
-		size /= diveBy;
-
-		return (neg ? "-" : "") + format.format(size) + (si ? "To" : "Tio");
+		long size = Math.abs(octet);
+		
+		MemoryUnit unit = roundTo;
+		for (int ui = MemoryUnit.values().length - 1; ui >= 0; ui--) {
+			MemoryUnit u = MemoryUnit.values()[ui];
+			if (u == roundTo)
+				break;
+			if (size < u.value(si))
+				continue;
+			unit = u;
+			break;
+		}
+		
+		String dispValue;
+		if (unit == roundTo) {
+			dispValue = ""+unit.toUnitRound(size, si);
+		}
+		else {
+			dispValue = format.format(unit.toUnit(size, si));
+		}
+		
+		return (neg ? "-" : "") + dispValue + unit.unit(si);
 	}
 
 	public static String humanReadableSize(long octet) {
-		return humanReadableSize(octet, false);
+		return humanReadableSize(octet, MemoryUnit.B, false);
 	}
+	
 }