1.48

Author: MORIMORI0317

common/src/main/java/dev/felnull/fnjl/FNJLBuildIn.java

@@ -1,5 +1,5 @@
 package dev.felnull.fnjl;
 
 public class FNJLBuildIn {
-    protected static final String VERSION = "1.47";
+    protected static final String VERSION = "1.48";
 }

common/src/main/java/dev/felnull/fnjl/util/FNDataUtil.java

@@ -1,16 +1,22 @@
 package dev.felnull.fnjl.util;
 
+import dev.felnull.fnjl.io.FileWatcher;
 import dev.felnull.fnjl.io.ProgressWriter;
 
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.WatchEvent;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 /**
  * データ関連
@@ -20,6 +26,33 @@
  */
 public class FNDataUtil {
 
+    /**
+     * バッファー付きストリームをバイト配列へ変換
+     *
+     * @param stream ストリーム
+     * @return 変換済みバイト配列
+     * @throws IOException 変換失敗
+     */
+    public static byte[] bufStreamToByteArray(InputStream stream) throws IOException {
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        bufInputToOutput(stream, bout);
+        return bout.toByteArray();
+    }
+
+    /**
+     * バッファー付きストリームをバイト配列へ変換
+     *
+     * @param stream ストリーム
+     * @param size   一度に書き込む量
+     * @return 変換済みバイト配列
+     * @throws IOException 変換失敗
+     */
+    public static byte[] bufStreamToByteArray(InputStream stream, int size) throws IOException {
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        bufInputToOutput(stream, bout, size);
+        return bout.toByteArray();
+    }
+
     /**
      * ストリームをバイト配列へ変換
      *
@@ -29,14 +62,21 @@ public class FNDataUtil {
      */
     public static byte[] streamToByteArray(InputStream stream) throws IOException {
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        byte[] buffer = new byte[1024];
-        while (true) {
-            int len = stream.read(buffer);
-            if (len < 0) {
-                break;
-            }
-            bout.write(buffer, 0, len);
-        }
+        inputToOutput(stream, bout);
+        return bout.toByteArray();
+    }
+
+    /**
+     * ストリームをバイト配列へ変換
+     *
+     * @param stream ストリーム
+     * @param size   一度に書き込む量
+     * @return 変換済みバイト配列
+     * @throws IOException 変換失敗
+     */
+    public static byte[] streamToByteArray(InputStream stream, int size) throws IOException {
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        inputToOutput(stream, bout, size);
         return bout.toByteArray();
     }
 
@@ -195,4 +235,107 @@ public static InputStream resourceExtractor(Class<?> targetClass, String path) {
             stream = ClassLoader.getSystemResourceAsStream(path);
         return stream != null ? new BufferedInputStream(stream) : null;
     }
+
+    /**
+     * ファイル監視
+     *
+     * @param path     監視対象
+     * @param listener 監視listener
+     * @param events   監視エベント  StandardWatchEventKinds.ENTRY_MODIFYなど
+     * @throws IOException 例外
+     */
+    public static void watchFile(Path path, Consumer<WatchEvent<?>> listener, WatchEvent.Kind<?>... events) throws IOException {
+        FileWatcher watcher = new FileWatcher(path, listener, events);
+        watcher.start();
+    }
+
+    /**
+     * インプットストリームをアウトプットストリームへ
+     *
+     * @param inputStream  In
+     * @param outputStream Out
+     * @throws IOException 例外
+     */
+    public static void inputToOutput(InputStream inputStream, OutputStream outputStream) throws IOException {
+        inputToOutput(inputStream, outputStream, 1024);
+    }
+
+    /**
+     * インプットストリームをアウトプットストリームへ
+     *
+     * @param inputStream  In
+     * @param outputStream Out
+     * @param size         一度に書き込む量
+     * @throws IOException 例外
+     */
+    public static void inputToOutput(InputStream inputStream, OutputStream outputStream, int size) throws IOException {
+        try (InputStream in = inputStream; OutputStream out = outputStream) {
+            byte[] data = new byte[size];
+            int len;
+            while ((len = in.read(data)) != -1) {
+                out.write(data, 0, len);
+            }
+        }
+    }
+
+    /**
+     * バッファー付きインプットストリームをアウトプットストリームへ
+     *
+     * @param inputStream  In
+     * @param outputStream Out
+     * @param size         一度に書き込む量
+     * @throws IOException 例外
+     */
+    public static void bufInputToOutput(InputStream inputStream, OutputStream outputStream, int size) throws IOException {
+        inputToOutput(new BufferedInputStream(inputStream), new BufferedOutputStream(outputStream), size);
+    }
+
+    /**
+     * バッファー付きインプットストリームをアウトプットストリームへ
+     *
+     * @param inputStream  In
+     * @param outputStream Out
+     * @throws IOException 例外
+     */
+    public static void bufInputToOutput(InputStream inputStream, OutputStream outputStream) throws IOException {
+        inputToOutput(new BufferedInputStream(inputStream), new BufferedOutputStream(outputStream));
+    }
+
+    /**
+     * Zipファイルを読み取る
+     *
+     * @param zipStream Zipのストリーム
+     * @param zips      Zipエントリー
+     * @throws IOException 例外
+     */
+    public static void readZip(InputStream zipStream, BiConsumer<ZipEntry, ZipInputStream> zips) throws IOException {
+        try (ZipInputStream zis = new ZipInputStream(zipStream)) {
+            ZipEntry ze;
+            while ((ze = zis.getNextEntry()) != null) {
+                zips.accept(ze, zis);
+            }
+        }
+    }
+
+    /**
+     * Zipファイルを読み取り、ストリームへ変換
+     *
+     * @param zipStream Zipのストリーム
+     * @param zips      Zipエントリー
+     * @throws IOException 例外
+     */
+    public static void readZipStreamed(InputStream zipStream, BiConsumer<ZipEntry, InputStream> zips) throws IOException {
+        FNDataUtil.readZip(zipStream, (e, i) -> {
+            try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                byte[] data = new byte[1024];
+                int count;
+                while ((count = i.read(data)) != -1) {
+                    baos.write(data, 0, count);
+                }
+                zips.accept(e, new ByteArrayInputStream(baos.toByteArray()));
+            } catch (IOException ex) {
+                zips.accept(e, null);
+            }
+        });
+    }
 }

common/src/main/java/dev/felnull/fnjl/util/FNIOUtil.java

@@ -2,11 +2,7 @@
 
 public class Main {
     public static void main(String[] args) throws Exception {
-        //      FNQuadruple<Double, Double, Double, Double> q = FNMath.toQuaternion(Math.toRadians(20), Math.toRadians(30), Math.toRadians(40));
-//        FNTriple<Double, Double, Double> e = FNMath.toEulerAngle(q.getLeft(), q.getLeftCenter(), q.getRightCenter(), q.getRight());
-        //    System.out.println(Math.toDegrees(e.getLeft()) + ":" + Math.toDegrees(e.getCenter()) + ":" + Math.toDegrees(e.getRight()));
-        //      System.out.println(new FNVec3d(0.34906585039886584, 0.5235987755982988, 0.6981317007977317).degrees());
-        // System.out.println(new FNVec3d(10, 150, 300).radians());
-        //  System.out.println(new FNVec3d(10, 150, 300).radians().toQuaternion().toEulerAngle().normalized().degrees());
+
+
     }
 }

common/src/test/java/dev/felnull/fnjltest/Main.java

@@ -1,3 +1,3 @@
 fnjl_group=dev.felnull
 fnjl_name=felnull-java-library
-fnjl_version=1.47
+fnjl_version=1.48

gradle.properties

@@ -1,7 +1,7 @@
 package dev.felnull.fnjln;
 
 public class FNJLNBuildIn {
-    protected static final String VERSION = "1.47";
+    protected static final String VERSION = "1.48";
 
     protected static final int NATIVE_LIBRARY_VERSION = 1;
 }