TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test for non-empty sub directory

Browse Source 
Fixes: #2650
This commit is contained in:
eikek
2024-05-27 20:39:26 +02:00
parent 870bfd9cf0
commit 62bd9844dd
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/common/src/main/scala/docspell/common/util/Directory.scala
View File

@ -6,6 +6,7 @@
package docspell.common.util
import cats.data.OptionT
import cats.effect._
import cats.syntax.all._
import cats.{Applicative, Monad}
@ -26,10 +27,10 @@ object Directory {
(dir :: dirs.toList).traverse_(Files[F].createDirectories(_))
def nonEmpty[F[_]: Files: Sync](dir: Path): F[Boolean] =
List(
Files[F].isDirectory(dir),
Files[F].list(dir).take(1).compile.last.map(_.isDefined)
).sequence.map(_.forall(identity))
OptionT
.whenM(Files[F].isDirectory(dir))(Files[F].list(dir).take(1).compile.toList)
.map(_.nonEmpty)
.isDefined
def isEmpty[F[_]: Files: Sync](dir: Path): F[Boolean] =
nonEmpty(dir).map(b => !b)