X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FImage.java;h=cfcaa74e2c1b8e2f1cd280f687afbfd7e8ad51bf;hb=7b42695f536a88cfc5fed57e98687394e3c42fe9;hp=4eacdac8f0b15ae08bb09767a0145032080d9965;hpb=0988831f084e27de9927c1bb29e338e9263bfa42;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/Image.java b/src/be/nikiroo/utils/Image.java
index 4eacdac..cfcaa74 100644
--- a/src/be/nikiroo/utils/Image.java
+++ b/src/be/nikiroo/utils/Image.java
@@ -13,6 +13,7 @@ import java.io.InputStream;
  * @author niki
  */
 public class Image implements Closeable {
+	static private File tempRoot;
 	static private TempFiles tmpRepository;
 	static private long count = 0;
 	static private Object lock = new Object();
@@ -75,14 +76,35 @@ public class Image implements Closeable {
 		IOUtils.write(in, data);
 	}
 
+	/**
+	 * Generate an {@link InputStream} for this {@link Image}.
+	 * <p>
+	 * This {@link InputStream} will (always) be a new one, and <b>you</b> are
+	 * responsible for it.
+	 * <p>
+	 * Note: take care that the {@link InputStream} <b>must not</b> live past
+	 * the {@link Image} life time!
+	 * 
+	 * @return the stream
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public InputStream newInputStream() throws IOException {
+		return new FileInputStream(data);
+	}
+
 	/**
 	 * <b>Read</b> the actual image data, as a byte array.
+	 * <p>
+	 * Note: if possible, prefer the {@link Image#newInputStream()} method, as
+	 * it can be more efficient.
 	 * 
 	 * @return the image data
 	 */
 	public byte[] getData() {
 		try {
-			FileInputStream in = new FileInputStream(data);
+			InputStream in = newInputStream();
 			try {
 				return IOUtils.toByteArray(in);
 			} finally {
@@ -96,11 +118,18 @@ public class Image implements Closeable {
 	/**
 	 * Convert the given {@link Image} object into a Base64 representation of
 	 * the same {@link Image} object.
+	 * <p>
+	 * Note: if possible, prefer the {@link Image#newInputStream()} method, as
+	 * it can be more efficient.
 	 * 
 	 * @return the Base64 representation
 	 */
 	public String toBase64() {
-		return Base64.encodeBytes(getData());
+		try {
+			return StringUtils.base64(getData(), false);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	/**
@@ -143,7 +172,7 @@ public class Image implements Closeable {
 	private File getTemporaryFile() throws IOException {
 		synchronized (lock) {
 			if (tmpRepository == null) {
-				tmpRepository = new TempFiles("images");
+				tmpRepository = new TempFiles(tempRoot, "images");
 				count = 0;
 			}
 
@@ -152,4 +181,23 @@ public class Image implements Closeable {
 			return tmpRepository.createTempFile("image");
 		}
 	}
+
+	/**
+	 * Change the temporary root directory used by the program.
+	 * <p>
+	 * Caution: the directory will be <b>owned</b> by the system, all its files
+	 * now belong to us (and will most probably be deleted).
+	 * <p>
+	 * Note: it may take some time until the new temporary root is used, we
+	 * first need to make sure the previous one is not used anymore (i.e., we
+	 * must reach a point where no unclosed {@link Image} remains in memory) to
+	 * switch the temporary root.
+	 * 
+	 * @param root
+	 *            the new temporary root, which will be <b>owned</b> by the
+	 *            system
+	 */
+	public static void setTemporaryFilesRoot(File root) {
+		tempRoot = root;
+	}
 }