Implement (most of) mailbox listing

This commit is contained in:
Drew DeVault 2018-02-01 19:34:08 -05:00
parent 1767e4fab5
commit cc03f6f4c8
4 changed files with 56 additions and 3 deletions

View file

@ -35,6 +35,7 @@ func NewAccountTab(conf *config.AccountConfig,
acc.Worker.PostAction(types.Connect{}, func(msg types.WorkerMessage) { acc.Worker.PostAction(types.Connect{}, func(msg types.WorkerMessage) {
if _, ok := msg.(types.Ack); ok { if _, ok := msg.(types.Ack); ok {
acc.logger.Println("Connected.") acc.logger.Println("Connected.")
acc.Worker.PostAction(types.ListDirectories{}, nil)
} else { } else {
acc.logger.Println("Connection failed.") acc.logger.Println("Connection failed.")
} }
@ -73,6 +74,7 @@ func (acc *AccountTab) HandleMessage(msg types.WorkerMessage) {
msg = acc.Worker.ProcessMessage(msg) msg = acc.Worker.ProcessMessage(msg)
switch msg.(type) { switch msg.(type) {
case types.Ack: case types.Ack:
case types.Unsupported:
// no-op // no-op
case types.ApproveCertificate: case types.ApproveCertificate:
// TODO: Ask the user // TODO: Ask the user

37
worker/imap/list.go Normal file
View file

@ -0,0 +1,37 @@
package imap
import (
"github.com/emersion/go-imap"
"git.sr.ht/~sircmpwn/aerc2/worker/types"
)
func (imapw *IMAPWorker) handleListDirectories(msg types.ListDirectories) {
mailboxes := make(chan *imap.MailboxInfo)
done := make(chan error, 1)
imapw.worker.Logger.Println("Listing mailboxes")
go func() {
done <- imapw.client.List("", "*", mailboxes)
}()
go func() {
for {
select {
case err := <-done:
if err != nil {
imapw.worker.PostMessage(types.Error{
Message: types.RespondTo(msg),
Error: err,
}, nil)
} else {
imapw.worker.PostMessage(
types.Done{types.RespondTo(msg)}, nil)
}
return
case mbox := <-mailboxes:
if mbox != nil {
imapw.worker.Logger.Printf("%v\n", mbox.Name)
}
}
}
}()
}

View file

@ -78,6 +78,7 @@ func (w *IMAPWorker) verifyPeerCert(msg types.WorkerMessage) func(
func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error { func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
switch msg := msg.(type) { switch msg := msg.(type) {
case types.Ping: case types.Ping:
case types.Unsupported:
// No-op // No-op
case types.Configure: case types.Configure:
u, err := url.Parse(msg.Config.Source) u, err := url.Parse(msg.Config.Source)
@ -145,9 +146,8 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
c.Updates = w.updates c.Updates = w.updates
w.client = &imapClient{c, idle.NewClient(c)} w.client = &imapClient{c, idle.NewClient(c)}
case types.ListDirectories:
// TODO: don't idle right away w.handleListDirectories(msg)
go w.client.IdleWithFallback(nil, 0)
default: default:
return errUnsupported return errUnsupported
} }

View file

@ -26,10 +26,15 @@ func (m Message) InResponseTo() WorkerMessage {
// Meta-messages // Meta-messages
// TODO: Figure out a nice way of merging Ack and Done
type Ack struct { type Ack struct {
Message Message
} }
type Done struct {
Message
}
type Error struct { type Error struct {
Message Message
Error error Error error
@ -58,8 +63,17 @@ type Disconnect struct {
Message Message
} }
type ListDirectories struct {
Message
}
// Messages // Messages
type Directory struct {
Message
Name *string
}
// Respond with an Ack to approve or Disconnect to reject // Respond with an Ack to approve or Disconnect to reject
type ApproveCertificate struct { type ApproveCertificate struct {
Message Message