ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

!1123 修复：Archiver 最后一个 Entry 为空文件夹时未关闭 Entry

Browse Source 
Merge pull request !1123 from 蒋小小/v5-dev
This commit is contained in:
Looly 2023-12-05 12:33:15 +00:00 committed by Gitee
commit 0224557678
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java
View File

@ -177,6 +177,8 @@ public class StreamArchiver implements Archiver {
for (File childFile : files) { for (File childFile : files) {
addInternal(childFile, entryName, filter); addInternal(childFile, entryName, filter);
} }
} else {
out.closeArchiveEntry();
} }
} else { } else {
if (file.isFile()) { if (file.isFile()) {

32
hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
View File

@ -72,4 +72,36 @@ public class ArchiverTest {
}) })
.finish().close(); .finish().close();
} }
/**
* Add: D:\disk-all
* Add: D:\disk-all\els-app
* Add: D:\disk-all\els-app\db-backup
* Add: D:\disk-all\els-app\新建 文本文档.txt
* Add: D:\disk-all\新建 文本文档.txt
* Add: D:\disk-all\新建文件夹
*/
@Test
@Ignore
public void emptyTest(){
final File file = FileUtil.file("d:/disk-all.tgz");
CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, "tgz", file)
.add(FileUtil.file("D:\\disk-all"), (f)->{
Console.log("Add: {}", f.getPath());
return true;
})
.finish().close();
}
@Test
@Ignore
public void emptyZTest(){
final File file = FileUtil.file("d:/disk-all.7z");
CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, "7z", file)
.add(FileUtil.file("D:\\disk-all"), (f)->{
Console.log("Add: {}", f.getPath());
return true;
})
.finish().close();
}
} }