Add labels to index format (%g)

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

2 files changed, 5 insertions, 0 deletions

diff --git a/lib/format/format.go b/lib/format/format.go
index 0cb9693..b66a180 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 9075a26..f67c49f 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
 	}