X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FStringUtils.java;h=baa8e26c17fcfac7ba09c21188d6c6f30b765e23;hb=f28a134e4d06ee40d62c0c62123fc4799d49d8eb;hp=36fdfbe2c967359d0677c3935bd1c56b75346b44;hpb=8758aebb45238a0193b8d09b987b80ac3cdf0513;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/StringUtils.java b/src/be/nikiroo/utils/StringUtils.java
index 36fdfbe..baa8e26 100644
--- a/src/be/nikiroo/utils/StringUtils.java
+++ b/src/be/nikiroo/utils/StringUtils.java
@@ -21,6 +21,9 @@ import org.unbescape.html.HtmlEscape;
 import org.unbescape.html.HtmlEscapeLevel;
 import org.unbescape.html.HtmlEscapeType;
 
+import be.nikiroo.utils.streams.Base64InputStream;
+import be.nikiroo.utils.streams.Base64OutputStream;
+
 /**
  * This class offer some utilities based around {@link String}s.
  * 
@@ -604,12 +607,11 @@ public class StringUtils {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
+	@Deprecated
 	public static OutputStream base64(OutputStream data, boolean zip,
 			boolean breakLines) throws IOException {
-		OutputStream out = new Base64.OutputStream(data,
-				breakLines ? Base64.DO_BREAK_LINES & Base64.ENCODE
-						: Base64.ENCODE);
-
+		OutputStream out = new Base64OutputStream(data, true);
+		
 		if (zip) {
 			out = new java.util.zip.GZIPOutputStream(out);
 		}
@@ -634,14 +636,14 @@ public class StringUtils {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
+	@Deprecated
 	public static InputStream base64(InputStream data, boolean zip,
 			boolean breakLines) throws IOException {
 		if (zip) {
 			data = new java.util.zip.GZIPInputStream(data);
 		}
 
-		return new Base64.InputStream(data, breakLines ? Base64.DO_BREAK_LINES
-				& Base64.ENCODE : Base64.ENCODE);
+		return new Base64InputStream(data, true);
 	}
 
 	/**
@@ -682,9 +684,11 @@ public class StringUtils {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
+	@Deprecated
 	public static OutputStream unbase64(OutputStream data, boolean zip)
 			throws IOException {
-		OutputStream out = new Base64.OutputStream(data, Base64.DECODE);
+		OutputStream out = new Base64OutputStream(data, false);
+		
 
 		if (zip) {
 			out = new java.util.zip.GZIPOutputStream(out);
@@ -708,13 +712,14 @@ public class StringUtils {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
+	@Deprecated
 	public static InputStream unbase64(InputStream data, boolean zip)
 			throws IOException {
 		if (zip) {
 			data = new java.util.zip.GZIPInputStream(data);
 		}
 
-		return new Base64.InputStream(data, Base64.DECODE);
+		return new Base64InputStream(data, false);
 	}
 
 	/**
@@ -799,11 +804,13 @@ public class StringUtils {
 	 * Return a display {@link String} for the given value, which can be
 	 * suffixed with "k" or "M" depending upon the number, if it is big enough.
 	 * <p>
-	 * Example:
+	 * <p>
+	 * Examples:
 	 * <ul>
-	 * <li><tt>8765</tt> becomes "8k"</li>
-	 * <li><tt>998765</tt> becomes "998k"</li>
-	 * <li><tt>12987364</tt> becomes "12M"</li>
+	 * <li><tt>8 765</tt> becomes "8k"</li>
+	 * <li><tt>998 765</tt> becomes "998k"</li>
+	 * <li><tt>12 987 364</tt> becomes "12M"</li>
+	 * <li><tt>5 534 333 221</tt> becomes "5G"</li>
 	 * </ul>
 	 * 
 	 * @param value
@@ -819,11 +826,12 @@ public class StringUtils {
 	 * Return a display {@link String} for the given value, which can be
 	 * suffixed with "k" or "M" depending upon the number, if it is big enough.
 	 * <p>
-	 * Example:
+	 * Examples (assuming decimalPositions = 1):
 	 * <ul>
-	 * <li><tt>8765</tt> becomes "8.7k"</li>
-	 * <li><tt>998765</tt> becomes "998.7k"</li>
-	 * <li><tt>12987364</tt> becomes "12.9M"</li>
+	 * <li><tt>8 765</tt> becomes "8.7k"</li>
+	 * <li><tt>998 765</tt> becomes "998.7k"</li>
+	 * <li><tt>12 987 364</tt> becomes "12.9M"</li>
+	 * <li><tt>5 534 333 221</tt> becomes "5.5G"</li>
 	 * </ul>
 	 * 
 	 * @param value
@@ -834,34 +842,41 @@ public class StringUtils {
 	 * @return the display value
 	 */
 	public static String formatNumber(long value, int decimalPositions) {
+		long userValue = value;
 		String suffix = "";
-		String deci = "";
+		long mult = 1;
 
-		int deciDigits = 0;
 		if (value >= 1000000000l) {
-			deciDigits = (int) (value % 1000000000l);
-			value = value / 1000000000l;
-			suffix = "G";
+			mult = 1000000000l;
+			userValue = value / 1000000000l;
+			suffix = " G";
 		} else if (value >= 1000000l) {
-			deciDigits = (int) (value % 1000000l);
-			value = value / 1000000l;
-			suffix = "M";
+			mult = 1000000l;
+			userValue = value / 1000000l;
+			suffix = " M";
 		} else if (value >= 1000l) {
-			deciDigits = (int) (value % 1000l);
-			value = value / 1000l;
-			suffix = "k";
+			mult = 1000l;
+			userValue = value / 1000l;
+			suffix = " k";
 		}
 
+		String deci = "";
 		if (decimalPositions > 0) {
-			deci = Integer.toString(deciDigits);
+			deci = Long.toString(value % mult);
+			int size = Long.toString(mult).length() - 1;
+			while (deci.length() < size) {
+				deci = "0" + deci;
+			}
+
 			deci = deci.substring(0, Math.min(decimalPositions, deci.length()));
 			while (deci.length() < decimalPositions) {
 				deci += "0";
 			}
+
 			deci = "." + deci;
 		}
 
-		return Long.toString(value) + deci + suffix;
+		return Long.toString(userValue) + deci + suffix;
 	}
 
 	/**
@@ -904,8 +919,11 @@ public class StringUtils {
 		if (value != null) {
 			value = value.trim().toLowerCase();
 			try {
-				int mult = 1;
-				if (value.endsWith("m")) {
+				long mult = 1;
+				if (value.endsWith("g")) {
+					value = value.substring(0, value.length() - 1).trim();
+					mult = 1000000000;
+				} else if (value.endsWith("m")) {
 					value = value.substring(0, value.length() - 1).trim();
 					mult = 1000000;
 				} else if (value.endsWith("k")) {