Refactoring

oleg-cherednik · Feb 22, 2025 · 05414d8 · 05414d8
1 parent 6e715ca
commit 05414d8
Showing 1 changed file with 6 additions and 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
@@ -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<S
     }
 
     private static Path createTempZip(Path zip) {
-        return Quietly.doRuntime(() -> {
-            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 {