Serial: enums and BufferedImages

[nikiroo-utils.git] / src / be / nikiroo / utils / StringUtils.java

diff --git a/src/be/nikiroo/utils/StringUtils.java b/src/be/nikiroo/utils/StringUtils.java
index adebd7a50022b3f9d838a3b5e5d68345cea6e048..af69845b1a6c416f55e162b506c49b7ad2d938cf 100644 (file)
--- a/src/be/nikiroo/utils/StringUtils.java
+++ b/src/be/nikiroo/utils/StringUtils.java
@@ -14,6 +14,7 @@ import java.text.Normalizer.Form;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Scanner;
 import java.util.regex.Pattern;
 
 import javax.imageio.ImageIO;
@@ -186,15 +187,15 @@ public class StringUtils {
         * Convert between time as a {@link String} to milliseconds in a "static"
         * way (to exchange data over the wire, for instance).
         * 
-        * @param time
+        * @param displayTime
         *            the time as a {@link String}
         * 
         * @return the time in milliseconds
         */
-       static public long toTime(String display) {
+       static public long toTime(String displayTime) {
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                try {
-                       return sdf.parse(display).getTime();
+                       return sdf.parse(displayTime).getTime();
                } catch (ParseException e) {
                        return -1;
                }
@@ -213,10 +214,33 @@ public class StringUtils {
         *             in case of IO error
         */
        static public String fromImage(BufferedImage image) throws IOException {
+               return fromImage(image, null);
+       }
+
+       /**
+        * Convert the given {@link Image} object into a Base64 representation of
+        * the same {@link Image}. object.
+        * 
+        * @param image
+        *            the {@link Image} object to convert
+        * @param format
+        *            the image format to use to serialise it (default is PNG)
+        * 
+        * @return the Base64 representation
+        * 
+        * @throws IOException
+        *             in case of IO error
+        */
+       static public String fromImage(BufferedImage image, String format)
+                       throws IOException {
+               if (format == null) {
+                       format = "png";
+               }
+
                String imageString = null;
                ByteArrayOutputStream out = new ByteArrayOutputStream();
 
-               ImageIO.write(image, "jpeg", out);
+               ImageIO.write(image, format, out);
                byte[] imageBytes = out.toByteArray();
 
                imageString = new String(Base64.encodeBytes(imageBytes));
@@ -227,11 +251,11 @@ public class StringUtils {
        }
 
        /**
-        * Convert the given {@link File} image into a Base64 representation of the
-        * same {@link File}.
+        * Convert the given image into a Base64 representation of the same
+        * {@link File}.
         * 
-        * @param file
-        *            the {@link File} image to convert
+        * @param in
+        *            the image to convert
         * 
         * @return the Base64 representation
         * 
@@ -366,4 +390,26 @@ public class StringUtils {
                                HtmlEscapeType.HTML4_NAMED_REFERENCES_DEFAULT_TO_HEXA,
                                HtmlEscapeLevel.LEVEL_1_ONLY_MARKUP_SIGNIFICANT);
        }
+
+       public static String zip64(String data) {
+               try {
+                       return Base64.encodeBytes(data.getBytes(), Base64.GZIP);
+               } catch (IOException e) {
+                       e.printStackTrace();
+                       return null;
+               }
+       }
+
+       public static String unzip64(String data) throws IOException {
+               ByteArrayInputStream in = new ByteArrayInputStream(Base64.decode(data,
+                               Base64.GZIP));
+
+               Scanner scan = new Scanner(in);
+               scan.useDelimiter("\\A");
+               try {
+                       return scan.next();
+               } finally {
+                       scan.close();
+               }
+       }
 }