aboutsummaryrefslogtreecommitdiffstats
path: root/worker
diff options
context:
space:
mode:
authorReto Brunner <reto@labrat.space>2019-08-28 06:39:07 +0200
committerDrew DeVault <sir@cmpwn.com>2019-08-29 08:44:10 +0900
commit94b9d557dee0fd13853b1883cc2730c5cbdbcd3f (patch)
tree8a0040b60df9ab4fa3d7f9d137d126a04fd5943b /worker
parentac99d9ed62644cf0259bdd79481b28c3fbcef650 (diff)
downloadaerc-94b9d557dee0fd13853b1883cc2730c5cbdbcd3f.tar.gz
extract search criteria parsing into the backends
Diffstat (limited to 'worker')
-rw-r--r--worker/imap/list.go28
-rw-r--r--worker/imap/search.go29
-rw-r--r--worker/types/messages.go4
3 files changed, 50 insertions, 11 deletions
diff --git a/worker/imap/list.go b/worker/imap/list.go
index 42be50e4..e69fc076 100644
--- a/worker/imap/list.go
+++ b/worker/imap/list.go
@@ -52,17 +52,29 @@ func canOpen(mbox *imap.MailboxInfo) bool {
}
func (imapw *IMAPWorker) handleSearchDirectory(msg *types.SearchDirectory) {
- imapw.worker.Logger.Println("Executing search")
-
- if uids, err := imapw.client.UidSearch(msg.Criteria); err != nil {
+ emitError := func(err error) {
imapw.worker.PostMessage(&types.Error{
Message: types.RespondTo(msg),
Error: err,
}, nil)
- } else {
- imapw.worker.PostMessage(&types.SearchResults{
- Message: types.RespondTo(msg),
- Uids: uids,
- }, nil)
}
+
+ imapw.worker.Logger.Println("Executing search")
+ criteria, err := parseSearch(msg.Argv)
+ if err != nil {
+ emitError(err)
+ return
+ }
+
+ uids, err := imapw.client.UidSearch(criteria)
+ if err != nil {
+ emitError(err)
+ return
+ }
+
+ imapw.worker.PostMessage(&types.SearchResults{
+ Message: types.RespondTo(msg),
+ Uids: uids,
+ }, nil)
+
}
diff --git a/worker/imap/search.go b/worker/imap/search.go
new file mode 100644
index 00000000..4decf1b5
--- /dev/null
+++ b/worker/imap/search.go
@@ -0,0 +1,29 @@
+package imap
+
+import (
+ "git.sr.ht/~sircmpwn/getopt"
+ "github.com/emersion/go-imap"
+)
+
+func parseSearch(args []string) (*imap.SearchCriteria, error) {
+ criteria := imap.NewSearchCriteria()
+
+ opts, optind, err := getopt.Getopts(args, "ruH:")
+ if err != nil {
+ return nil, 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)
+ }
+ return criteria, nil
+}
diff --git a/worker/types/messages.go b/worker/types/messages.go
index 34a1e5cc..7ab94e08 100644
--- a/worker/types/messages.go
+++ b/worker/types/messages.go
@@ -4,8 +4,6 @@ import (
"io"
"time"
- "github.com/emersion/go-imap"
-
"git.sr.ht/~sircmpwn/aerc/config"
"git.sr.ht/~sircmpwn/aerc/models"
)
@@ -84,7 +82,7 @@ type FetchDirectoryContents struct {
type SearchDirectory struct {
Message
- Criteria *imap.SearchCriteria
+ Argv []string
}
type CreateDirectory struct {