update media module

media/src/main/java/cn/reghao/jutil/media/Shell.java

@@ -1,91 +0,0 @@
-package cn.reghao.jutil.media;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-/**
- * @author reghao
- * @date 2023-05-10 15:32:18
- */
-public class Shell {
-    private final static String bash = "/bin/bash";
-
-    public static int exec(String cmd) {
-        Runtime runtime = Runtime.getRuntime();
-        int status;
-        try {
-            Process proc = runtime.exec(new String[]{bash, "-c", cmd});
-            new Thread(new Output(proc)).start();
-            status = proc.waitFor();
-            if (status != 0) {
-                return status;
-            }
-
-            proc.getOutputStream().close();
-            proc.getInputStream().close();
-            proc.getErrorStream().close();
-        } catch (Exception e) {
-            e.printStackTrace();
-            status = 1;
-        } finally {
-            runtime.freeMemory();
-        }
-
-        return status;
-    }
-
-    public static String execWithResult(String cmd) {
-        Runtime runtime = Runtime.getRuntime();
-        try {
-            Process proc = runtime.exec(new String[]{bash, "-c", cmd});
-            int status = proc.waitFor();
-            if (status != 0) {
-                return null;
-            }
-
-            BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
-            StringBuilder sb = new StringBuilder();
-            try {
-                String line;
-                while((line = br.readLine()) != null){
-                    sb.append(line);
-                }
-                br.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-            proc.getOutputStream().close();
-            proc.getInputStream().close();
-            proc.getErrorStream().close();
-            return sb.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            runtime.freeMemory();
-        }
-        return null;
-    }
-
-    static class Output implements Runnable {
-        private final Process proc;
-
-        public Output(Process proc) {
-            this.proc = proc;
-        }
-
-        @Override
-        public void run() {
-            BufferedReader br = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
-            try {
-                String line;
-                while((line = br.readLine()) != null){
-                    System.out.println(line);
-                }
-                br.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

media/src/main/java/cn/reghao/jutil/media/po/AudioProps.java → media/src/main/java/cn/reghao/jutil/media/model/AudioProps.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media.po;
+package cn.reghao.jutil.media.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

media/src/main/java/cn/reghao/jutil/media/po/MediaProps.java → media/src/main/java/cn/reghao/jutil/media/model/MediaProps.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media.po;
+package cn.reghao.jutil.media.model;
 
 import lombok.Getter;
 import lombok.Setter;

media/src/main/java/cn/reghao/jutil/media/po/VideoProps.java → media/src/main/java/cn/reghao/jutil/media/model/VideoProps.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media.po;
+package cn.reghao.jutil.media.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

media/src/main/java/cn/reghao/jutil/media/video/FFmpegWrapper.java

@@ -2,12 +2,12 @@ package cn.reghao.jutil.media.video;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
+import cn.reghao.jutil.jdk.shell.Shell;
 import cn.reghao.jutil.jdk.shell.ShellExecutor;
 import cn.reghao.jutil.jdk.shell.ShellResult;
-import cn.reghao.jutil.media.Shell;
-import cn.reghao.jutil.media.po.AudioProps;
-import cn.reghao.jutil.media.po.MediaProps;
-import cn.reghao.jutil.media.po.VideoProps;
+import cn.reghao.jutil.media.model.AudioProps;
+import cn.reghao.jutil.media.model.MediaProps;
+import cn.reghao.jutil.media.model.VideoProps;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

media/src/test/java/MediaTest.java

@@ -1,5 +1,5 @@
 import cn.reghao.jutil.media.image.ImageOps;
-import cn.reghao.jutil.media.po.MediaProps;
+import cn.reghao.jutil.media.model.MediaProps;
 import cn.reghao.jutil.media.video.FFmpegWrapper;
 
 import javax.imageio.ImageIO;