X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=inline;f=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;h=e3837e17ed76c8b4bdb9274edf9524182856542a;hb=cd3d510fdeb0ad53ae39e1fda34acf328c70c345;hp=1b70b0e783cee077af91067a07e792b6eb5af993;hpb=16d593780fa5a4c39cc36b29382da610eae951da;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java index 1b70b0e..e3837e1 100644 --- a/src/be/nikiroo/utils/IOUtils.java +++ b/src/be/nikiroo/utils/IOUtils.java @@ -1,26 +1,22 @@ package be.nikiroo.utils; -import java.awt.Image; -import java.awt.geom.AffineTransform; -import java.awt.image.AffineTransformOp; -import java.awt.image.BufferedImage; -import java.io.BufferedReader; import java.io.ByteArrayOutputStream; 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.OutputStream; +import java.util.ArrayList; +import java.util.List; import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; -import javax.imageio.ImageIO; +import be.nikiroo.utils.streams.MarkableFileInputStream; /** - * This class offer some utilities based around Streams. + * This class offer some utilities based around Streams and Files. * * @author niki */ @@ -33,13 +29,15 @@ public class IOUtils { * @param target * the target {@link File} * + * @return the number of bytes written + * * @throws IOException * in case of I/O error */ - public static void write(InputStream in, File target) throws IOException { + public static long write(InputStream in, File target) throws IOException { OutputStream out = new FileOutputStream(target); try { - write(in, out); + return write(in, out); } finally { out.close(); } @@ -50,18 +48,26 @@ public class IOUtils { * * @param in * the data source - * @param target + * @param out * the target {@link OutputStream} * + * @return the number of bytes written + * * @throws IOException * in case of I/O error */ - public static void write(InputStream in, OutputStream out) + public static long write(InputStream in, OutputStream out) throws IOException { - byte buffer[] = new byte[4069]; - for (int len = 0; (len = in.read(buffer)) > 0;) { + long written = 0; + byte buffer[] = new byte[4096]; + int len = in.read(buffer); + while (len > -1) { out.write(buffer, 0, len); + written += len; + len = in.read(buffer); } + + return written; } /** @@ -93,8 +99,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()) { @@ -119,7 +129,7 @@ public class IOUtils { * the source {@link File} (which can be a directory) * @param dest * the destination .zip 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 * @@ -141,6 +151,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,11 +222,27 @@ 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 { + FileOutputStream out = new FileOutputStream(file); try { - writerVersion.write(content); + out.write(StringUtils.getBytes(content)); } finally { - writerVersion.close(); + out.close(); } } @@ -180,179 +258,116 @@ 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 { - StringBuilder builder = new StringBuilder(); - for (String line = reader.readLine(); line != null; line = reader - .readLine()) { - builder.append(line); - } - return builder.toString(); + return readSmallStream(stream); } finally { - reader.close(); + stream.close(); } } /** - * Recursively delete the given {@link File}, which may of course also be a - * directory. - *
- * Will silently continue in case of error. + * Read the whole {@link InputStream} content into a {@link String}. * - * @param target - * the target to delete + * @param stream + * the {@link InputStream} + * + * @return the content + * + * @throws IOException + * in case of I/O error */ - public static void deltree(File target) { - for (File file : target.listFiles()) { - if (file.isDirectory()) { - 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()); + public static String readSmallStream(InputStream stream) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try { + write(stream, out); + return out.toString("UTF-8"); + } finally { + out.close(); } } /** - * Convert the given {@link InputStream} (which should allow calls to - * {@link InputStream#reset() for better perfs}) into an {@link Image} - * object, respecting the EXIF transformations if any. + * Recursively delete the given {@link File}, which may of course also be a + * directory. + *
+ * Will either silently continue or throw an exception in case of error,
+ * depending upon the parameters.
*
- * @param in
- * the 'resetable' {@link InputStream}
+ * @param target
+ * the target to delete
+ * @param exception
+ * TRUE to throw an {@link IOException} in case of error, FALSE
+ * to silently continue
*
- * @return the {@link Image} object
+ * @return TRUE if all files were deleted, FALSE if an error occurred
*
* @throws IOException
- * in case of IO error
+ * if an error occurred and the parameters allow an exception to
+ * be thrown
*/
- public static BufferedImage toImage(InputStream in) throws IOException {
- MarkableFileInputStream tmpIn = null;
- File tmp = null;
- try {
- in.reset();
- } catch (IOException e) {
- tmp = File.createTempFile("fanfic-tmp-image", ".tmp");
- tmp.deleteOnExit();
- IOUtils.write(in, tmp);
- tmpIn = new MarkableFileInputStream(new FileInputStream(tmp));
- }
-
- int orientation;
- try {
- orientation = getExifTransorm(in);
- } catch (Exception e) {
- // no EXIF transform, ok
- orientation = -1;
- }
-
- in.reset();
- BufferedImage image = ImageIO.read(in);
-
- if (image == null) {
- if (tmp != null) {
- tmp.delete();
- tmpIn.close();
+ public static boolean deltree(File target, boolean exception)
+ throws IOException {
+ List
+ * Will silently continue in case of error.
+ *
+ * @param target
+ * the target to delete
*
- * @return the version, or NULL
+ * @return TRUE if all files were deleted, FALSE if an error occurred
*/
- public static String getVersion() {
- String version = null;
+ public static boolean deltree(File target) {
+ return deltree(target, null).isEmpty();
+ }
- InputStream in = openResource("VERSION");
- if (in != null) {
- try {
- ByteArrayOutputStream ba = new ByteArrayOutputStream();
- write(in, ba);
- in.close();
+ /**
+ * Recursively delete the given {@link File}, which may of course also be a
+ * directory.
+ *
+ * Will collect all {@link File} that cannot be deleted in the given
+ * accumulator.
+ *
+ * @param target
+ * the target to delete
+ * @param errorAcc
+ * the accumulator to use for errors, or NULL to create a new one
+ *
+ * @return the errors accumulator
+ */
+ public static List
- * Note: this code has been found on internet; thank you anonymous coder.
- *