From 05414d8f185580c6db49947829cb36e8f50670f4 Mon Sep 17 00:00:00 2001 From: Oleg Cherednik Date: Fri, 21 Feb 2025 07:00:09 +0300 Subject: [PATCH] Refactoring --- .../olegcherednik/zip4jvm/engine/zip/ZipEngine.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/olegcherednik/zip4jvm/engine/zip/ZipEngine.java b/src/main/java/ru/olegcherednik/zip4jvm/engine/zip/ZipEngine.java index 19750953..b389452e 100644 --- a/src/main/java/ru/olegcherednik/zip4jvm/engine/zip/ZipEngine.java +++ b/src/main/java/ru/olegcherednik/zip4jvm/engine/zip/ZipEngine.java @@ -50,6 +50,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; import static ru.olegcherednik.zip4jvm.utils.ValidationUtils.requireNotBlank; @@ -224,8 +225,8 @@ private void removeOriginalZipFiles() throws IOException { private void moveTempZipFiles() throws IOException { for (int diskNo = 0; diskNo <= tempZipModel.getTotalDisks(); diskNo++) { Path src = tempZipModel.getDisk(diskNo); - Path dest = zip.getParent().resolve(src.getFileName()); - Files.move(src, dest); + Path dst = zip.getParent().resolve(src.getFileName()); + Files.move(src, dst); } Files.deleteIfExists(tempZipModel.getSrcZip().getPath().getParent()); @@ -256,11 +257,9 @@ private static ZipModel createTempZipModel(Path zip, ZipSettings settings, Map { - Path dir = zip.getParent().resolve("tmp"); - Files.createDirectories(dir); - return dir.resolve(zip.getFileName()); - }); + Path dir = zip.getParent().resolve("tmp_" + UUID.randomUUID()); + Quietly.doRuntime(() -> Files.createDirectories(dir)); + return dir.resolve(zip.getFileName()); } private static DataOutput creatDataOutput(ZipModel zipModel) throws IOException {