From 32381592fc335bc26a06cee847df926b9f6e6c06 Mon Sep 17 00:00:00 2001 From: Jeffas Date: Mon, 9 Sep 2019 21:37:45 +0100 Subject: Add new search behaviour for imap This patch adds search behaviour to allow searching in the body of the messages, the entire text (body + header), and searching just the from header. --- worker/imap/search.go | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'worker') diff --git a/worker/imap/search.go b/worker/imap/search.go index 4decf1b5..939516dd 100644 --- a/worker/imap/search.go +++ b/worker/imap/search.go @@ -1,17 +1,20 @@ package imap import ( - "git.sr.ht/~sircmpwn/getopt" "github.com/emersion/go-imap" + + "git.sr.ht/~sircmpwn/getopt" ) func parseSearch(args []string) (*imap.SearchCriteria, error) { criteria := imap.NewSearchCriteria() - opts, optind, err := getopt.Getopts(args, "ruH:") + opts, optind, err := getopt.Getopts(args, "rubtH:f:") if err != nil { return nil, err } + body := false + text := false for _, opt := range opts { switch opt.Option { case 'r': @@ -20,10 +23,22 @@ func parseSearch(args []string) (*imap.SearchCriteria, error) { criteria.WithoutFlags = append(criteria.WithoutFlags, imap.SeenFlag) case 'H': // TODO + case 'f': + criteria.Header.Add("From", opt.Value) + case 'b': + body = true + case 't': + text = true } } - for _, arg := range args[optind:] { - criteria.Header.Add("Subject", arg) + if text { + criteria.Text = args[optind:] + } else if body { + criteria.Body = args[optind:] + } else { + for _, arg := range args[optind:] { + criteria.Header.Add("Subject", arg) + } } return criteria, nil } -- cgit