Use slf4j simple logger

[signal-cli] / src / main / java / org / asamk / signal / util / IOUtils.java

diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java
index 9b8c3b5b3291b8f301782fa67744f7c0ce472efa..4d8adea6bbaa166053e7ac30ed638008e2273fff 100644 (file)
--- a/src/main/java/org/asamk/signal/util/IOUtils.java
+++ b/src/main/java/org/asamk/signal/util/IOUtils.java
@@ -1,8 +1,13 @@
 package org.asamk.signal.util;
 
 package org.asamk.signal.util;
 

+import org.whispersystems.signalservice.internal.util.Util;
+
+import java.io.ByteArrayOutputStream;

 import java.io.File;
 import java.io.File;

+import java.io.FileOutputStream;

 import java.io.IOException;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.InputStream;

+import java.io.OutputStream;

 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.file.Files;


@@ -12,7 +17,9 @@ import java.nio.file.attribute.PosixFilePermissions;
 import java.util.EnumSet;
 import java.util.Set;
 
 import java.util.EnumSet;
 import java.util.Set;
 

-import static java.nio.file.attribute.PosixFilePermission.*;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;

 
 public class IOUtils {
 
 
 public class IOUtils {
 


@@ -33,8 +40,18 @@ public class IOUtils {
         return output.toString();
     }
 
         return output.toString();
     }
 

+    public static byte[] readFully(InputStream in) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        Util.copy(in, baos);
+        return baos.toByteArray();
+    }
+

     public static void createPrivateDirectories(String directoryPath) throws IOException {
         final File file = new File(directoryPath);
     public static void createPrivateDirectories(String directoryPath) throws IOException {
         final File file = new File(directoryPath);

+        createPrivateDirectories(file);
+    }
+
+    public static void createPrivateDirectories(File file) throws IOException {

         if (file.exists()) {
             return;
         }
         if (file.exists()) {
             return;
         }


@@ -57,4 +74,28 @@ public class IOUtils {
             Files.createFile(file);
         }
     }
             Files.createFile(file);
         }
     }

+
+    public static String getDataHomeDir() {
+        String dataHome = System.getenv("XDG_DATA_HOME");
+        if (dataHome != null) {
+            return dataHome;
+        }
+
+        return System.getProperty("user.home") + "/.local/share";
+    }
+
+    public static void copyStreamToFile(InputStream input, File outputFile) throws IOException {
+        copyStreamToFile(input, outputFile, 8192);
+    }
+
+    public static void copyStreamToFile(InputStream input, File outputFile, int bufferSize) throws IOException {
+        try (OutputStream output = new FileOutputStream(outputFile)) {
+            byte[] buffer = new byte[bufferSize];
+            int read;
+
+            while ((read = input.read(buffer)) != -1) {
+                output.write(buffer, 0, read);
+            }
+        }
+    }

 }
 }