Implement (most of) mailbox listing
This commit is contained in:
parent
1767e4fab5
commit
cc03f6f4c8
4 changed files with 56 additions and 3 deletions
|
@ -35,6 +35,7 @@ func NewAccountTab(conf *config.AccountConfig,
|
|||
acc.Worker.PostAction(types.Connect{}, func(msg types.WorkerMessage) {
|
||||
if _, ok := msg.(types.Ack); ok {
|
||||
acc.logger.Println("Connected.")
|
||||
acc.Worker.PostAction(types.ListDirectories{}, nil)
|
||||
} else {
|
||||
acc.logger.Println("Connection failed.")
|
||||
}
|
||||
|
@ -73,6 +74,7 @@ func (acc *AccountTab) HandleMessage(msg types.WorkerMessage) {
|
|||
msg = acc.Worker.ProcessMessage(msg)
|
||||
switch msg.(type) {
|
||||
case types.Ack:
|
||||
case types.Unsupported:
|
||||
// no-op
|
||||
case types.ApproveCertificate:
|
||||
// TODO: Ask the user
|
||||
|
|
37
worker/imap/list.go
Normal file
37
worker/imap/list.go
Normal 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
|
@ -78,6 +78,7 @@ func (w *IMAPWorker) verifyPeerCert(msg types.WorkerMessage) func(
|
|||
func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
|
||||
switch msg := msg.(type) {
|
||||
case types.Ping:
|
||||
case types.Unsupported:
|
||||
// No-op
|
||||
case types.Configure:
|
||||
u, err := url.Parse(msg.Config.Source)
|
||||
|
@ -145,9 +146,8 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
|
|||
|
||||
c.Updates = w.updates
|
||||
w.client = &imapClient{c, idle.NewClient(c)}
|
||||
|
||||
// TODO: don't idle right away
|
||||
go w.client.IdleWithFallback(nil, 0)
|
||||
case types.ListDirectories:
|
||||
w.handleListDirectories(msg)
|
||||
default:
|
||||
return errUnsupported
|
||||
}
|
||||
|
|
|
@ -26,10 +26,15 @@ func (m Message) InResponseTo() WorkerMessage {
|
|||
|
||||
// Meta-messages
|
||||
|
||||
// TODO: Figure out a nice way of merging Ack and Done
|
||||
type Ack struct {
|
||||
Message
|
||||
}
|
||||
|
||||
type Done struct {
|
||||
Message
|
||||
}
|
||||
|
||||
type Error struct {
|
||||
Message
|
||||
Error error
|
||||
|
@ -58,8 +63,17 @@ type Disconnect struct {
|
|||
Message
|
||||
}
|
||||
|
||||
type ListDirectories struct {
|
||||
Message
|
||||
}
|
||||
|
||||
// Messages
|
||||
|
||||
type Directory struct {
|
||||
Message
|
||||
Name *string
|
||||
}
|
||||
|
||||
// Respond with an Ack to approve or Disconnect to reject
|
||||
type ApproveCertificate struct {
|
||||
Message
|
||||
|
|
Loading…
Reference in a new issue