fix(compress): 🐛 null appears on entry paths on a wildcard compress

fix #22
opt-nc · Dec 23, 2022 · 0f0876d · 0f0876d
1 parent 2337613
commit 0f0876d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/main/java/nc/opt/util/J7zip.java b/src/main/java/nc/opt/util/J7zip.java
@@ -83,7 +83,7 @@ public static void compress(String name, String password, String... files) throw
     }
 
     private static void addToArchiveCompression(SevenZOutputFile out, File file, String dir) throws IOException {
-        String name = dir + File.separator + file.getName();
+        String name = (dir != null ? dir + File.separator : "") + file.getName();
         if (file.isFile()) {
             SevenZArchiveEntry entry = out.createArchiveEntry(file, name);
             out.putArchiveEntry(entry);

diff --git a/src/test/java/nc/opt/uil/j7zip/Tests.java b/src/test/java/nc/opt/uil/j7zip/Tests.java
@@ -111,6 +111,40 @@ public void testListArrchiveFiles() throws IOException {
         Paths.get("target/archive.7z").toFile().delete();
     }
 
+    @Test
+    public void testCompressDirectory() throws IOException {
+        // compress
+        int exitCode = new CommandLine(new J7zip()).execute(new String[] { "a", "target/archive.7z", "src" });
+        restoreStreams();
+
+        String err = new String(this.err.toByteArray());
+        if (!err.isEmpty()) {
+            System.err.println(err);
+            throw new AssertionFailedError(err);
+        }
+        assertEquals(0, exitCode);
+
+        // list contents of file
+        setUpStreams();
+        exitCode = new CommandLine(new J7zip()).execute(new String[] { "l", "target/archive.7z" });
+        restoreStreams();
+
+        err = new String(this.err.toByteArray());
+        if (!err.isEmpty()) {
+            System.err.println(err);
+            throw new AssertionFailedError(err);
+        }
+        assertEquals(0, exitCode);
+
+        String[] lines = new String(this.out.toByteArray()).split("\n");
+        assertNotEquals(0, lines.length);
+        for (String entry : lines) {
+            assertTrue(entry.startsWith("src/"), "entry not starts with src/ : " + entry);
+        }
+
+        Paths.get("target/archive.7z").toFile().delete();
+    }
+
     /**
      * Test with a archive file compressed by 7z tool
      */