Merge pull request 'v0.0.1' (#4) from dev into master

Reviewed-on: #4

README.md

@@ -1,19 +1,3 @@
 # timi-compress
 
 Java 压缩、解压缩工具
-
-## 调用方式
-
-压缩：
-
-```java
-ZipCompressor.of("testSrc").toFile("testOut/test.zip");
-TarCompressor.of(file).toStream(outputStream);
-```
-
-解压：
-
-```java
-ZipDecompressor.of("testOut/test.zip").to("testOutDe");
-GZipDecompressor.of(inputStream).to("testOutDe");
-```

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.imyeyu.compress</groupId>
 	<artifactId>timi-compress</artifactId>
-	<version>0.0.4</version>
+	<version>0.0.1</version>
 
 	<properties>
 		<maven.test.skip>true</maven.test.skip>

src/main/java/com/imyeyu/compress/AbstractRunner.java

@@ -1,8 +1,8 @@
 package com.imyeyu.compress;
 
 import com.imyeyu.java.bean.CallbackArg;
-import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.utils.OS;
+import lombok.Setter;
 
 import java.io.File;
 import java.io.FilterInputStream;
@@ -12,18 +12,19 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 /**
- * 抽象处理器
+ * 抽象压缩执行器
  *
- * @param <T> 处理器类型
  * @author 夜雨
  * @since 2024-06-30 18:09
  */
-public abstract class AbstractRunner<T extends AbstractRunner<T>> implements OS.FileSystem {
+public abstract class AbstractRunner implements OS.FileSystem {
 
 	/** 文件处理回调 */
+	@Setter
 	protected CallbackArg<File> fileCallback;
 
 	/** 进度回调 */
+	@Setter
 	protected CallbackArg<Double> progressCallback;
 
 	/** 中断标记 */
@@ -41,48 +42,6 @@ public abstract class AbstractRunner<T extends AbstractRunner<T>> implements OS.
 	/** 当前已处理字节数 */
 	private long progressBytes = 0L;
 
-	/**
-	 * 设置文件处理回调
-	 *
-	 * @param fileCallback 文件处理回调
-	 * @return 当前处理器
-	 */
-	public T setFileCallback(CallbackArg<File> fileCallback) {
-		this.fileCallback = fileCallback;
-		return self();
-	}
-
-	/**
-	 * 设置文件处理回调
-	 *
-	 * @param fileCallback 文件处理回调
-	 * @return 当前处理器
-	 */
-	public T fileCallback(CallbackArg<File> fileCallback) {
-		return setFileCallback(fileCallback);
-	}
-
-	/**
-	 * 设置进度回调
-	 *
-	 * @param progressCallback 进度回调
-	 * @return 当前处理器
-	 */
-	public T setProgressCallback(CallbackArg<Double> progressCallback) {
-		this.progressCallback = progressCallback;
-		return self();
-	}
-
-	/**
-	 * 设置进度回调
-	 *
-	 * @param progressCallback 进度回调
-	 * @return 当前处理器
-	 */
-	public T progressCallback(CallbackArg<Double> progressCallback) {
-		return setProgressCallback(progressCallback);
-	}
-
 	/** 暂停任务 */
 	public void pause() {
 		isPause = true;
@@ -101,16 +60,6 @@ public abstract class AbstractRunner<T extends AbstractRunner<T>> implements OS.
 		isInterrupt = true;
 	}
 
-	/**
-	 * 返回当前处理器
-	 *
-	 * @return 当前处理器
-	 */
-	@SuppressWarnings("unchecked")
-	protected final T self() {
-		return (T) this;
-	}
-
 	/**
 	 * 初始化字节进度
 	 *
@@ -274,12 +223,16 @@ public abstract class AbstractRunner<T extends AbstractRunner<T>> implements OS.
 	 * @return 规范化后的名称
 	 */
 	protected String normalizeEntryName(String entryName) {
-		TimiException.required(entryName, "not found entryName");
+		if (entryName == null || entryName.isBlank()) {
+			throw new IllegalArgumentException("条目名称不能为空");
+		}
 		String normalized = entryName.replace('\\', '/');
 		while (normalized.startsWith("/")) {
 			normalized = normalized.substring(1);
 		}
-		TimiException.required(normalized, "not found normalized entryName");
+		if (normalized.isBlank()) {
+			throw new IllegalArgumentException("条目名称不能为空");
+		}
 		return normalized;
 	}
 }

src/main/java/com/imyeyu/compress/CompressType.java

@@ -30,13 +30,13 @@ public enum CompressType {
 	/** Tar */
 	TAR(TarCompressor.class, TarDecompressor.class);
 
-	/** 压缩器类型 */
+	/** 压缩类 */
-	final Class<? extends Compressor<?>> compressorType;
+	final Class<? extends Compressor> compressorType;
 
-	/** 解压器类型 */
+	/** 解压类 */
-	final Class<? extends Decompressor<?>> decompressorType;
+	final Class<? extends Decompressor> decompressorType;
 
-	CompressType(Class<? extends Compressor<?>> compressorType, Class<? extends Decompressor<?>> decompressorType) {
+	CompressType(Class<? extends Compressor> compressorType, Class<? extends Decompressor> decompressorType) {
 		this.compressorType = compressorType;
 		this.decompressorType = decompressorType;
 	}
@@ -47,93 +47,48 @@ public enum CompressType {
 	 * @return 压缩操作对象
 	 * @throws Exception 实例化失败
 	 */
-	public Compressor<?> getCompressor() throws Exception {
+	public Compressor getCompressor() throws Exception {
 		return Ref.newInstance(compressorType);
 	}
 
-	/**
-	 * 获取带源路径的压缩操作对象
-	 *
-	 * @param fromPath 源路径
-	 * @return 压缩操作对象
-	 * @throws Exception 实例化失败
-	 */
-	public Compressor<?> compressFrom(String fromPath) throws Exception {
-		return getCompressor().of(fromPath);
-	}
-
-	/**
-	 * 获取带源文件的压缩操作对象
-	 *
-	 * @param fromFile 源文件
-	 * @return 压缩操作对象
-	 * @throws Exception 实例化失败
-	 */
-	public Compressor<?> compressFrom(File fromFile) throws Exception {
-		return getCompressor().of(fromFile);
-	}
-
 	/**
 	 * 获取解压操作对象
 	 *
 	 * @return 解压操作对象
 	 * @throws Exception 实例化失败
 	 */
-	public Decompressor<?> getDecompressor() throws Exception {
+	public Decompressor getDecompressor() throws Exception {
 		return Ref.newInstance(decompressorType);
 	}
 
 	/**
-	 * 获取带源文件的解压操作对象
+	 * 根据文件获取解压操作对象。会读取文件头识别压缩格式
-	 *
-	 * @param fromFile 源压缩文件
-	 * @return 解压操作对象
-	 * @throws Exception 实例化失败
-	 */
-	public Decompressor<?> decompressedFrom(File fromFile) throws Exception {
-		return getDecompressor().of(fromFile);
-	}
-
-	/**
-	 * 获取带源输入流的解压操作对象
-	 *
-	 * @param fromStream 源压缩输入流
-	 * @return 解压操作对象
-	 * @throws Exception 实例化失败
-	 */
-	public Decompressor<?> decompressedFrom(InputStream fromStream) throws Exception {
-		return getDecompressor().of(fromStream);
-	}
-
-	/**
-	 * 根据文件获取解压操作对象
-	 * 会读取文件头识别压缩格式
 	 *
 	 * @param file 文件
 	 * @return 解压操作对象
 	 * @throws UnsupportedOperationException 不支持的文件
 	 * @throws Exception 实例化失败
 	 */
-	public static Decompressor<?> from(File file) throws Exception {
+	public static Decompressor fromFile(File file) throws Exception {
 		try (InputStream inputStream = IO.getInputStream(file)) {
 			byte[] head = new byte[512];
 			int length = inputStream.read(head);
 			if (length == -1) {
-				throw new UnsupportedOperationException("empty file");
+				throw new UnsupportedOperationException("not support file");
 			}
 			if (SevenZFile.matches(head, length)) {
-				return Z7.decompressedFrom(file);
+				return Z7.getDecompressor();
 			}
 			if (ZipArchiveInputStream.matches(head, length)) {
-				return ZIP.decompressedFrom(file);
+				return ZIP.getDecompressor();
 			}
 			if (GzipCompressorInputStream.matches(head, length)) {
-				return GZIP.decompressedFrom(file);
+				return GZIP.getDecompressor();
 			}
 			if (TarArchiveInputStream.matches(head, length)) {
-				return TAR.decompressedFrom(file);
+				return TAR.getDecompressor();
 			}
 		}
-		throw new UnsupportedOperationException("not support file");
+		throw new UnsupportedOperationException("not support headHex");
 	}
 }

src/main/java/com/imyeyu/compress/Compressor.java

@@ -1,7 +1,6 @@
 package com.imyeyu.compress;
 
 import com.imyeyu.io.IO;
-import com.imyeyu.java.bean.timi.TimiException;
 
 import java.io.File;
 import java.io.OutputStream;
@@ -9,94 +8,21 @@ import java.io.OutputStream;
 /**
  * 抽象压缩器
  *
- * @param <T> 压缩器类型
  * @author 夜雨
  * @version 2024-06-30 10:34
  */
-public abstract class Compressor<T extends Compressor<T>> extends AbstractRunner<T> {
+public abstract class Compressor extends AbstractRunner {
-
-	/** 源路径 */
-	private String fromPath;
 
 	/**
-	 * 绑定源路径
+	 * 将指定路径下的文件压缩到目标文件
-	 *
-	 * @param fromPath 源路径
-	 * @return 当前压缩器
-	 */
-	protected T of(String fromPath) {
-		TimiException.required(fromPath, "not found fromPath");
-		this.fromPath = fromPath;
-		return self();
-	}
-
-	/**
-	 * 绑定源文件
-	 *
-	 * @param fromFile 源文件
-	 * @return 当前压缩器
-	 */
-	protected T of(File fromFile) {
-		TimiException.required(fromFile, "not found fromFile");
-		return of(fromFile.getAbsolutePath());
-	}
-
-	/**
-	 * 压缩到目标文件
-	 *
-	 * @param toFile 目标压缩文件
-	 * @return 当前压缩器
-	 * @throws Exception 压缩失败
-	 */
-	public T toFile(File toFile) throws Exception {
-		toFile(requireFromPath(), toFile);
-		return self();
-	}
-
-	/**
-	 * 压缩到目标文件路径
-	 *
-	 * @param toPath 目标压缩文件路径
-	 * @return 当前压缩器
-	 * @throws Exception 压缩失败
-	 */
-	public T toFile(String toPath) throws Exception {
-		return toFile(IO.file(toPath));
-	}
-
-	/**
-	 * 压缩到输出流
-	 * 输出流由调用方管理
-	 *
-	 * @param toStream 目标输出流
-	 * @return 当前压缩器
-	 * @throws Exception 压缩失败
-	 */
-	public T toStream(OutputStream toStream) throws Exception {
-		toStream(requireFromPath(), toStream);
-		return self();
-	}
-
-	/**
-	 * 获取已绑定的源路径
-	 *
-	 * @return 源路径
-	 */
-	protected String requireFromPath() {
-		TimiException.required(fromPath, "not found source");
-		return fromPath;
-	}
-
-	/**
-	 * 执行压缩到目标文件
 	 *
 	 * @param fromPath 源路径
 	 * @param toFile 目标压缩文件
 	 * @throws Exception 压缩失败
 	 */
-	protected void toFile(String fromPath, File toFile) throws Exception {
+	public void run(String fromPath, File toFile) throws Exception {
 		try (OutputStream outputStream = IO.getOutputStream(toFile)) {
-			toStream(fromPath, outputStream);
+			run(fromPath, outputStream);
 			outputStream.flush();
 		} catch (Exception exception) {
 			if (isInterrupt) {
@@ -110,11 +36,12 @@ public abstract class Compressor<T extends Compressor<T>> extends AbstractRunner
 	}
 
 	/**
-	 * 执行压缩到输出流
+	 * 将指定路径下的文件压缩到输出流
+	 * 输出流由调用方管理
 	 *
 	 * @param fromPath 源路径
 	 * @param toStream 目标输出流
 	 * @throws Exception 压缩失败
 	 */
-	protected abstract void toStream(String fromPath, OutputStream toStream) throws Exception;
+	public abstract void run(String fromPath, OutputStream toStream) throws Exception;
 }

src/main/java/com/imyeyu/compress/Decompressor.java

@@ -1,7 +1,6 @@
 package com.imyeyu.compress;
 
 import com.imyeyu.io.IO;
-import com.imyeyu.java.bean.timi.TimiException;
 
 import java.io.File;
 import java.io.InputStream;
@@ -9,93 +8,31 @@ import java.io.InputStream;
 /**
  * 抽象解压器
  *
- * @param <T> 解压器类型
  * @author 夜雨
  * @version 2024-06-30 18:02
  */
-public abstract class Decompressor<T extends Decompressor<T>> extends AbstractRunner<T> {
+public abstract class Decompressor extends AbstractRunner {
-
-	/** 源压缩文件 */
-	private File fromFile;
-
-	/** 源压缩输入流 */
-	private InputStream fromStream;
 
 	/**
-	 * 绑定源压缩文件
+	 * 将压缩文件解压到目标目录
-	 *
-	 * @param fromFile 源压缩文件
-	 * @return 当前解压器
-	 */
-	protected T of(File fromFile) {
-		TimiException.required(fromFile, "not found fromFile");
-		this.fromFile = fromFile;
-		this.fromStream = null;
-		return self();
-	}
-
-	/**
-	 * 绑定源压缩文件路径
-	 *
-	 * @param fromPath 源压缩文件路径
-	 * @return 当前解压器
-	 */
-	protected T of(String fromPath) {
-		TimiException.required(fromPath, "not found fromPath");
-		return of(new File(fromPath));
-	}
-
-	/**
-	 * 绑定源压缩输入流
-	 *
-	 * @param fromStream 源压缩输入流
-	 * @return 当前解压器
-	 */
-	public T of(InputStream fromStream) {
-		TimiException.required(fromStream, "not found fromStream");
-		this.fromStream = fromStream;
-		this.fromFile = null;
-		return self();
-	}
-
-	/**
-	 * 解压到目标目录
-	 *
-	 * @param toPath 目标目录
-	 * @return 当前解压器
-	 * @throws Exception 解压失败
-	 */
-	public T toPath(String toPath) throws Exception {
-		if (fromFile != null) {
-			toPath(fromFile, toPath);
-			return self();
-		}
-		if (fromStream != null) {
-			toPath(fromStream, toPath);
-			return self();
-		}
-		throw new IllegalStateException("not found source");
-	}
-
-	/**
-	 * 执行从文件解压
 	 *
 	 * @param fromFile 源压缩文件
 	 * @param toPath 目标目录
 	 * @throws Exception 解压失败
 	 */
-	protected void toPath(File fromFile, String toPath) throws Exception {
+	public void run(File fromFile, String toPath) throws Exception {
 		try (InputStream inputStream = IO.getInputStream(fromFile)) {
-			toPath(inputStream, toPath);
+			run(inputStream, toPath);
 		}
 	}
 
 	/**
-	 * 执行从输入流解压
+	 * 将压缩输入流解压到目标目录
+	 * 输入流由调用方管理
 	 *
 	 * @param fromStream 源压缩输入流
 	 * @param toPath 目标目录
 	 * @throws Exception 解压失败
 	 */
-	protected abstract void toPath(InputStream fromStream, String toPath) throws Exception;
+	public abstract void run(InputStream fromStream, String toPath) throws Exception;
 }

src/main/java/com/imyeyu/compress/GZipCompressor.java

@@ -18,38 +18,18 @@ import java.util.List;
  * @author 夜雨
  * @version 2024-06-30 19:40
  */
-public class GZipCompressor extends Compressor<GZipCompressor> {
+public class GZipCompressor extends Compressor {
-
-	/**
-	 * 创建压缩器
-	 *
-	 * @param fromPath 源路径
-	 * @return 压缩器
-	 */
-	public static GZipCompressor from(String fromPath) {
-		return new GZipCompressor().of(fromPath);
-	}
-
-	/**
-	 * 创建压缩器
-	 *
-	 * @param fromFile 源文件
-	 * @return 压缩器
-	 */
-	public static GZipCompressor from(File fromFile) {
-		return new GZipCompressor().of(fromFile);
-	}
 
 	@Override
-	protected void toStream(String fromPath, OutputStream toStream) throws Exception {
+	public void run(String fromPath, OutputStream toStream) throws Exception {
 		File fromFile = new File(fromPath);
 		List<File> files = IO.listFile(fromFile);
 		String basePath = files.getFirst().getParentFile().getAbsolutePath();
 		initByteProgress(IO.calcSize(fromFile));
-		GzipCompressorOutputStream gzipOutputStream = new GzipCompressorOutputStream(new BufferedOutputStream(nonClosing(toStream)));
+		try (
-		TarArchiveOutputStream tarOutputStream = null;
+			GzipCompressorOutputStream gzipOutputStream = new GzipCompressorOutputStream(new BufferedOutputStream(nonClosing(toStream)));
-		try {
+			TarArchiveOutputStream tarOutputStream = new TarArchiveOutputStream(gzipOutputStream)
-			tarOutputStream = new TarArchiveOutputStream(gzipOutputStream);
+		) {
 			for (File sourceFile : files) {
 				String name = sourceFile.getAbsolutePath().substring(basePath.length() + 1);
 				TarArchiveEntry tarEntry = new TarArchiveEntry(sourceFile, normalizeEntryName(name));
@@ -61,13 +41,9 @@ public class GZipCompressor extends Compressor<GZipCompressor> {
 				handleFile(sourceFile);
 			}
 			tarOutputStream.finish();
+			gzipOutputStream.finish();
 			finishProgress();
 		} finally {
-			if (tarOutputStream != null) {
-				tarOutputStream.close();
-			} else {
-				gzipOutputStream.close();
-			}
 			resetProgress();
 		}
 	}

src/main/java/com/imyeyu/compress/GZipDecompressor.java

@@ -11,54 +11,25 @@ import java.io.OutputStream;
 
 /**
  * Gzip 解压器
+ * 当前实现保持与原行为一致，实际按 tar.gz 解压
  *
  * @author 夜雨
  * @version 2024-06-30 19:47
  */
-public class GZipDecompressor extends Decompressor<GZipDecompressor> {
+public class GZipDecompressor extends Decompressor {
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromFile 源压缩文件
-	 * @return 解压器
-	 */
-	public static GZipDecompressor from(File fromFile) {
-		return new GZipDecompressor().of(fromFile);
-	}
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromPath 源压缩文件路径
-	 * @return 解压器
-	 */
-	public static GZipDecompressor from(String fromPath) {
-		return new GZipDecompressor().of(fromPath);
-	}
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromStream 源压缩输入流
-	 * @return 解压器
-	 */
-	public static GZipDecompressor from(InputStream fromStream) {
-		return new GZipDecompressor().of(fromStream);
-	}
 
 	@Override
-	protected void toPath(File fromFile, String toPath) throws Exception {
+	public void run(File fromFile, String toPath) throws Exception {
 		initByteProgress(readTotalSize(fromFile));
 		try {
-			super.toPath(fromFile, toPath);
+			super.run(fromFile, toPath);
 		} finally {
 			resetProgress();
 		}
 	}
 
 	@Override
-	protected void toPath(InputStream fromStream, String toPath) throws Exception {
+	public void run(InputStream fromStream, String toPath) throws Exception {
 		try (
 			GzipCompressorInputStream gzipInputStream = new GzipCompressorInputStream(nonClosing(fromStream));
 			TarArchiveInputStream tarInputStream = new TarArchiveInputStream(gzipInputStream)

src/main/java/com/imyeyu/compress/TarCompressor.java

@@ -16,30 +16,10 @@ import java.util.List;
  * @author 夜雨
  * @version 2024-06-30 19:48
  */
-public class TarCompressor extends Compressor<TarCompressor> {
+public class TarCompressor extends Compressor {
-
-	/**
-	 * 创建压缩器
-	 *
-	 * @param fromPath 源路径
-	 * @return 压缩器
-	 */
-	public static TarCompressor from(String fromPath) {
-		return new TarCompressor().of(fromPath);
-	}
-
-	/**
-	 * 创建压缩器
-	 *
-	 * @param fromFile 源文件
-	 * @return 压缩器
-	 */
-	public static TarCompressor from(File fromFile) {
-		return new TarCompressor().of(fromFile);
-	}
 
 	@Override
-	protected void toStream(String fromPath, OutputStream toStream) throws Exception {
+	public void run(String fromPath, OutputStream toStream) throws Exception {
 		File fromFile = new File(fromPath);
 		List<File> files = IO.listFile(fromFile);
 		String basePath = files.getFirst().getParentFile().getAbsolutePath();

src/main/java/com/imyeyu/compress/TarDecompressor.java

@@ -14,50 +14,20 @@ import java.io.OutputStream;
  * @author 夜雨
  * @version 2024-06-30 19:48
  */
-public class TarDecompressor extends Decompressor<TarDecompressor> {
+public class TarDecompressor extends Decompressor {
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromFile 源压缩文件
-	 * @return 解压器
-	 */
-	public static TarDecompressor from(File fromFile) {
-		return new TarDecompressor().of(fromFile);
-	}
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromPath 源压缩文件路径
-	 * @return 解压器
-	 */
-	public static TarDecompressor from(String fromPath) {
-		return new TarDecompressor().of(fromPath);
-	}
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromStream 源压缩输入流
-	 * @return 解压器
-	 */
-	public static TarDecompressor from(InputStream fromStream) {
-		return new TarDecompressor().of(fromStream);
-	}
 
 	@Override
-	protected void toPath(File fromFile, String toPath) throws Exception {
+	public void run(File fromFile, String toPath) throws Exception {
 		initByteProgress(readTotalSize(fromFile));
 		try {
-			super.toPath(fromFile, toPath);
+			super.run(fromFile, toPath);
 		} finally {
 			resetProgress();
 		}
 	}
 
 	@Override
-	protected void toPath(InputStream fromStream, String toPath) throws Exception {
+	public void run(InputStream fromStream, String toPath) throws Exception {
 		try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(nonClosing(fromStream))) {
 			TarArchiveEntry entry;
 			boolean processed = false;

src/main/java/com/imyeyu/compress/Z7Compressor.java

@@ -17,33 +17,13 @@ import java.util.List;
  * @author 夜雨
  * @version 2024-06-30 19:40
  */
-public class Z7Compressor extends Compressor<Z7Compressor> {
+public class Z7Compressor extends Compressor {
-
-	/**
-	 * 创建压缩器
-	 *
-	 * @param fromPath 源路径
-	 * @return 压缩器
-	 */
-	public static Z7Compressor from(String fromPath) {
-		return new Z7Compressor().of(fromPath);
-	}
-
-	/**
-	 * 创建压缩器
-	 *
-	 * @param fromFile 源文件
-	 * @return 压缩器
-	 */
-	public static Z7Compressor from(File fromFile) {
-		return new Z7Compressor().of(fromFile);
-	}
 
 	@Override
-	protected void toStream(String fromPath, OutputStream toStream) throws Exception {
+	public void run(String fromPath, OutputStream toStream) throws Exception {
 		Path tempFile = Files.createTempFile("timi-compress-", ".7z");
 		try {
-			of(fromPath).toFile(tempFile.toFile());
+			run(fromPath, tempFile.toFile());
 			try (InputStream inputStream = Files.newInputStream(tempFile)) {
 				transfer(inputStream, toStream, false);
 				toStream.flush();
@@ -54,7 +34,7 @@ public class Z7Compressor extends Compressor<Z7Compressor> {
 	}
 
 	@Override
-	protected void toFile(String fromPath, File toFile) throws Exception {
+	public void run(String fromPath, File toFile) throws Exception {
 		File fromFile = new File(fromPath);
 		List<File> files = IO.listFile(fromFile);
 		String basePath = files.getFirst().getParentFile().getAbsolutePath();

src/main/java/com/imyeyu/compress/Z7Decompressor.java

@@ -16,50 +16,20 @@ import java.nio.file.Path;
  * @author 夜雨
  * @version 2024-06-30 19:42
  */
-public class Z7Decompressor extends Decompressor<Z7Decompressor> {
+public class Z7Decompressor extends Decompressor {
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromFile 源压缩文件
-	 * @return 解压器
-	 */
-	public static Z7Decompressor from(File fromFile) {
-		return new Z7Decompressor().of(fromFile);
-	}
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromPath 源压缩文件路径
-	 * @return 解压器
-	 */
-	public static Z7Decompressor from(String fromPath) {
-		return new Z7Decompressor().of(fromPath);
-	}
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromStream 源压缩输入流
-	 * @return 解压器
-	 */
-	public static Z7Decompressor from(InputStream fromStream) {
-		return new Z7Decompressor().of(fromStream);
-	}
 
 	@Override
-	protected void toPath(File fromFile, String toPath) throws Exception {
+	public void run(File fromFile, String toPath) throws Exception {
 		initByteProgress(readTotalSize(fromFile));
 		try {
-			super.toPath(fromFile, toPath);
+			super.run(fromFile, toPath);
 		} finally {
 			resetProgress();
 		}
 	}
 
 	@Override
-	protected void toPath(InputStream fromStream, String toPath) throws Exception {
+	public void run(InputStream fromStream, String toPath) throws Exception {
 		Path tempFile = writeTempFile(fromStream);
 		try (SevenZFile file = SevenZFile.builder().setFile(tempFile.toFile()).get()) {
 			SevenZArchiveEntry entry;

src/main/java/com/imyeyu/compress/ZipCompressor.java

@@ -16,30 +16,10 @@ import java.util.zip.ZipOutputStream;
  * @author 夜雨
  * @version 2024-06-30 19:46
  */
-public class ZipCompressor extends Compressor<ZipCompressor> {
+public class ZipCompressor extends Compressor {
-
-	/**
-	 * 创建压缩器
-	 *
-	 * @param fromPath 源路径
-	 * @return 压缩器
-	 */
-	public static ZipCompressor from(String fromPath) {
-		return new ZipCompressor().of(fromPath);
-	}
-
-	/**
-	 * 创建压缩器
-	 *
-	 * @param fromFile 源文件
-	 * @return 压缩器
-	 */
-	public static ZipCompressor from(File fromFile) {
-		return new ZipCompressor().of(fromFile);
-	}
 
 	@Override
-	protected void toStream(String fromPath, OutputStream toStream) throws Exception {
+	public void run(String fromPath, OutputStream toStream) throws Exception {
 		File fromFile = new File(fromPath);
 		List<File> files = IO.listFile(fromFile);
 		String basePath = files.getFirst().getParentFile().getAbsolutePath();

src/main/java/com/imyeyu/compress/ZipDecompressor.java

@@ -16,50 +16,20 @@ import java.util.zip.ZipInputStream;
  * @author 夜雨
  * @version 2024-06-30 19:47
  */
-public class ZipDecompressor extends Decompressor<ZipDecompressor> {
+public class ZipDecompressor extends Decompressor {
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromFile 源压缩文件
-	 * @return 解压器
-	 */
-	public static ZipDecompressor from(File fromFile) {
-		return new ZipDecompressor().of(fromFile);
-	}
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromPath 源压缩文件路径
-	 * @return 解压器
-	 */
-	public static ZipDecompressor from(String fromPath) {
-		return new ZipDecompressor().of(fromPath);
-	}
-
-	/**
-	 * 创建解压器
-	 *
-	 * @param fromStream 源压缩输入流
-	 * @return 解压器
-	 */
-	public static ZipDecompressor from(InputStream fromStream) {
-		return new ZipDecompressor().of(fromStream);
-	}
 
 	@Override
-	protected void toPath(File fromFile, String toPath) throws Exception {
+	public void run(File fromFile, String toPath) throws Exception {
 		initByteProgress(readTotalSize(fromFile));
 		try {
-			super.toPath(fromFile, toPath);
+			super.run(fromFile, toPath);
 		} finally {
 			resetProgress();
 		}
 	}
 
 	@Override
-	protected void toPath(InputStream fromStream, String toPath) throws Exception {
+	public void run(InputStream fromStream, String toPath) throws Exception {
 		try (ZipInputStream zipInputStream = new ZipInputStream(nonClosing(fromStream))) {
 			ZipEntry entry;
 			boolean processed = false;

src/test/java/test/GzipTest.java

@@ -1,18 +1,12 @@
 package test;
 
 import com.imyeyu.compress.CompressType;
-import com.imyeyu.compress.GZipCompressor;
-import com.imyeyu.compress.GZipDecompressor;
 import com.imyeyu.io.IO;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.OutputStream;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @author 夜雨
@@ -21,62 +15,35 @@ import java.util.concurrent.atomic.AtomicReference;
 public class GzipTest {
 
 	@Test
-	public void testStaticCompress() throws Exception {
+	public void testCompress() throws Exception {
-		GZipCompressor compressor = GZipCompressor.from("testSrc").toFile("testOut/test.gz");
+		File out = IO.file("testOut/test.gz");
-		Assertions.assertNotNull(compressor);
+		CompressType.GZIP.getCompressor().run("testSrc", out);
-	}
-
-	@Test
-	public void testChainCompress() throws Exception {
-		File out = IO.file("testOut/test-chain.gz");
-		AtomicInteger fileCount = new AtomicInteger();
-		AtomicReference<Double> progress = new AtomicReference<>(0D);
-		GZipCompressor compressor = GZipCompressor.from("testSrc");
-		Assertions.assertSame(
-			compressor,
-			compressor
-				.fileCallback(file -> fileCount.incrementAndGet())
-				.progressCallback(progress::set)
-				.toFile(out)
-		);
-		Assertions.assertTrue(0 < fileCount.get());
-		Assertions.assertEquals(1D, progress.get());
 	}
 
 	@Test
 	public void testDecompress() throws Exception {
 		File in = IO.file("testOut/test.gz");
-		GZipCompressor.from("testSrc").toFile(in);
 		File out = IO.dir("testOutDe");
-		CompressType.from(in).toPath(out.getAbsolutePath());
+		CompressType.fromFile(in).run(in, out.getAbsolutePath());
 	}
 
 	@Test
 	public void testCompressToStream() throws Exception {
-		try (OutputStream os = IO.getOutputStream(IO.file("testOut/test.tar.gz"))) {
+		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-			CompressType.GZIP.compressFrom("testSrc").toStream(os);
+			CompressType.GZIP.getCompressor().run("testSrc", outputStream);
 		}
 	}
 
 	@Test
-	public void testChainDecompressFromStream() throws Exception {
+	public void testDecompressFromStream() throws Exception {
 		byte[] bytes;
 		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-			CompressType.GZIP.compressFrom("testSrc").toStream(outputStream);
+			CompressType.GZIP.getCompressor().run("testSrc", outputStream);
 			bytes = outputStream.toByteArray();
 		}
 		File out = IO.dir("testOutDeStream/gzip");
-		AtomicInteger fileCount = new AtomicInteger();
+		try (ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)) {
-		AtomicReference<Double> progress = new AtomicReference<>(0D);
+			CompressType.GZIP.getDecompressor().run(inputStream, out.getAbsolutePath());
-		GZipDecompressor decompressor = GZipDecompressor.from(new ByteArrayInputStream(bytes));
+		}
-		Assertions.assertSame(
-			decompressor,
-			decompressor
-				.fileCallback(file -> fileCount.incrementAndGet())
-				.progressCallback(progress::set)
-				.toPath(out.getAbsolutePath())
-		);
-		Assertions.assertTrue(0 < fileCount.get());
-		Assertions.assertEquals(1D, progress.get());
 	}
 }

src/test/java/test/TarTest.java

@@ -1,18 +1,12 @@
 package test;
 
 import com.imyeyu.compress.CompressType;
-import com.imyeyu.compress.TarCompressor;
-import com.imyeyu.compress.TarDecompressor;
 import com.imyeyu.io.IO;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.OutputStream;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @author 夜雨
@@ -21,62 +15,35 @@ import java.util.concurrent.atomic.AtomicReference;
 public class TarTest {
 
 	@Test
-	public void testStaticCompress() throws Exception {
+	public void testCompress() throws Exception {
-		TarCompressor compressor = TarCompressor.from("testSrc").toFile("testOut/test.tar");
+		File out = IO.file("testOut/test.tar");
-		Assertions.assertNotNull(compressor);
+		CompressType.TAR.getCompressor().run("testSrc", out);
-	}
-
-	@Test
-	public void testChainCompress() throws Exception {
-		File out = IO.file("testOut/test-chain.tar");
-		AtomicInteger fileCount = new AtomicInteger();
-		AtomicReference<Double> progress = new AtomicReference<>(0D);
-		TarCompressor compressor = TarCompressor.from("testSrc");
-		Assertions.assertSame(
-			compressor,
-			compressor
-				.fileCallback(file -> fileCount.incrementAndGet())
-				.progressCallback(progress::set)
-				.toFile(out)
-		);
-		Assertions.assertTrue(0 < fileCount.get());
-		Assertions.assertEquals(1D, progress.get());
 	}
 
 	@Test
 	public void testDecompress() throws Exception {
 		File in = IO.file("testOut/test.tar");
-		TarCompressor.from("testSrc").toFile(in);
 		File out = IO.dir("testOutDe");
-		CompressType.from(in).toPath(out.getAbsolutePath());
+		CompressType.fromFile(in).run(in, out.getAbsolutePath());
 	}
 
 	@Test
 	public void testCompressToStream() throws Exception {
-		try (OutputStream os = IO.getOutputStream(IO.file("testOut/test.tar"))) {
+		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-			CompressType.TAR.compressFrom("testSrc").toStream(os);
+			CompressType.TAR.getCompressor().run("testSrc", outputStream);
 		}
 	}
 
 	@Test
-	public void testChainDecompressFromStream() throws Exception {
+	public void testDecompressFromStream() throws Exception {
 		byte[] bytes;
 		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-			CompressType.TAR.compressFrom("testSrc").toStream(outputStream);
+			CompressType.TAR.getCompressor().run("testSrc", outputStream);
 			bytes = outputStream.toByteArray();
 		}
 		File out = IO.dir("testOutDeStream/tar");
-		AtomicInteger fileCount = new AtomicInteger();
+		try (ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)) {
-		AtomicReference<Double> progress = new AtomicReference<>(0D);
+			CompressType.TAR.getDecompressor().run(inputStream, out.getAbsolutePath());
-		TarDecompressor decompressor = TarDecompressor.from(new ByteArrayInputStream(bytes));
+		}
-		Assertions.assertSame(
-			decompressor,
-			decompressor
-				.fileCallback(file -> fileCount.incrementAndGet())
-				.progressCallback(progress::set)
-				.toPath(out.getAbsolutePath())
-		);
-		Assertions.assertTrue(0 < fileCount.get());
-		Assertions.assertEquals(1D, progress.get());
 	}
 }

src/test/java/test/Z7Test.java

@@ -1,17 +1,12 @@
 package test;
 
 import com.imyeyu.compress.CompressType;
-import com.imyeyu.compress.Z7Compressor;
-import com.imyeyu.compress.Z7Decompressor;
 import com.imyeyu.io.IO;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @author 夜雨
@@ -20,62 +15,35 @@ import java.util.concurrent.atomic.AtomicReference;
 public class Z7Test {
 
 	@Test
-	public void testStaticCompress() throws Exception {
+	public void testCompress() throws Exception {
-		Z7Compressor compressor = Z7Compressor.from("testSrc").toFile("testOut/test.7z");
+		File out = IO.file("testOut/test.7z");
-		Assertions.assertNotNull(compressor);
+		CompressType.Z7.getCompressor().run("testSrc", out);
-	}
-
-	@Test
-	public void testChainCompress() throws Exception {
-		File out = IO.file("testOut/test-chain.7z");
-		AtomicInteger fileCount = new AtomicInteger();
-		AtomicReference<Double> progress = new AtomicReference<>(0D);
-		Z7Compressor compressor = Z7Compressor.from("testSrc");
-		Assertions.assertSame(
-			compressor,
-			compressor
-				.fileCallback(file -> fileCount.incrementAndGet())
-				.progressCallback(progress::set)
-				.toFile(out)
-		);
-		Assertions.assertTrue(0 < fileCount.get());
-		Assertions.assertEquals(1D, progress.get());
 	}
 
 	@Test
 	public void testDecompress() throws Exception {
 		File in = IO.file("testOut/test.7z");
-		Z7Compressor.from("testSrc").toFile(in);
 		File out = IO.dir("testOutDe");
-		CompressType.from(in).toPath(out.getAbsolutePath());
+		CompressType.fromFile(in).run(in, out.getAbsolutePath());
 	}
 
 	@Test
 	public void testCompressToStream() throws Exception {
 		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-			CompressType.Z7.compressFrom("testSrc").toStream(outputStream);
+			CompressType.Z7.getCompressor().run("testSrc", outputStream);
 		}
 	}
 
 	@Test
-	public void testChainDecompressFromStream() throws Exception {
+	public void testDecompressFromStream() throws Exception {
 		byte[] bytes;
 		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-			CompressType.Z7.compressFrom("testSrc").toStream(outputStream);
+			CompressType.Z7.getCompressor().run("testSrc", outputStream);
 			bytes = outputStream.toByteArray();
 		}
 		File out = IO.dir("testOutDeStream/z7");
-		AtomicInteger fileCount = new AtomicInteger();
+		try (ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)) {
-		AtomicReference<Double> progress = new AtomicReference<>(0D);
+			CompressType.Z7.getDecompressor().run(inputStream, out.getAbsolutePath());
-		Z7Decompressor decompressor = Z7Decompressor.from(new ByteArrayInputStream(bytes));
+		}
-		Assertions.assertSame(
-			decompressor,
-			decompressor
-				.fileCallback(file -> fileCount.incrementAndGet())
-				.progressCallback(progress::set)
-				.toPath(out.getAbsolutePath())
-		);
-		Assertions.assertTrue(0 < fileCount.get());
-		Assertions.assertEquals(1D, progress.get());
 	}
 }

src/test/java/test/ZipTest.java

@@ -1,17 +1,12 @@
 package test;
 
 import com.imyeyu.compress.CompressType;
-import com.imyeyu.compress.ZipCompressor;
-import com.imyeyu.compress.ZipDecompressor;
 import com.imyeyu.io.IO;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @author 夜雨
@@ -20,62 +15,35 @@ import java.util.concurrent.atomic.AtomicReference;
 public class ZipTest {
 
 	@Test
-	public void testStaticCompress() throws Exception {
+	public void testCompress() throws Exception {
-		ZipCompressor compressor = ZipCompressor.from("testSrc").toFile("testOut/test.zip");
+		File out = IO.file("testOut/test.zip");
-		Assertions.assertNotNull(compressor);
+		CompressType.ZIP.getCompressor().run("testSrc", out);
-	}
-
-	@Test
-	public void testChainCompress() throws Exception {
-		File out = IO.file("testOut/test-chain.zip");
-		AtomicInteger fileCount = new AtomicInteger();
-		AtomicReference<Double> progress = new AtomicReference<>(0D);
-		ZipCompressor compressor = ZipCompressor.from("testSrc");
-		Assertions.assertSame(
-			compressor,
-			compressor
-				.fileCallback(file -> fileCount.incrementAndGet())
-				.progressCallback(progress::set)
-				.toFile(out)
-		);
-		Assertions.assertTrue(0 < fileCount.get());
-		Assertions.assertEquals(1D, progress.get());
 	}
 
 	@Test
 	public void testDecompress() throws Exception {
 		File in = IO.file("testOut/test.zip");
-		ZipCompressor.from("testSrc").toFile(in);
 		File out = IO.dir("testOutDe");
-		CompressType.from(in).toPath(out.getAbsolutePath());
+		CompressType.fromFile(in).run(in, out.getAbsolutePath());
 	}
 
 	@Test
 	public void testCompressToStream() throws Exception {
 		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-			CompressType.ZIP.compressFrom("testSrc").toStream(outputStream);
+			CompressType.ZIP.getCompressor().run("testSrc", outputStream);
 		}
 	}
 
 	@Test
-	public void testChainDecompressFromStream() throws Exception {
+	public void testDecompressFromStream() throws Exception {
 		byte[] bytes;
 		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-			CompressType.ZIP.compressFrom("testSrc").toStream(outputStream);
+			CompressType.ZIP.getCompressor().run("testSrc", outputStream);
 			bytes = outputStream.toByteArray();
 		}
 		File out = IO.dir("testOutDeStream/zip");
-		AtomicInteger fileCount = new AtomicInteger();
+		try (ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)) {
-		AtomicReference<Double> progress = new AtomicReference<>(0D);
+			CompressType.ZIP.getDecompressor().run(inputStream, out.getAbsolutePath());
-		ZipDecompressor decompressor = ZipDecompressor.from(new ByteArrayInputStream(bytes));
+		}
-		Assertions.assertSame(
-			decompressor,
-			decompressor
-				.fileCallback(file -> fileCount.incrementAndGet())
-				.progressCallback(progress::set)
-				.toPath(out.getAbsolutePath())
-		);
-		Assertions.assertTrue(0 < fileCount.get());
-		Assertions.assertEquals(1D, progress.get());
 	}
 }