2019-03-31 18:14:37 +02:00
|
|
|
package account
|
|
|
|
|
|
|
|
import (
|
|
|
|
"errors"
|
|
|
|
|
2020-03-03 22:20:07 +01:00
|
|
|
"git.sr.ht/~sircmpwn/aerc/lib"
|
2019-05-18 02:57:10 +02:00
|
|
|
"git.sr.ht/~sircmpwn/aerc/widgets"
|
2019-03-31 18:14:37 +02:00
|
|
|
)
|
|
|
|
|
2019-06-27 19:33:11 +02:00
|
|
|
type ViewMessage struct{}
|
|
|
|
|
2019-03-31 18:14:37 +02:00
|
|
|
func init() {
|
2019-06-27 19:33:11 +02:00
|
|
|
register(ViewMessage{})
|
|
|
|
}
|
|
|
|
|
2019-09-03 21:34:03 +02:00
|
|
|
func (ViewMessage) Aliases() []string {
|
2019-06-27 19:33:11 +02:00
|
|
|
return []string{"view-message", "view"}
|
|
|
|
}
|
|
|
|
|
2019-09-03 21:34:03 +02:00
|
|
|
func (ViewMessage) Complete(aerc *widgets.Aerc, args []string) []string {
|
2019-06-27 19:33:11 +02:00
|
|
|
return nil
|
2019-03-31 18:14:37 +02:00
|
|
|
}
|
|
|
|
|
2019-09-03 21:34:03 +02:00
|
|
|
func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error {
|
2019-03-31 18:14:37 +02:00
|
|
|
if len(args) != 1 {
|
|
|
|
return errors.New("Usage: view-message")
|
|
|
|
}
|
|
|
|
acct := aerc.SelectedAccount()
|
2019-04-09 05:14:14 +02:00
|
|
|
if acct.Messages().Empty() {
|
|
|
|
return nil
|
|
|
|
}
|
2019-03-31 18:14:37 +02:00
|
|
|
store := acct.Messages().Store()
|
|
|
|
msg := acct.Messages().Selected()
|
2019-11-28 19:20:45 +01:00
|
|
|
if msg == nil {
|
|
|
|
return nil
|
|
|
|
}
|
commands/account: Disable :view for deleted msgs
Allowing the user to view deleted messages creates all sorts of race
conditions. The most devious race condition is pv.source can be set to a
nil while another PartViewer is still running a goroutine in
attemptCopy.
Here is a trace when this happens.
goroutine 76 [running]: io.copyBuffer(0x7f8ad02641d0, 0xc00040f590, 0x0,
0x0, 0xc0007cc000, 0x8000, 0x8000, 0x0, 0x0, 0x8b3d60)
/usr/lib/go/src/io/io.go:402 +0x101 io.Copy(...)
/usr/lib/go/src/io/io.go:364
git.sr.ht/~sircmpwn/aerc/widgets.(*PartViewer).attemptCopy.func4(0xc00017efd0,
0xc0004da7c0) /home/keur/repos/aerc/widgets/msgviewer.go:576 +0x611
created by git.sr.ht/~sircmpwn/aerc/widgets.(*PartViewer).attemptCopy
/home/keur/repos/aerc/widgets/msgviewer.go:544 +0x144
We could add a guard in store.FetchBodyPart to only call the callback
when msg.Part.Reader != nil, but we still get a hanging pager. Therefore
it seems more reasonable to disable this completely.
Signed-off-by: Kevin Kuehler <keur@xcf.berkeley.edu>
2019-11-11 00:22:35 +01:00
|
|
|
_, deleted := store.Deleted[msg.Uid]
|
2019-11-28 19:20:45 +01:00
|
|
|
if deleted {
|
2019-04-09 05:14:14 +02:00
|
|
|
return nil
|
|
|
|
}
|
2020-03-03 22:20:07 +01:00
|
|
|
lib.NewMessageStoreView(msg, store, aerc.DecryptKeys,
|
2020-05-19 13:06:46 +02:00
|
|
|
func(view lib.MessageView, err error) {
|
|
|
|
if err != nil {
|
2020-05-27 07:52:13 +02:00
|
|
|
aerc.PushError(err.Error())
|
2020-05-19 13:06:46 +02:00
|
|
|
return
|
|
|
|
}
|
2020-03-03 22:20:07 +01:00
|
|
|
viewer := widgets.NewMessageViewer(acct, aerc.Config(), view)
|
|
|
|
aerc.NewTab(viewer, msg.Envelope.Subject)
|
|
|
|
})
|
2019-03-31 18:14:37 +02:00
|
|
|
return nil
|
|
|
|
}
|