Fix Windows

Author: kiendang

os/src/ZipOps.scala

@@ -164,14 +164,16 @@ object zip {
     val mtime = if (preserveMtimes) os.mtime(file) else 0
     zipEntry.setTime(mtime)
 
-    val mode = apache.PermissionUtils.modeFromPermissions(
-      os.perms(file, followLinks = false).toSet(),
-      toFileType(file)
-    )
-    zipEntry.setUnixMode(mode)
+    if (!scala.util.Properties.isWin) {
+      val mode = apache.PermissionUtils.modeFromPermissions(
+        os.perms(file, followLinks = false).toSet(),
+        toFileType(file)
+      )
+      zipEntry.setUnixMode(mode)
+    }
 
     val fis =
-      if (os.isLink(file))
+      if (!scala.util.Properties.isWin && os.isLink(file))
         Some(new java.io.ByteArrayInputStream(os.readLink(file).toString().getBytes()))
       else if (os.isFile(file)) Some(os.read.inputStream(file))
       else None
@@ -277,13 +279,13 @@ object unzip {
       for ((zipEntry, zipInputStream) <- zipEntryInputStreams) {
         val newFile = dest / os.SubPath(zipEntry.getName)
         val mode = zipEntry.getUnixMode
-        val perms = if (mode > 0) {
+        val perms = if (mode > 0 || scala.util.Properties.isWin) {
           os.PermSet.fromSet(apache.PermissionUtils.permissionsFromMode(mode))
         } else null
 
         if (zipEntry.isDirectory) {
           os.makeDir.all(newFile, perms = perms)
-        } else if (isSymLink(mode)) {
+        } else if (!scala.util.Properties.isWin && isSymLink(mode)) {
           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)
@@ -293,7 +295,7 @@ object unzip {
           val outputStream = os.write.outputStream(newFile, createFolders = true)
           os.Internals.transfer(zipInputStream, outputStream, close = false)
           outputStream.close()
-          if (perms != null) os.perms.set(newFile, perms)
+          if (!scala.util.Properties.isWin && perms != null) os.perms.set(newFile, perms)
         }
       }
     } finally {

os/test/src/ZipOpTests.scala

@@ -195,8 +195,10 @@ object ZipOpTests extends TestSuite {
       ) = {
         val zipFileName = "zipped.zip"
         val source = wd / "folder2"
-        os.perms.set(source / "nestedA" / "a.txt", os.PermSet.fromString("rw-rw-rw-"))
-        os.symlink(source / "nestedA" / "link.txt", os.rel / "a.txt")
+        if (!scala.util.Properties.isWin) {
+          os.perms.set(source / "nestedA" / "a.txt", os.PermSet.fromString("rw-rw-rw-"))
+          os.symlink(source / "nestedA" / "link.txt", os.rel / "a.txt")
+        }
 
         val zipped =
           if (zipStream) {
@@ -232,53 +234,59 @@ object ZipOpTests extends TestSuite {
       def walkRel(p: os.Path) = os.walk(p).map(_.relativeTo(p))
 
       test("zip") - prep { wd =>
-        val (source, unzipped) = prepare(wd)
-
-        assert(walkRel(source).toSet == walkRel(unzipped).toSet)
-        assert(os.walk.stream(source)
-          .filter(!os.isLink(_))
-          .forall(p => os.perms(p) == os.perms(unzipped / p.relativeTo(source))))
-        assert(
-          os.walk.stream(source)
-            .filter(os.isLink(_))
-            .forall { p =>
-              val unzippedLink = unzipped / p.relativeTo(source)
-              os.isLink(unzippedLink) &&
-              os.readLink(p) == os.readLink(unzippedLink)
-            }
-        )
+        if (!scala.util.Properties.isWin) {
+          val (source, unzipped) = prepare(wd)
+
+          assert(walkRel(source).toSet == walkRel(unzipped).toSet)
+          assert(os.walk.stream(source)
+            .filter(!os.isLink(_))
+            .forall(p => os.perms(p) == os.perms(unzipped / p.relativeTo(source))))
+          assert(
+            os.walk.stream(source)
+              .filter(os.isLink(_))
+              .forall { p =>
+                val unzippedLink = unzipped / p.relativeTo(source)
+                os.isLink(unzippedLink) &&
+                os.readLink(p) == os.readLink(unzippedLink)
+              }
+          )
+        }
       }
 
       test("zipStream") - prep { wd =>
-        val (source, unzipped) = prepare(wd, zipStream = true)
-
-        assert(walkRel(source).toSet == walkRel(unzipped).toSet)
-        assert(os.walk.stream(source)
-          .filter(!os.isLink(_))
-          .forall(p => os.perms(p) == os.perms(unzipped / p.relativeTo(source))))
-        assert(
-          os.walk.stream(source)
-            .filter(os.isLink(_))
-            .forall { p =>
-              val unzippedLink = unzipped / p.relativeTo(source)
-              os.isLink(unzippedLink) &&
-              os.readLink(p) == os.readLink(unzippedLink)
-            }
-        )
+        if (!scala.util.Properties.isWin) {
+          val (source, unzipped) = prepare(wd, zipStream = true)
+
+          assert(walkRel(source).toSet == walkRel(unzipped).toSet)
+          assert(os.walk.stream(source)
+            .filter(!os.isLink(_))
+            .forall(p => os.perms(p) == os.perms(unzipped / p.relativeTo(source))))
+          assert(
+            os.walk.stream(source)
+              .filter(os.isLink(_))
+              .forall { p =>
+                val unzippedLink = unzipped / p.relativeTo(source)
+                os.isLink(unzippedLink) &&
+                os.readLink(p) == os.readLink(unzippedLink)
+              }
+          )
+        }
       }
 
       test("unzipStream") - prep { wd =>
-        val (source, unzipped) = prepare(wd, zipStream = true)
-
-        assert(walkRel(source).toSet == walkRel(unzipped).toSet)
-        assert(
-          os.walk.stream(source)
-            .filter(os.isLink(_))
-            .forall { p =>
-              val unzippedLink = unzipped / p.relativeTo(source)
-              os.read(p) == os.read(unzippedLink)
-            }
-        )
+        if (!scala.util.Properties.isWin) {
+          val (source, unzipped) = prepare(wd, zipStream = true)
+
+          assert(walkRel(source).toSet == walkRel(unzipped).toSet)
+          assert(
+            os.walk.stream(source)
+              .filter(os.isLink(_))
+              .forall { p =>
+                val unzippedLink = unzipped / p.relativeTo(source)
+                os.read(p) == os.read(unzippedLink)
+              }
+          )
+        }
       }
     }