Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'

[fanfix.git] / src / be / nikiroo / utils / IOUtils.java

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index fa18d0de5c868f411d2d7da88e2cf39fd0e47f23..e3837e17ed76c8b4bdb9274edf9524182856542a 100644 (file)
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@ -29,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();
                }
@@ -49,17 +51,23 @@ public class IOUtils {
         * @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 {
+               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;
        }
 
        /**
@@ -232,7 +240,7 @@ public class IOUtils {
                        throws IOException {
                FileOutputStream out = new FileOutputStream(file);
                try {
-                       out.write(content.getBytes("UTF-8"));
+                       out.write(StringUtils.getBytes(content));
                } finally {
                        out.close();
                }
@@ -275,8 +283,7 @@ public class IOUtils {
                        write(stream, out);
                        return out.toString("UTF-8");
                } finally {
-                       // do NOT close, or the related stream will be closed, too
-                       // out.close();
+                       out.close();
                }
        }