From 91a75cd98b705bd5e6689b154ecaca0e7c81630e Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 26 Jun 2019 20:50:27 -0400 Subject: Implement :search, :next-result, :prev-result --- commands/account/next-result.go | 41 +++++++++++++++++++++++++++++++ commands/account/search.go | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 commands/account/next-result.go create mode 100644 commands/account/search.go (limited to 'commands/account') diff --git a/commands/account/next-result.go b/commands/account/next-result.go new file mode 100644 index 0000000..d89de56 --- /dev/null +++ b/commands/account/next-result.go @@ -0,0 +1,41 @@ +package account + +import ( + "errors" + "fmt" + + "git.sr.ht/~sircmpwn/aerc/widgets" +) + +func init() { + register("next-result", NextPrevResult) + register("prev-result", NextPrevResult) +} + +func nextPrevResultUsage(cmd string) error { + return errors.New(fmt.Sprintf("Usage: %s [[%%]]", cmd)) +} + +func NextPrevResult(aerc *widgets.Aerc, args []string) error { + if len(args) > 1 { + return nextPrevResultUsage(args[0]) + } + acct := aerc.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + if args[0] == "prev-result" { + store := acct.Store() + if store != nil { + store.PrevResult() + } + acct.Messages().Scroll() + } else { + store := acct.Store() + if store != nil { + store.NextResult() + } + acct.Messages().Scroll() + } + return nil +} diff --git a/commands/account/search.go b/commands/account/search.go new file mode 100644 index 0000000..513ad43 --- /dev/null +++ b/commands/account/search.go @@ -0,0 +1,54 @@ +package account + +import ( + "errors" + + "git.sr.ht/~sircmpwn/getopt" + "github.com/emersion/go-imap" + + "git.sr.ht/~sircmpwn/aerc/widgets" +) + +func init() { + register("search", SearchFilter) + //register("filter", SearchFilter) // TODO +} + +func SearchFilter(aerc *widgets.Aerc, args []string) error { + var ( + criteria *imap.SearchCriteria = imap.NewSearchCriteria() + ) + + opts, optind, err := getopt.Getopts(args, "ruH:") + if err != nil { + return err + } + for _, opt := range opts { + switch opt.Option { + case 'r': + criteria.WithFlags = append(criteria.WithFlags, imap.SeenFlag) + case 'u': + criteria.WithoutFlags = append(criteria.WithoutFlags, imap.SeenFlag) + case 'H': + // TODO + } + } + for _, arg := range args[optind:] { + criteria.Header.Add("Subject", arg) + } + + acct := aerc.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + store := acct.Store() + aerc.SetStatus("Searching...") + store.Search(criteria, func(uids []uint32) { + aerc.SetStatus("Search complete.") + acct.Logger().Printf("Search results: %v", uids) + store.ApplySearch(uids) + // TODO: Remove when stores have multiple OnUpdate handlers + acct.Messages().Scroll() + }) + return nil +} -- cgit v1.2.3