From 0a6323640fc944d9dd73a7b4fb69511f0fa2f410 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 28 Aug 2024 18:17:02 -0700
Subject: [PATCH] Added File argument alternatives with Path and String.

---
 .../java/rife/bld/extension/ZipOperation.java | 94 +++++++++++++++++--
 1 file changed, 87 insertions(+), 7 deletions(-)

diff --git a/src/main/java/rife/bld/extension/ZipOperation.java b/src/main/java/rife/bld/extension/ZipOperation.java
index b06d79a..5578d10 100644
--- a/src/main/java/rife/bld/extension/ZipOperation.java
+++ b/src/main/java/rife/bld/extension/ZipOperation.java
@@ -7,15 +7,20 @@ package rife.bld.extension;
 import org.apache.commons.compress.archivers.zip.UnixStat;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
 import rife.bld.NamedFile;
 import rife.bld.operations.AbstractOperation;
 import rife.tools.FileUtils;
 import rife.tools.StringUtils;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
-import java.util.*;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Pattern;
 
 /**
@@ -135,10 +140,49 @@ public class ZipOperation extends AbstractOperation<ZipOperation> {
      *
      * @param directories source directories
      * @return this operation instance
+     * @see #sourceDirectories(List)
      * @since 1.0
      */
     public ZipOperation sourceDirectories(File... directories) {
-        sourceDirectories_.addAll(List.of(directories));
+        return sourceDirectories(List.of(directories));
+    }
+
+    /**
+     * Provides source directories that will be used for the zip archive creation.
+     *
+     * @param directories source directories
+     * @return this operation instance
+     * @see #sourceDirectoriesPaths(List)
+     * @since 1.0
+     */
+    public ZipOperation sourceDirectories(Path... directories) {
+        return sourceDirectoriesPaths(List.of(directories));
+    }
+
+    /**
+     * Provides source directories that will be used for the zip archive creation.
+     *
+     * @param directories source directories
+     * @return this operation instance
+     * @see #sourceDirectoriesStrings(List)
+     * @since 1.0
+     */
+    public ZipOperation sourceDirectories(String... directories) {
+        return sourceDirectoriesStrings(List.of(directories));
+    }
+
+    /**
+     * Provides a list of source directories that will be used for the zip archive creation.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param directories a list of source directories
+     * @return this operation instance
+     * @see #sourceDirectories(File...)
+     * @since 1.0
+     */
+    public ZipOperation sourceDirectories(List<File> directories) {
+        sourceDirectories_.addAll(directories);
         return this;
     }
 
@@ -149,11 +193,25 @@ public class ZipOperation extends AbstractOperation<ZipOperation> {
      *
      * @param directories a list of source directories
      * @return this operation instance
+     * @see #sourceDirectories(Path...)
      * @since 1.0
      */
-    public ZipOperation sourceDirectories(List<File> directories) {
-        sourceDirectories_.addAll(directories);
-        return this;
+    public ZipOperation sourceDirectoriesPaths(List<Path> directories) {
+        return sourceDirectories(directories.stream().map(Path::toFile).toList());
+    }
+
+    /**
+     * Provides a list of source directories that will be used for the zip archive creation.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param directories a list of source directories
+     * @return this operation instance
+     * @see #sourceDirectories(String...)
+     * @since 1.0
+     */
+    public ZipOperation sourceDirectoriesStrings(List<String> directories) {
+        return sourceDirectories(directories.stream().map(File::new).toList());
     }
 
     /**
@@ -194,6 +252,28 @@ public class ZipOperation extends AbstractOperation<ZipOperation> {
         return this;
     }
 
+    /**
+     * Provides the destination directory in which the zip archive will be created.
+     *
+     * @param directory the zip destination directory
+     * @return this operation instance
+     * @since 1.0
+     */
+    public ZipOperation destinationDirectory(Path directory) {
+        return destinationDirectory(directory.toFile());
+    }
+
+    /**
+     * Provides the destination directory in which the zip archive will be created.
+     *
+     * @param directory the zip destination directory
+     * @return this operation instance
+     * @since 1.0
+     */
+    public ZipOperation destinationDirectory(String directory) {
+        return destinationDirectory(new File(directory));
+    }
+
     /**
      * Provides the destination file name that will be used for the zip archive creation.
      *