From 0535f6333f2f5d13469fc315a65c53ff8a5e83f3 Mon Sep 17 00:00:00 2001 From: ARaspiK Date: Sun, 5 Jul 2020 14:29:52 +0000 Subject: Add additional flagging functionality More mail flags can now be set, unset, and toggled, not just the read/seen flag. This functionality is implemented with a new `:flag` and `:unflag` command, which are extensions to the matching `:read` and `:unread` commands, adding support for different flags. In fact, the `read`/`unread` commands are now recognized aliases to `flag`/`unflag`. The new commands are also well documented in aerc(1). The change mostly extends the previous read/unread setting functionality by adding a selection for the flag to change. --- worker/maildir/worker.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'worker/maildir/worker.go') diff --git a/worker/maildir/worker.go b/worker/maildir/worker.go index f14672e..467f2aa 100644 --- a/worker/maildir/worker.go +++ b/worker/maildir/worker.go @@ -193,8 +193,8 @@ func (w *Worker) handleMessage(msg types.WorkerMessage) error { return w.handleFetchFullMessages(msg) case *types.DeleteMessages: return w.handleDeleteMessages(msg) - case *types.ReadMessages: - return w.handleReadMessages(msg) + case *types.FlagMessages: + return w.handleFlagMessages(msg) case *types.AnsweredMessages: return w.handleAnsweredMessages(msg) case *types.CopyMessages: @@ -473,7 +473,7 @@ func (w *Worker) handleAnsweredMessages(msg *types.AnsweredMessages) error { return nil } -func (w *Worker) handleReadMessages(msg *types.ReadMessages) error { +func (w *Worker) handleFlagMessages(msg *types.FlagMessages) error { for _, uid := range msg.Uids { m, err := w.c.Message(*w.selected, uid) if err != nil { @@ -481,8 +481,9 @@ func (w *Worker) handleReadMessages(msg *types.ReadMessages) error { w.err(msg, err) continue } - if err := m.MarkRead(msg.Read); err != nil { - w.worker.Logger.Printf("could not mark message as read: %v", err) + flag := flagToMaildir[msg.Flag] + if err := m.SetOneFlag(flag, msg.Enable); err != nil { + w.worker.Logger.Printf("could change flag %v to %v on message: %v", flag, msg.Enable, err) w.err(msg, err) continue } -- cgit v1.2.3