blacklight
/
aerc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FetchBodyPart doesn't need the parent body structure

This commit is contained in:
Reto Brunner 2020-05-17 11:44:38 +02:00
parent bae678e8f2
commit 13a6a3fa71
9 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/msg/forward.go
View File

@ -138,7 +138,7 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error {
// TODO: something more intelligent than fetching the 1st part
// TODO: add attachments!
store.FetchBodyPart(msg.Uid, msg.BodyStructure, []int{1}, func(reader io.Reader) {
store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) {
buf := new(bytes.Buffer)
buf.ReadFrom(reader)
original.Text = buf.String()

2
commands/msg/pipe.go
View File

@ -127,7 +127,7 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
} else if pipePart {
p := provider.SelectedMessagePart()
store := provider.Store()
store.FetchBodyPart(p.Msg.Uid, p.Msg.BodyStructure, p.Index, func(reader io.Reader) {
store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
if background {
doExec(reader)
} else {

2
commands/msg/recall.go
View File

@ -114,7 +114,7 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error {
path = []int{1}
}
store.FetchBodyPart(msgInfo.Uid, part, path, func(reader io.Reader) {
store.FetchBodyPart(msgInfo.Uid, path, func(reader io.Reader) {
header := message.Header{}
header.SetText(
"Content-Transfer-Encoding", part.Encoding)

2
commands/msg/reply.go
View File

@ -165,7 +165,7 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error {
template = aerc.Config().Templates.QuotedReply
}
store.FetchBodyPart(msg.Uid, msg.BodyStructure, []int{1}, func(reader io.Reader) {
store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) {
buf := new(bytes.Buffer)
buf.ReadFrom(reader)
original.Text = buf.String()

2
commands/msgview/open.go
View File

@ -36,7 +36,7 @@ func (Open) Execute(aerc *widgets.Aerc, args []string) error {
p := mv.SelectedMessagePart()
store := mv.Store()
store.FetchBodyPart(p.Msg.Uid, p.Msg.BodyStructure, p.Index, func(reader io.Reader) {
store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
extension := ""
// try to determine the correct extension based on mimetype
if part, err := p.Msg.BodyStructure.PartAtIndex(p.Index); err == nil {

29
commands/msgview/save.go
View File

@ -109,21 +109,20 @@ func (Save) Execute(aerc *widgets.Aerc, args []string) error {
ch := make(chan error, 1)
store := mv.Store()
store.FetchBodyPart(
pi.Msg.Uid, pi.Msg.BodyStructure, pi.Index, func(reader io.Reader) {
f, err := os.Create(path)
if err != nil {
ch <- err
return
}
defer f.Close()
_, err = io.Copy(f, reader)
if err != nil {
ch <- err
return
}
ch <- nil
})
store.FetchBodyPart(pi.Msg.Uid, pi.Index, func(reader io.Reader) {
f, err := os.Create(path)
if err != nil {
ch <- err
return
}
defer f.Close()
_, err = io.Copy(f, reader)
if err != nil {
ch <- err
return
}
ch <- nil
})
// we need to wait for the callback prior to displaying a result
go func() {

8
lib/messageview.go
View File

@ -28,8 +28,7 @@ type MessageView interface {
Store() *MessageStore
// Fetches a specific body part for this message
FetchBodyPart(parent *models.BodyStructure,
part []int, cb func(io.Reader))
FetchBodyPart(part []int, cb func(io.Reader))
PGPDetails() *openpgp.MessageDetails
}
@ -110,11 +109,10 @@ func (msv *MessageStoreView) PGPDetails() *openpgp.MessageDetails {
return msv.details
}
func (msv *MessageStoreView) FetchBodyPart(parent *models.BodyStructure,
part []int, cb func(io.Reader)) {
func (msv *MessageStoreView) FetchBodyPart(part []int, cb func(io.Reader)) {
if msv.message == nil {
msv.messageStore.FetchBodyPart(msv.messageInfo.Uid, parent, part, cb)
msv.messageStore.FetchBodyPart(msv.messageInfo.Uid, part, cb)
return
}

3
lib/msgstore.go
View File

@ -136,8 +136,7 @@ func (store *MessageStore) FetchFull(uids []uint32, cb func(*types.FullMessage))
}
}
func (store *MessageStore) FetchBodyPart(
uid uint32, parent *models.BodyStructure, part []int, cb func(io.Reader)) {
func (store *MessageStore) FetchBodyPart(uid uint32, part []int, cb func(io.Reader)) {
store.worker.PostAction(&types.FetchMessageBodyPart{
Uid: uid,

3
widgets/msgviewer.go
View File

@ -653,8 +653,7 @@ func (pv *PartViewer) Draw(ctx *ui.Context) {
return
}
if !pv.fetched {
pv.msg.FetchBodyPart(pv.msg.BodyStructure(),
pv.index, pv.SetSource)
pv.msg.FetchBodyPart(pv.index, pv.SetSource)
pv.fetched = true
}
if pv.err != nil {