From 63391b7dca09e3f2cf3c4ff903592d23fe8f56a3 Mon Sep 17 00:00:00 2001 From: Reto Brunner Date: Mon, 23 Dec 2019 12:51:58 +0100 Subject: Add labels to index format (%g) Exposes the notmuch tags accordingly, stubs it for the maildir worker. --- worker/lib/parse.go | 6 ++++++ worker/maildir/message.go | 4 ++++ worker/notmuch/message.go | 4 ++++ 3 files changed, 14 insertions(+) (limited to 'worker') diff --git a/worker/lib/parse.go b/worker/lib/parse.go index c3a43ca..eed39cb 100644 --- a/worker/lib/parse.go +++ b/worker/lib/parse.go @@ -207,6 +207,7 @@ func parseAddressList(h *mail.Header, key string) ([]*models.Address, error) { type RawMessage interface { NewReader() (io.Reader, error) ModelFlags() ([]models.Flag, error) + Labels() ([]string, error) UID() uint32 } @@ -233,10 +234,15 @@ func MessageInfo(raw RawMessage) (*models.MessageInfo, error) { if err != nil { return nil, err } + labels, err := raw.Labels() + if err != nil { + return nil, err + } return &models.MessageInfo{ BodyStructure: bs, Envelope: env, Flags: flags, + Labels: labels, InternalDate: env.Date, RFC822Headers: &mail.Header{msg.Header}, Size: 0, diff --git a/worker/maildir/message.go b/worker/maildir/message.go index dc5646b..45b1ca6 100644 --- a/worker/maildir/message.go +++ b/worker/maildir/message.go @@ -119,3 +119,7 @@ func translateFlags(maildirFlags []maildir.Flag) []models.Flag { func (m Message) UID() uint32 { return m.uid } + +func (m Message) Labels() ([]string, error) { + return nil, nil +} diff --git a/worker/notmuch/message.go b/worker/notmuch/message.go index c51e2e9..ec1adb9 100644 --- a/worker/notmuch/message.go +++ b/worker/notmuch/message.go @@ -102,6 +102,10 @@ func (m *Message) Tags() ([]string, error) { return m.db.MsgTags(m.key) } +func (m *Message) Labels() ([]string, error) { + return m.Tags() +} + func (m *Message) ModelFlags() ([]models.Flag, error) { var flags []models.Flag seen := true -- cgit 1.4.1-2-gfad0