Version 4.0.0: java.awt dependencies move

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

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index 35481b2cf0d1576e68814191296b3d8fdafca25d..f857850dea11db8d4185fd21ad226b86380cc034 100644 (file)
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@ -1,6 +1,7 @@
 package be.nikiroo.utils;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -193,19 +194,19 @@ public class IOUtils {
         *             in case of I/O error
         */
        public static String readSmallStream(InputStream stream) throws IOException {
+               // do NOT close the reader, or the related stream will be closed, too
+               // reader.close();
                BufferedReader reader = new BufferedReader(
                                new InputStreamReader(stream));
-               try {
-                       StringBuilder builder = new StringBuilder();
-                       for (String line = reader.readLine(); line != null; line = reader
-                                       .readLine()) {
-                               builder.append(line);
-                               builder.append("\n");
-                       }
-                       return builder.toString();
-               } finally {
-                       reader.close();
+
+               StringBuilder builder = new StringBuilder();
+               for (String line = reader.readLine(); line != null; line = reader
+                               .readLine()) {
+                       builder.append(line);
+                       builder.append("\n");
                }
+
+               return builder.toString();
        }
 
        /**
@@ -246,4 +247,69 @@ public class IOUtils {
 
                return loader.getResourceAsStream(name);
        }
+
+       /**
+        * Return a resetable {@link InputStream} from this stream, and reset it.
+        * 
+        * @param in
+        *            the input stream
+        * @return the resetable stream, which <b>may</b> be the same
+        * 
+        * @throws IOException
+        *             in case of I/O error
+        */
+       public static InputStream forceResetableStream(InputStream in)
+                       throws IOException {
+               MarkableFileInputStream tmpIn = null;
+               File tmp = null;
+
+               boolean resetable = in.markSupported();
+               if (resetable) {
+                       try {
+                               in.reset();
+                       } catch (IOException e) {
+                               resetable = false;
+                       }
+               }
+
+               if (resetable) {
+                       return in;
+               }
+
+               tmp = File.createTempFile(".tmp-stream", ".tmp");
+               try {
+                       write(in, tmp);
+                       tmpIn = new MarkableFileInputStream(new FileInputStream(tmp));
+                       return tmpIn;
+               } finally {
+                       try {
+                               if (tmpIn != null) {
+                                       tmpIn.close();
+                               }
+                       } finally {
+                               tmp.delete();
+                       }
+               }
+       }
+
+       /**
+        * Convert the {@link InputStream} into a byte array.
+        * 
+        * @param in
+        *            the input stream
+        * 
+        * @return the array
+        * 
+        * @throws IOException
+        *             in case of I/O error
+        */
+       public static byte[] toByteArray(InputStream in) throws IOException {
+               ByteArrayOutputStream out = new ByteArrayOutputStream();
+               write(in, out);
+
+               byte[] array = out.toByteArray();
+               out.close();
+
+               return array;
+       }
 }