maildir: move common maildir code out of worker

This change moves code that could be common to both notmuch and maildir
workers in worker/lib.

Signed-off-by: Julian Pidancet <julian.pidancet@oracle.com>
Acked-by: Robin Jarry <robin@jarry.cc>
Acked-by: Tim Culverhouse <tim@timculverhouse.com>

1 files changed, 1 insertions, 39 deletions

diff --git a/worker/maildir/message.go b/worker/maildir/message.go
index 9cd13319..3c8ce9ef 100644
--- a/worker/maildir/message.go
+++ b/worker/maildir/message.go
@@ -33,7 +33,7 @@ func (m Message) ModelFlags() ([]models.Flag, error) {
 	if err != nil {
 		return nil, err
 	}
-	return translateMaildirFlags(flags), nil
+	return lib.FromMaildirFlags(flags), nil
 }
 
 // SetFlags replaces the message's flags with a new set.
@@ -91,44 +91,6 @@ func (m Message) NewBodyPartReader(requestedParts []int) (io.Reader, error) {
 	return lib.FetchEntityPartReader(msg, requestedParts)
 }
 
-var maildirToFlag = map[maildir.Flag]models.Flag{
-	maildir.FlagReplied: models.AnsweredFlag,
-	maildir.FlagSeen:    models.SeenFlag,
-	maildir.FlagTrashed: models.DeletedFlag,
-	maildir.FlagFlagged: models.FlaggedFlag,
-	// maildir.FlagDraft Flag = 'D'
-	// maildir.FlagPassed Flag = 'P'
-}
-
-var flagToMaildir = map[models.Flag]maildir.Flag{
-	models.AnsweredFlag: maildir.FlagReplied,
-	models.SeenFlag:     maildir.FlagSeen,
-	models.DeletedFlag:  maildir.FlagTrashed,
-	models.FlaggedFlag:  maildir.FlagFlagged,
-	// maildir.FlagDraft Flag = 'D'
-	// maildir.FlagPassed Flag = 'P'
-}
-
-func translateMaildirFlags(maildirFlags []maildir.Flag) []models.Flag {
-	var flags []models.Flag
-	for _, maildirFlag := range maildirFlags {
-		if flag, ok := maildirToFlag[maildirFlag]; ok {
-			flags = append(flags, flag)
-		}
-	}
-	return flags
-}
-
-func translateFlags(flags []models.Flag) []maildir.Flag {
-	var maildirFlags []maildir.Flag
-	for _, flag := range flags {
-		if maildirFlag, ok := flagToMaildir[flag]; ok {
-			maildirFlags = append(maildirFlags, maildirFlag)
-		}
-	}
-	return maildirFlags
-}
-
 func (m Message) UID() uint32 {
 	return m.uid
 }