aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--commands/account/pipe.go2
-rw-r--r--lib/msgstore.go4
-rw-r--r--worker/imap/fetch.go20
-rw-r--r--worker/imap/worker.go4
-rw-r--r--worker/types/messages.go4
5 files changed, 17 insertions, 17 deletions
diff --git a/commands/account/pipe.go b/commands/account/pipe.go
index 18130eb7..bff15962 100644
--- a/commands/account/pipe.go
+++ b/commands/account/pipe.go
@@ -22,7 +22,7 @@ func Pipe(aerc *widgets.Aerc, args []string) error {
acct := aerc.SelectedAccount()
store := acct.Messages().Store()
msg := acct.Messages().Selected()
- store.FetchBodies([]uint32{msg.Uid}, func(reader io.Reader) {
+ store.FetchFull([]uint32{msg.Uid}, func(reader io.Reader) {
cmd := exec.Command(args[1], args[2:]...)
pipe, err := cmd.StdinPipe()
if err != nil {
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 2169b2ee..2e59be72 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -66,7 +66,7 @@ func (store *MessageStore) FetchHeaders(uids []uint32,
}
}
-func (store *MessageStore) FetchBodies(uids []uint32, cb func(io.Reader)) {
+func (store *MessageStore) FetchFull(uids []uint32, cb func(io.Reader)) {
// TODO: this could be optimized by pre-allocating toFetch and trimming it
// at the end. In practice we expect to get most messages back in one frame.
var toFetch imap.SeqSet
@@ -84,7 +84,7 @@ func (store *MessageStore) FetchBodies(uids []uint32, cb func(io.Reader)) {
}
}
if !toFetch.Empty() {
- store.worker.PostAction(&types.FetchMessageBodies{Uids: toFetch}, nil)
+ store.worker.PostAction(&types.FetchFullMessages{Uids: toFetch}, nil)
}
}
diff --git a/worker/imap/fetch.go b/worker/imap/fetch.go
index feae462b..89c0d991 100644
--- a/worker/imap/fetch.go
+++ b/worker/imap/fetch.go
@@ -21,15 +21,6 @@ func (imapw *IMAPWorker) handleFetchMessageHeaders(
imapw.handleFetchMessages(msg, &msg.Uids, items)
}
-func (imapw *IMAPWorker) handleFetchMessageBodies(
- msg *types.FetchMessageBodies) {
-
- imapw.worker.Logger.Printf("Fetching message bodies")
- section := &imap.BodySectionName{}
- items := []imap.FetchItem{section.FetchItem()}
- imapw.handleFetchMessages(msg, &msg.Uids, items)
-}
-
func (imapw *IMAPWorker) handleFetchMessageBodyPart(
msg *types.FetchMessageBodyPart) {
@@ -42,6 +33,15 @@ func (imapw *IMAPWorker) handleFetchMessageBodyPart(
imapw.handleFetchMessages(msg, &uids, items)
}
+func (imapw *IMAPWorker) handleFetchFullMessages(
+ msg *types.FetchFullMessages) {
+
+ imapw.worker.Logger.Printf("Fetching full messages")
+ section := &imap.BodySectionName{}
+ items := []imap.FetchItem{section.FetchItem()}
+ imapw.handleFetchMessages(msg, &msg.Uids, items)
+}
+
func (imapw *IMAPWorker) handleFetchMessages(
msg types.WorkerMessage, uids *imap.SeqSet, items []imap.FetchItem) {
@@ -64,7 +64,7 @@ func (imapw *IMAPWorker) handleFetchMessages(
InternalDate: _msg.InternalDate,
Uid: _msg.Uid,
}, nil)
- case *types.FetchMessageBodies:
+ case *types.FetchFullMessages:
reader := _msg.GetBody(section)
imapw.worker.PostMessage(&types.MessageBody{
Reader: reader,
diff --git a/worker/imap/worker.go b/worker/imap/worker.go
index a11d82bb..4354ab9e 100644
--- a/worker/imap/worker.go
+++ b/worker/imap/worker.go
@@ -158,10 +158,10 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
w.handleFetchDirectoryContents(msg)
case *types.FetchMessageHeaders:
w.handleFetchMessageHeaders(msg)
- case *types.FetchMessageBodies:
- w.handleFetchMessageBodies(msg)
case *types.FetchMessageBodyPart:
w.handleFetchMessageBodyPart(msg)
+ case *types.FetchFullMessages:
+ w.handleFetchFullMessages(msg)
case *types.DeleteMessages:
w.handleDeleteMessages(msg)
default:
diff --git a/worker/types/messages.go b/worker/types/messages.go
index 803bb98f..b17d53d4 100644
--- a/worker/types/messages.go
+++ b/worker/types/messages.go
@@ -81,7 +81,7 @@ type FetchMessageHeaders struct {
Uids imap.SeqSet
}
-type FetchMessageBodies struct {
+type FetchFullMessages struct {
Message
Uids imap.SeqSet
}
@@ -134,7 +134,7 @@ type MessageInfo struct {
Uid uint32
}
-type MessageBody struct {
+type FullMessage struct {
Message
Reader io.Reader
Uid uint32