X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;h=3e2f6e761481fbf7c0e741539c7f811dbf272daa;hb=4110f63bcffb5112677fad45a6952314bde713df;hp=bf0686babca9e7addfbbd810a7a8e4d5fd66756d;hpb=59864f77f0b8d5a57f479152a3131093544af6b2;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index bf0686b..3e2f6e7 100644
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@ -13,6 +13,7 @@ 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;
 
 /**
@@ -89,8 +90,12 @@ public class IOUtils {
 				}
 				zip.putNextEntry(new ZipEntry(base + "/"));
 			}
-			for (File file : target.listFiles()) {
-				zip(zip, base, file, false);
+
+			File[] files = target.listFiles();
+			if (files != null) {
+				for (File file : files) {
+					zip(zip, base, file, false);
+				}
 			}
 		} else {
 			if (base == null || base.isEmpty()) {
@@ -137,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}.
 	 * 
@@ -234,13 +291,13 @@ public class IOUtils {
 			throws IOException {
 		List<File> list = deltree(target, null);
 		if (exception && !list.isEmpty()) {
-			String slist = "";
+			StringBuilder slist = new StringBuilder();
 			for (File file : list) {
-				slist += "\n" + file.getPath();
+				slist.append("\n").append(file.getPath());
 			}
 
 			throw new IOException("Cannot delete all the files from: <" //
-					+ target + ">:" + slist);
+					+ target + ">:" + slist.toString());
 		}
 
 		return list.isEmpty();