#586 - Delete inner directories first in deleteRecursive (#588)

zio-archive · May 7, 2023 · 4e59536 · 4e59536
1 parent 2e00ffa
commit 4e59536
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/nio/src/main/scala/zio/nio/file/Files.scala b/nio/src/main/scala/zio/nio/file/Files.scala
@@ -21,6 +21,7 @@ import java.nio.file.{
 import java.util.function.BiPredicate
 import scala.jdk.CollectionConverters._
 import scala.reflect._
+import zio.ZIOAspect
 
 object Files {
 
@@ -134,7 +135,13 @@ object Files {
     attemptBlocking(JFiles.deleteIfExists(path.javaPath)).refineToOrDie[IOException]
 
   def deleteRecursive(path: Path)(implicit trace: Trace): ZIO[Any, IOException, Long] =
-    newDirectoryStream(path).mapZIO(delete).run(ZSink.count) <* delete(path)
+    newDirectoryStream(path).mapZIO { p =>
+      for {
+        deletedInSubDirectory <- deleteRecursive(p).whenZIO(isDirectory(p)).map(_.getOrElse(0L))
+        deletedFile           <- deleteIfExists(p).map(if (_) 1 else 0)
+      } yield deletedInSubDirectory + deletedFile
+    }
+      .run(ZSink.sum) <* delete(path)
 
   def copy(source: Path, target: Path, copyOptions: CopyOption*)(implicit
     trace: Trace

diff --git a/nio/src/test/scala/zio/nio/file/FilesSpec.scala b/nio/src/test/scala/zio/nio/file/FilesSpec.scala
@@ -81,6 +81,17 @@ object FilesSpec extends BaseSpec {
           tmpFileExistsAfterUsage <- Files.exists(tmpFilePath)
         } yield assert(readBytes)(equalTo(sampleFileContent)) &&
           assert(tmpFileExistsAfterUsage)(isFalse)
+      },
+      test("deleteRecursive deletes subdirectories") {
+        for {
+          outerDir  <- Files.createTempDirectory(prefix = None, fileAttributes = Nil)
+          innerDir   = outerDir / "inner"
+          _         <- Files.createDirectory(innerDir)
+          innerDir  <- Files.writeLines(innerDir / "file.txt", "test" :: Nil)
+          _         <- Files.deleteRecursive(outerDir)
+          isDeleted <- Files.notExists(outerDir)
+        } yield assertTrue(isDeleted)
+
       }
     )