Streams: bug fixes

[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 c7cbe259b5abab2e0d65d7639b83641eddd7a357..9ab638af06e1486122de1c059abec3eb5b0a4980 100644 (file)
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@ -1,14 +1,11 @@
 package be.nikiroo.utils;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,6 +13,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import be.nikiroo.utils.streams.MarkableFileInputStream;
+
 /**
  * This class offer some utilities based around Streams and Files.
  * 
@@ -55,9 +54,11 @@ public class IOUtils {
         */
        public static void write(InputStream in, OutputStream out)
                        throws IOException {
-               byte buffer[] = new byte[4069];
-               for (int len = 0; (len = in.read(buffer)) > 0;) {
+               byte buffer[] = new byte[4096];
+               int len = in.read(buffer);
+               while (len > -1) {
                        out.write(buffer, 0, len);
+                       len = in.read(buffer);
                }
        }
 
@@ -229,11 +230,11 @@ public class IOUtils {
         */
        public static void writeSmallFile(File file, String content)
                        throws IOException {
-               FileWriter writerVersion = new FileWriter(file);
+               FileOutputStream out = new FileOutputStream(file);
                try {
-                       writerVersion.write(content);
+                       out.write(content.getBytes("UTF-8"));
                } finally {
-                       writerVersion.close();
+                       out.close();
                }
        }
 
@@ -269,19 +270,14 @@ 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));
-
-               StringBuilder builder = new StringBuilder();
-               for (String line = reader.readLine(); line != null; line = reader
-                               .readLine()) {
-                       builder.append(line);
-                       builder.append("\n");
+               ByteArrayOutputStream out = new ByteArrayOutputStream();
+               try {
+                       write(stream, out);
+                       return out.toString("UTF-8");
+               } finally {
+                       // do NOT close, or the related stream will be closed, too
+                       // out.close();
                }
-
-               return builder.toString();
        }
 
        /**
@@ -451,12 +447,12 @@ public class IOUtils {
         */
        public static byte[] toByteArray(InputStream in) throws IOException {
                ByteArrayOutputStream out = new ByteArrayOutputStream();
-               write(in, out);
-
-               byte[] array = out.toByteArray();
-               out.close();
-
-               return array;
+               try {
+                       write(in, out);
+                       return out.toByteArray();
+               } finally {
+                       out.close();
+               }
        }
 
        /**