blallo/papero
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor imaputils

Browse source
This commit is contained in:
Blallo 2021-04-05 19:49:39 +02:00
parent b3157dcd99
commit ab498f7091
No known key found for this signature in database
GPG key ID: 0CBE577C9B72DC3F
4 changed files with 119 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
imaputils/info.go → imaputils/fetch_messages.go
View file

@ -7,87 +7,6 @@ import (
"github.com/emersion/go-imap"
)
func ListMailboxes(conf *config.AccountData, debug bool) ([]*imap.MailboxInfo, error) {
var mailboxes []*imap.MailboxInfo
conn := NewConnection(conf)
err := conn.Start(debug)
if err != nil {
return mailboxes, err
}
defer conn.Close()
mboxChan := make(chan *imap.MailboxInfo, 10)
done := make(chan error, 1)
go func() {
done <- conn.client.List("", "*", mboxChan)
}()
for m := range mboxChan {
mailboxes = append(mailboxes, m)
}
if err := <-done; err != nil {
return mailboxes, err
}
return mailboxes, nil
}
type ListMessagesOpts struct {
Mailbox string
Limit uint32
}
func ListMessages(conf *config.AccountData, opts *ListMessagesOpts, debug bool) ([]*imap.Message, error) {
var messages []*imap.Message
conn := NewConnection(conf)
err := conn.Start(debug)
if err != nil {
return messages, err
}
defer conn.Close()
mbox, err := conn.client.Select(opts.Mailbox, true)
if err != nil {
return messages, err
}
return getMessages(mbox, conn, opts.Limit)
}
func getMessages(mbox *imap.MailboxStatus, conn *IMAPConnection, limit uint32) ([]*imap.Message, error) {
var start uint32
var msgs []*imap.Message
seqset := new(imap.SeqSet)
messages := make(chan *imap.Message, 10)
done := make(chan error, 1)
switch {
case limit == 0:
start = 1
case mbox.Messages > limit:
start = mbox.Messages - limit + 1
default:
start = 1
}
seqset.AddRange(start, mbox.Messages)
go func() {
done <- conn.client.Fetch(seqset, []imap.FetchItem{imap.FetchEnvelope, imap.FetchFlags}, messages)
}()
for msg := range messages {
msgs = append(msgs, msg)
}
if err := <-done; err != nil {
return []*imap.Message{}, err
}
return msgs, nil
}
type FetchOpts struct {
Mailbox string
IdList []uint32
@ -109,18 +28,23 @@ func (o *FetchOpts) String() string {
}
func FetchMessages(conf *config.AccountData, opts *FetchOpts, debug bool) ([]*imap.Message, error) {
var messages []*imap.Message
var empty []*imap.Message
conn := NewConnection(conf)
err := conn.Start(debug)
if err != nil {
return messages, err
return empty, err
}
defer conn.Close()
return FetchMessagesInSession(conn, opts)
}
func FetchMessagesInSession(conn *IMAPConnection, opts *FetchOpts) ([]*imap.Message, error) {
var empty []*imap.Message
mbox, err := conn.client.Select(opts.Mailbox, true)
if err != nil {
return messages, err
return empty, err
}
return fetchMessage(mbox, conn, opts)

38
imaputils/list_mailboxes.go Normal file
View file

@ -0,0 +1,38 @@
package imaputils
import (
"git.sr.ht/~blallo/papero/config"
"github.com/emersion/go-imap"
)
func ListMailboxes(conf *config.AccountData, debug bool) ([]*imap.MailboxInfo, error) {
var empty []*imap.MailboxInfo
conn := NewConnection(conf)
err := conn.Start(debug)
if err != nil {
return empty, err
}
defer conn.Close()
return ListMailboxesInSession(conn)
}
func ListMailboxesInSession(conn *IMAPConnection) ([]*imap.MailboxInfo, error) {
var mailboxes []*imap.MailboxInfo
mboxChan := make(chan *imap.MailboxInfo, 10)
done := make(chan error, 1)
go func() {
done <- conn.client.List("", "*", mboxChan)
}()
for m := range mboxChan {
mailboxes = append(mailboxes, m)
}
if err := <-done; err != nil {
return mailboxes, err
}
return mailboxes, nil
}

65
imaputils/list_messages.go Normal file
View file

@ -0,0 +1,65 @@
package imaputils
import (
"git.sr.ht/~blallo/papero/config"
"github.com/emersion/go-imap"
)
type ListMessagesOpts struct {
Mailbox string
Limit uint32
}
func ListMessages(conf *config.AccountData, opts *ListMessagesOpts, debug bool) ([]*imap.Message, error) {
var empty []*imap.Message
conn := NewConnection(conf)
err := conn.Start(debug)
if err != nil {
return empty, err
}
defer conn.Close()
return ListMessagesInSession(conn, opts)
}
func ListMessagesInSession(conn *IMAPConnection, opts *ListMessagesOpts) ([]*imap.Message, error) {
var messages []*imap.Message
mbox, err := conn.client.Select(opts.Mailbox, true)
if err != nil {
return messages, err
}
return getMessages(mbox, conn, opts.Limit)
}
func getMessages(mbox *imap.MailboxStatus, conn *IMAPConnection, limit uint32) ([]*imap.Message, error) {
var start uint32
var msgs []*imap.Message
seqset := new(imap.SeqSet)
messages := make(chan *imap.Message, 10)
done := make(chan error, 1)
switch {
case limit == 0:
start = 1
case mbox.Messages > limit:
start = mbox.Messages - limit + 1
default:
start = 1
}
seqset.AddRange(start, mbox.Messages)
go func() {
done <- conn.client.Fetch(seqset, []imap.FetchItem{imap.FetchEnvelope, imap.FetchFlags}, messages)
}()
for msg := range messages {
msgs = append(msgs, msg)
}
if err := <-done; err != nil {
return []*imap.Message{}, err
}
return msgs, nil
}

8
imaputils/modify.go → imaputils/set_flags.go
View file

@ -206,6 +206,14 @@ func SetFlags(conf *config.AccountData, opts *SetFlagsOpts) error {
}
defer conn.Close()
return SetFlagsInSession(conn, opts)
}
// SetFlagsInSession does the same as SetFlags, but has to be provided
// with a started *IMAPConnection.
func SetFlagsInSession(conn *IMAPConnection, opts *SetFlagsOpts) error {
var err error
_, err = conn.client.Select(opts.Mailbox, false)
if err != nil {
return err