Mark sent messages as "seen" in maildir

- Add maildir flags to complement a messages imap flags
- Set the "seen" flag on sent messages when using the maildir backend
- Cleanup AppendMessage interface to use models.Flag for both IMAP and
  maildir

2 files changed, 29 insertions, 9 deletions

diff --git a/worker/maildir/message.go b/worker/maildir/message.go
index 45b1ca6..9d622b4 100644
--- a/worker/maildir/message.go
+++ b/worker/maildir/message.go
@@ -45,7 +45,7 @@ func (m Message) ModelFlags() ([]models.Flag, error) {
 	if err != nil {
 		return nil, err
 	}
-	return translateFlags(flags), nil
+	return translateMaildirFlags(flags), nil
 }
 
 // SetFlags replaces the message's flags with a new set.
@@ -97,7 +97,7 @@ func (m Message) NewBodyPartReader(requestedParts []int) (io.Reader, error) {
 	return lib.FetchEntityPartReader(msg, requestedParts)
 }
 
-var flagMap = map[maildir.Flag]models.Flag{
+var maildirToFlag = map[maildir.Flag]models.Flag{
 	maildir.FlagReplied: models.AnsweredFlag,
 	maildir.FlagSeen:    models.SeenFlag,
 	maildir.FlagTrashed: models.DeletedFlag,
@@ -106,16 +106,35 @@ var flagMap = map[maildir.Flag]models.Flag{
 	// maildir.FlagPassed Flag = 'P'
 }
 
-func translateFlags(maildirFlags []maildir.Flag) []models.Flag {
+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 := flagMap[maildirFlag]; ok {
+		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
 }
diff --git a/worker/maildir/worker.go b/worker/maildir/worker.go
index 17123c6..2f96e6f 100644
--- a/worker/maildir/worker.go
+++ b/worker/maildir/worker.go
@@ -337,7 +337,7 @@ func (w *Worker) sort(uids []uint32, criteria []*types.SortCriterion) ([]uint32,
 
 func (w *Worker) handleCreateDirectory(msg *types.CreateDirectory) error {
 	dir := w.c.Dir(msg.Directory)
-	if err := dir.Create(); err != nil {
+	if err := dir.Init(); err != nil {
 		w.worker.Logger.Printf("could not create directory %s: %v",
 			msg.Directory, err)
 		return err
@@ -510,15 +510,16 @@ func (w *Worker) handleCopyMessages(msg *types.CopyMessages) error {
 }
 
 func (w *Worker) handleAppendMessage(msg *types.AppendMessage) error {
+	// since we are the "master" maildir process, we can modify the maildir directly
 	dest := w.c.Dir(msg.Destination)
-	delivery, err := dest.NewDelivery()
+	_, writer, err := dest.Create(translateFlags(msg.Flags))
 	if err != nil {
-		w.worker.Logger.Printf("could not deliver message to %s: %v",
+		w.worker.Logger.Printf("could not create message at %s: %v",
 			msg.Destination, err)
 		return err
 	}
-	defer delivery.Close()
-	if _, err := io.Copy(delivery, msg.Reader); err != nil {
+	defer writer.Close()
+	if _, err := io.Copy(writer, msg.Reader); err != nil {
 		w.worker.Logger.Printf("could not write message to destination: %v", err)
 		return err
 	}