X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;h=35481b2cf0d1576e68814191296b3d8fdafca25d;hb=11f9e5f37c2570f0376a4c1898c6aea3a7f28fc7;hp=09b0cb9f1cc989815f84f67a6ff1109fdc7097c8;hpb=72c32e8891f0964080f957fb6f4ff332b2ca203f;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index 09b0cb9..35481b2 100644
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@ -4,10 +4,10 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -43,7 +43,7 @@ public class IOUtils {
 	 * 
 	 * @param in
 	 *            the data source
-	 * @param target
+	 * @param out
 	 *            the target {@link OutputStream}
 	 * 
 	 * @throws IOException
@@ -112,7 +112,7 @@ public class IOUtils {
 	 *            the source {@link File} (which can be a directory)
 	 * @param dest
 	 *            the destination <tt>.zip</tt> file
-	 * @param srctIsRoot
+	 * @param srcIsRoot
 	 *            FALSE if we need to add a {@link ZipEntry} for src, TRUE to
 	 *            add it at the root of the ZIP
 	 * 
@@ -173,12 +173,34 @@ public class IOUtils {
 	 *             in case of I/O error
 	 */
 	public static String readSmallFile(File file) throws IOException {
-		BufferedReader reader = new BufferedReader(new FileReader(file));
+		InputStream stream = new FileInputStream(file);
+		try {
+			return readSmallStream(stream);
+		} finally {
+			stream.close();
+		}
+	}
+
+	/**
+	 * Read the whole {@link InputStream} content into a {@link String}.
+	 * 
+	 * @param stream
+	 *            the {@link InputStream}
+	 * 
+	 * @return the content
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public static String readSmallStream(InputStream stream) throws IOException {
+		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 {
@@ -196,20 +218,32 @@ public class IOUtils {
 	 *            the target to delete
 	 */
 	public static void deltree(File target) {
-		for (File file : target.listFiles()) {
-			if (file.isDirectory()) {
+		File[] files = target.listFiles();
+		if (files != null) {
+			for (File file : files) {
 				deltree(file);
-			} else {
-				if (!file.delete()) {
-					System.err.println("Cannot delete file: "
-							+ file.getAbsolutePath());
-				}
 			}
 		}
 
 		if (!target.delete()) {
-			System.err.println("Cannot delete file: "
-					+ target.getAbsolutePath());
+			System.err.println("Cannot delete: " + target.getAbsolutePath());
+		}
+	}
+
+	/**
+	 * Open the given /-separated resource (from the binary root).
+	 * 
+	 * @param name
+	 *            the resource name
+	 * 
+	 * @return the opened resource if found, NLL if not
+	 */
+	public static InputStream openResource(String name) {
+		ClassLoader loader = IOUtils.class.getClassLoader();
+		if (loader == null) {
+			loader = ClassLoader.getSystemClassLoader();
 		}
+
+		return loader.getResourceAsStream(name);
 	}
 }