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

Refactor scan mailbox form and add flag for post-processing

Browse Source 
Mails are filtered once by using an imap search and then by some globs
to filter files and subjects. Imap can search by subject via a
string-contains, but not via globs or patterns (afaik). The subject
filter is applied to all downloaded mail headers. Now for post
processing (moving to some target folder or deleting), it can be
chosen to post-process all "seen" mails or only those that matched all
filters.
This commit is contained in:
Eike Kettner
2021-01-24 01:46:31 +01:00
parent e6d67c368b
commit 96612e0e59
6 changed files with 419 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import docspell.joex.scheduler.{Context, Task}
import docspell.store.queries.QOrganization
import docspell.store.records._
import _root_.io.circe.syntax._
import emil.SearchQuery.{All, ReceivedDate}
import emil.javamail.syntax._
import emil.{MimeType => _, _}
@ -31,8 +32,9 @@ object ScanMailboxTask {
Task { ctx =>
for {
_ <- ctx.logger.info(
s"Start importing mails for user ${ctx.args.account.user.id}"
s"=== Start importing mails for user ${ctx.args.account.user.id}"
)
_ <- ctx.logger.debug(s"Settings: ${ctx.args.asJson.noSpaces}")
mailCfg <- getMailSettings(ctx)
folders = ctx.args.folders.mkString(", ")
userId = ctx.args.account.user
@ -249,25 +251,29 @@ object ScanMailboxTask {
.getOrElse(Direction.Incoming)
}
def postHandle[C](a: Access[F, C])(mh: MailHeader): MailOp[F, C, Unit] =
def postHandle[C](a: Access[F, C])(mh: MailHeaderItem): MailOp[F, C, Unit] = {
val postHandleAll = ctx.args.postHandleAll.exists(identity)
ctx.args.targetFolder match {
case Some(tf) =>
logOp(_.debug(s"Post handling mail: ${mh.subject} - moving to folder: $tf"))
case Some(tf) if postHandleAll || mh.process =>
logOp(
_.debug(s"Post handling mail: ${mh.mh.subject} - moving to folder: $tf")
)
.flatMap(_ =>
a.getOrCreateFolder(None, tf).flatMap(folder => a.moveMail(mh, folder))
a.getOrCreateFolder(None, tf).flatMap(folder => a.moveMail(mh.mh, folder))
)
case None if ctx.args.deleteMail =>
logOp(_.debug(s"Post handling mail: ${mh.subject} - deleting mail.")).flatMap(
_ =>
a.deleteMail(mh).flatMapF { r =>
case None if ctx.args.deleteMail && (postHandleAll || mh.process) =>
logOp(_.debug(s"Post handling mail: ${mh.mh.subject} - deleting mail."))
.flatMap(_ =>
a.deleteMail(mh.mh).flatMapF { r =>
if (r.count == 0)
ctx.logger.warn(s"Mail could not be deleted!")
else ().pure[F]
}
)
case None =>
logOp(_.debug(s"Post handling mail: ${mh.subject} - no handling defined!"))
)
case _ =>
logOp(_.debug(s"Post handling mail: ${mh.mh.subject} - no handling defined!"))
}
}
def submitMail(upload: OUpload[F], args: Args)(
mail: Mail[F]
@ -321,7 +327,7 @@ object ScanMailboxTask {
Kleisli.liftF(
ctx.logger.warn(s"Error submitting '${mh.mh.subject}': ${ex.getMessage}")
),
_ => postHandle(a)(mh.mh)
_ => postHandle(a)(mh)
)
} yield ()
}