timi/timi-compress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge pull request 'v0.0.4' (#7) from dev into master

Browse Source 
Reviewed-on: #7
This commit was merged in pull request #7.
This commit is contained in:
timi
2026-04-07 08:45:18 +00:00
parent 279289fb22 01c21c7aa0
commit 0cf2aba878
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/imyeyu/compress/GZipCompressor.java
View File

@@ -46,10 +46,10 @@ public class GZipCompressor extends Compressor<GZipCompressor> {
List<File> files = IO.listFile(fromFile); List<File> files = IO.listFile(fromFile);
String basePath = files.getFirst().getParentFile().getAbsolutePath(); String basePath = files.getFirst().getParentFile().getAbsolutePath();
initByteProgress(IO.calcSize(fromFile)); initByteProgress(IO.calcSize(fromFile));
try (
GzipCompressorOutputStream gzipOutputStream = new GzipCompressorOutputStream(new BufferedOutputStream(nonClosing(toStream))); GzipCompressorOutputStream gzipOutputStream = new GzipCompressorOutputStream(new BufferedOutputStream(nonClosing(toStream)));
TarArchiveOutputStream tarOutputStream = new TarArchiveOutputStream(gzipOutputStream) TarArchiveOutputStream tarOutputStream = null;
) { try {
tarOutputStream = new TarArchiveOutputStream(gzipOutputStream);
for (File sourceFile : files) { for (File sourceFile : files) {
String name = sourceFile.getAbsolutePath().substring(basePath.length() + 1); String name = sourceFile.getAbsolutePath().substring(basePath.length() + 1);
TarArchiveEntry tarEntry = new TarArchiveEntry(sourceFile, normalizeEntryName(name)); TarArchiveEntry tarEntry = new TarArchiveEntry(sourceFile, normalizeEntryName(name));
@@ -61,9 +61,13 @@ public class GZipCompressor extends Compressor<GZipCompressor> {
handleFile(sourceFile); handleFile(sourceFile);
} }
tarOutputStream.finish(); tarOutputStream.finish();
gzipOutputStream.finish();
finishProgress(); finishProgress();
} finally { } finally {
if (tarOutputStream != null) {
tarOutputStream.close();
} else {
gzipOutputStream.close();
}
resetProgress(); resetProgress();
} }
} }

5
src/test/java/test/GzipTest.java
View File

@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.OutputStream;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@@ -52,8 +53,8 @@ public class GzipTest {
@Test @Test
public void testCompressToStream() throws Exception { public void testCompressToStream() throws Exception {
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { try (OutputStream os = IO.getOutputStream(IO.file("testOut/test.tar.gz"))) {
CompressType.GZIP.ofCompress("testSrc").toStream(outputStream); CompressType.GZIP.ofCompress("testSrc").toStream(os);
} }
} }

5
src/test/java/test/TarTest.java
View File

@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.OutputStream;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@@ -52,8 +53,8 @@ public class TarTest {
@Test @Test
public void testCompressToStream() throws Exception { public void testCompressToStream() throws Exception {
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { try (OutputStream os = IO.getOutputStream(IO.file("testOut/test.tar"))) {
CompressType.TAR.ofCompress("testSrc").toStream(outputStream); CompressType.TAR.ofCompress("testSrc").toStream(os);
} }
} }