Add labels to index format (%g)

Exposes the notmuch tags accordingly, stubs it for the maildir worker.

7 files changed, 22 insertions, 0 deletions

diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 1d6294ec..5dac4ac7 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -59,6 +59,8 @@ These options are configured in the *[ui]* section of aerc.conf.
 |  %F
 :  author name, or recipient name if the message is from you.
    The adderss is shown if no name part.
+|  %g
+:  message labels (for example notmuch tags)
 |  %i
 :  message id
 |  %n
diff --git a/lib/format/format.go b/lib/format/format.go
index 0cb96934..b66a1802 100644
--- a/lib/format/format.go
+++ b/lib/format/format.go
@@ -138,6 +138,10 @@ func ParseMessageFormat(
 			retval = append(retval, 's')
 			args = append(args, val)
 
+		case 'g':
+			retval = append(retval, 's')
+			args = append(args, strings.Join(msg.Labels, ", "))
+
 		case 'i':
 			retval = append(retval, 's')
 			args = append(args, msg.Envelope.MessageId)
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 9075a266..f67c49f2 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -149,6 +149,7 @@ func merge(to *models.MessageInfo, from *models.MessageInfo) {
 		to.Envelope = from.Envelope
 	}
 	to.Flags = from.Flags
+	to.Labels = from.Labels
 	if from.Size != 0 {
 		to.Size = from.Size
 	}
diff --git a/models/models.go b/models/models.go
index 28d256c4..fa3baf2a 100644
--- a/models/models.go
+++ b/models/models.go
@@ -57,6 +57,7 @@ type MessageInfo struct {
 	BodyStructure *BodyStructure
 	Envelope      *Envelope
 	Flags         []Flag
+	Labels        []string
 	InternalDate  time.Time
 	RFC822Headers *mail.Header
 	Size          uint32
diff --git a/worker/lib/parse.go b/worker/lib/parse.go
index c3a43ca5..eed39cb9 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 dc5646b2..45b1ca62 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 c51e2e9c..ec1adb9b 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