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

add exception

Browse Source
This commit is contained in:
Looly 2020-06-02 18:05:13 +08:00
parent 58441b393f
commit 93951af07e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java
View File

@ -388,7 +388,8 @@ public class ZipUtil {
* @since 3.2.2 * @since 3.2.2
*/ */
public static File unzip(File zipFile, Charset charset) throws UtilException { public static File unzip(File zipFile, Charset charset) throws UtilException {
return unzip(zipFile, FileUtil.file(zipFile.getParentFile(), FileUtil.mainName(zipFile)), charset); final File destDir = FileUtil.file(zipFile.getParentFile(), FileUtil.mainName(zipFile));
return unzip(zipFile, destDir, charset);
} }
/** /**
@ -459,6 +460,9 @@ public class ZipUtil {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static File unzip(ZipFile zipFile, File outFile) throws IORuntimeException { public static File unzip(ZipFile zipFile, File outFile) throws IORuntimeException {
if(outFile.exists() && outFile.isFile()){
throw new UtilException("Target path [{}] exist!", outFile.getAbsolutePath());
}
try { try {
final Enumeration<ZipEntry> em = (Enumeration<ZipEntry>) zipFile.entries(); final Enumeration<ZipEntry> em = (Enumeration<ZipEntry>) zipFile.entries();
ZipEntry zipEntry; ZipEntry zipEntry;

9
hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java
View File

@ -1,13 +1,12 @@
package cn.hutool.core.util; package cn.hutool.core.util;
import java.io.File; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Console;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import cn.hutool.core.io.FileUtil; import java.io.File;
import cn.hutool.core.lang.Console;
/** /**
* {@link ZipUtil}单元测试 * {@link ZipUtil}单元测试
@ -36,7 +35,7 @@ public class ZipUtilTest {
File unzip = ZipUtil.unzip("f:/test/各种资源.zip", "f:/test/各种资源", CharsetUtil.CHARSET_GBK); File unzip = ZipUtil.unzip("f:/test/各种资源.zip", "f:/test/各种资源", CharsetUtil.CHARSET_GBK);
Console.log(unzip); Console.log(unzip);
} }
@Test @Test
@Ignore @Ignore
public void unzipFromStreamTest() { public void unzipFromStreamTest() {