X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;h=5a7e179b684d9423182c048376f2bf014c54077b;hb=8e76f6ab13a8a4a651f2518b6c91d5e6424c7922;hp=e9a378c0fd6e279c1568afb848808ab83f9cdf5e;hpb=bb60bd13efae59e804e5d7a5a7590a020835966f;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index e9a378c..5a7e179 100644
--- 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 > 0) {
 			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();
 	}
 
 	/**
@@ -396,9 +392,6 @@ public class IOUtils {
 	 */
 	public static InputStream forceResetableStream(InputStream in)
 			throws IOException {
-		MarkableFileInputStream tmpIn = null;
-		File tmp = null;
-
 		boolean resetable = in.markSupported();
 		if (resetable) {
 			try {
@@ -412,19 +405,32 @@ public class IOUtils {
 			return in;
 		}
 
-		tmp = File.createTempFile(".tmp-stream", ".tmp");
+		final File 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();
+			in.close();
+
+			final FileInputStream fis = new FileInputStream(tmp);
+			return new MarkableFileInputStream(fis) {
+				@Override
+				public void close() throws IOException {
+					try {
+						try {
+							super.close();
+						} finally {
+							try {
+								fis.close();
+							} catch (IOException e) {
+							}
+						}
+					} finally {
+						tmp.delete();
+					}
 				}
-			} finally {
-				tmp.delete();
-			}
+			};
+		} catch (IOException e) {
+			tmp.delete();
+			throw e;
 		}
 	}
 
@@ -441,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();
+		}
 	}
 
 	/**