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

Simplify recursive folder scan with

Browse Source
This commit is contained in:
moerfi
2022-01-23 19:22:27 +01:00
parent a6e79a32a8
commit 805f57def3
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/joex/src/main/scala/docspell/joex/scanmailbox/ScanMailboxTask.scala
View File

@ -24,6 +24,7 @@ import docspell.store.records._
import _root_.io.circe.syntax._ import _root_.io.circe.syntax._
import emil.SearchQuery.{All, ReceivedDate} import emil.SearchQuery.{All, ReceivedDate}
import emil.SearchResult.searchResultMonoid
import emil.javamail.syntax._ import emil.javamail.syntax._
import emil.{MimeType => _, _} import emil.{MimeType => _, _}
@ -98,7 +99,12 @@ object ScanMailboxTask {
if (acc.noneLeft(name)) acc.pure[F] if (acc.noneLeft(name)) acc.pure[F]
else else
mailer mailer
.run(impl.handleFolder(theEmil.access, upload)(name, ctx.args.scanRecursively.getOrElse(false))) .run(
impl.handleFolder(theEmil.access, upload)(
name,
ctx.args.scanRecursively.getOrElse(false)
)
)
.map(_ ++ acc) .map(_ ++ acc)
Stream Stream
@ -183,13 +189,9 @@ object ScanMailboxTask {
)(folder: MailFolder): MailOp[F, C, SearchResult[MailHeader]] = )(folder: MailFolder): MailOp[F, C, SearchResult[MailHeader]] =
for { for {
subFolders <- a.listFoldersRecursive(Some(folder)) subFolders <- a.listFoldersRecursive(Some(folder))
search <- subFolders.foldLeft(searchMails(a)(folder)) { (result, folder) => foldersToSearch = Vector(folder) ++ subFolders
for { search <- foldersToSearch.traverse(searchMails(a))
res <- result } yield searchResultMonoid.combineAll(search)
search <- searchMails(a)(folder)
} yield SearchResult(res.mails ++ search.mails, res.count + search.count)
}
} yield search
def searchMails[C]( def searchMails[C](
a: Access[F, C] a: Access[F, C]