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

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index d833114..e9a378c 100644
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@ -13,10 +13,11 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
 /**
- * This class offer some utilities based around Streams.
+ * This class offer some utilities based around Streams and Files.
  * 
  * @author niki
  */
@@ -141,6 +142,58 @@ public class IOUtils {
 		}
 	}
 
+	/**
+	 * Unzip the given ZIP file into the target directory.
+	 * 
+	 * @param zipFile
+	 *            the ZIP file
+	 * @param targetDirectory
+	 *            the target directory
+	 * 
+	 * @return the number of extracted files (not directories)
+	 * 
+	 * @throws IOException
+	 *             in case of I/O errors
+	 */
+	public static long unzip(File zipFile, File targetDirectory)
+			throws IOException {
+		long count = 0;
+
+		if (targetDirectory.exists() && targetDirectory.isFile()) {
+			throw new IOException("Cannot unzip " + zipFile + " into "
+					+ targetDirectory + ": it is not a directory");
+		}
+
+		targetDirectory.mkdir();
+		if (!targetDirectory.exists()) {
+			throw new IOException("Cannot create target directory "
+					+ targetDirectory);
+		}
+
+		FileInputStream in = new FileInputStream(zipFile);
+		try {
+			ZipInputStream zipStream = new ZipInputStream(in);
+			try {
+				for (ZipEntry entry = zipStream.getNextEntry(); entry != null; entry = zipStream
+						.getNextEntry()) {
+					File file = new File(targetDirectory, entry.getName());
+					if (entry.isDirectory()) {
+						file.mkdirs();
+					} else {
+						IOUtils.write(zipStream, file);
+						count++;
+					}
+				}
+			} finally {
+				zipStream.close();
+			}
+		} finally {
+			in.close();
+		}
+
+		return count;
+	}
+
 	/**
 	 * Write the {@link String} content to {@link File}.
 	 * 
@@ -160,7 +213,23 @@ public class IOUtils {
 			dir.mkdirs();
 		}
 
-		FileWriter writerVersion = new FileWriter(new File(dir, filename));
+		writeSmallFile(new File(dir, filename), content);
+	}
+
+	/**
+	 * Write the {@link String} content to {@link File}.
+	 * 
+	 * @param file
+	 *            the {@link File} to write
+	 * @param content
+	 *            the content
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public static void writeSmallFile(File file, String content)
+			throws IOException {
+		FileWriter writerVersion = new FileWriter(file);
 		try {
 			writerVersion.write(content);
 		} finally {
@@ -379,4 +448,24 @@ public class IOUtils {
 
 		return array;
 	}
+
+	/**
+	 * Convert the {@link File} into a byte array.
+	 * 
+	 * @param file
+	 *            the input {@link File}
+	 * 
+	 * @return the array
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public static byte[] toByteArray(File file) throws IOException {
+		FileInputStream fis = new FileInputStream(file);
+		try {
+			return toByteArray(fis);
+		} finally {
+			fis.close();
+		}
+	}
 }