Preserve zipped directory permissions

During zipping, add zip entries for all directories (not just empty ones), with permissions set.
During unzipping, unzipping enclosing directories before their contents.

Author: kiendang

os/src/ZipOps.scala

@@ -118,16 +118,13 @@ object zip {
     sources.foreach { source =>
       if (os.isDir(source.src)) {
         val contents = os.walk(source.src)
-        if (contents.isEmpty)
-          source.dest
-            .filter(_ => shouldInclude(source.src.toString + "/", excludePatterns, includePatterns))
-            .foreach(makeZipEntry0(source.src, _))
+        source.dest
+          .filter(_ => shouldInclude(source.src.toString + "/", excludePatterns, includePatterns))
+          .foreach(makeZipEntry0(source.src, _))
         for (path <- contents) {
           if (
             (os.isFile(path) && shouldInclude(path.toString, excludePatterns, includePatterns)) ||
-            (os.isDir(path) &&
-              os.walk.stream(path).headOption.isEmpty &&
-              shouldInclude(path.toString + "/", excludePatterns, includePatterns))
+            (os.isDir(path) && shouldInclude(path.toString + "/", excludePatterns, includePatterns))
           ) {
             makeZipEntry0(path, source.dest.getOrElse(os.sub) / path.subRelativeTo(source.src))
           }
@@ -330,19 +327,41 @@ object unzip {
     val zipFile = new apache.ZipFile(source.toIO)
     val zipEntryInputStreams = zipFile.getEntries.asScala
       .filter(ze => os.zip.shouldInclude(ze.getName, excludePatterns, includePatterns))
-      .map(ze => (ze, zipFile.getInputStream(ze)))
+      .map(ze => {
+        val mode = ze.getUnixMode
+        (
+          ze,
+          os.SubPath(ze.getName),
+          mode,
+          ze.isDirectory,
+          isSymLink(mode),
+          zipFile.getInputStream(ze)
+        )
+      })
+      .toList
+      .sortBy { case (_, path, _, isDirectory, isSymLink, _) =>
+        // Sort zip entries by
+        // (1) file type: directories come first, then regular files, then symbolic links
+        // (2) path: parent directories come before children
+        // so that enclosing directories are unzipped before their contents.
+        // This makes sure directory permissions are applied correctly.
+        (!isDirectory, isSymLink, path)
+      }
 
     try {
-      for ((zipEntry, zipInputStream) <- zipEntryInputStreams) {
-        val newFile = dest / os.SubPath(zipEntry.getName)
-        val mode = zipEntry.getUnixMode
+      for ((zipEntry, path, mode, isDirectory, isSymLink, zipInputStream) <- zipEntryInputStreams) {
+        val newFile = dest / path
         val perms = if (mode > 0 && !isWin) {
           os.PermSet.fromSet(apache.PermissionUtils.permissionsFromMode(mode))
         } else null
 
-        if (zipEntry.isDirectory) {
+        if (isDirectory) {
           os.makeDir.all(newFile, perms = perms)
-        } else if (isSymLink(mode)) {
+          if (perms != null && os.perms(newFile) != perms) {
+            // because of umask
+            os.perms.set(newFile, perms)
+          }
+        } else if (isSymLink) {
           val target = scala.io.Source.fromInputStream(zipInputStream).mkString
           val path = java.nio.file.Paths.get(target)
           val dest = if (path.isAbsolute) os.Path(path) else os.RelPath(path)
@@ -378,6 +397,11 @@ object unzip {
   /**
    * Unzips a ZIP data stream represented by a geny.Readable and extracts it to a destination directory.
    *
+   * File permissions and symbolic links are not supported since permissions and symlink mode are stored
+   * as external attributes which reside in the central directory located at the end of the zip archive.
+   * For more a more detailed explanation see the `ZipArchiveInputStream` vs `ZipFile` section at
+   * [[https://commons.apache.org/proper/commons-compress/zip.html]]
+   *
    * @param source          A geny.Readable object representing the ZIP data stream.
    * @param dest     The path to the destination directory for extracted files.
    * @param excludePatterns A list of regular expression patterns to exclude files during extraction. (Optional)