Refactoring

Author: oleg-cherednik

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 {

src/test/java/ru/olegcherednik/zip4jvm/Foo.java

@@ -22,6 +22,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import static ru.olegcherednik.zip4jvm.TestData.fileBentley;
+
 /**
  * @author Oleg Cherednik
  * @since 19.10.2022
@@ -30,12 +32,8 @@
 public class Foo {
 
     public static void main(String[] args) throws IOException {
-        Path src = Paths.get("f:/zip4jvm/foo/src/data");
-        Path zip = Paths.get("f:/zip4jvm/aaa.zip");
-
-//        ZipIt.zip(zip).add(src);
-        UnzipIt.zip(zip).dstDir(Paths.get("f:/zip4jvm/dst")).extract();
-
+        Path zip = Paths.get("f:/zip4jvm/zip64/ferdinand2.zip");
+        ZipIt.zip(zip).add(fileBentley);
     }
 
 }