From 753adb90692e4821f8caea1d5d86cd69e312efa7 Mon Sep 17 00:00:00 2001 From: Kevin Kuehler Date: Sat, 1 Jun 2019 22:15:04 -0700 Subject: [PATCH] widget: Add ProvidesMessage interface Consists of 3 functions * Store: Access to MessageStore type * SelectedAccount: Access to Account widget that the target widget belongs to * SelectedMessage: Current message (selected in msglist or the one we are viewing) Signed-off-by: Kevin Kuehler --- aerc.go | 3 +++ commands/account/view.go | 2 +- commands/{account => msg}/copy.go | 9 +++++---- commands/{account => msg}/delete.go | 14 ++++++++++---- commands/{account => msg}/move.go | 13 +++++++++---- commands/msg/msg.go | 16 ++++++++++++++++ commands/{account => msg}/reply.go | 12 ++++++++---- widgets/account.go | 12 ++++++++++++ widgets/msgviewer.go | 16 +++++++++++++++- widgets/providesmessage.go | 14 ++++++++++++++ 10 files changed, 93 insertions(+), 18 deletions(-) rename commands/{account => msg}/copy.go (81%) rename commands/{account => msg}/delete.go (75%) rename commands/{account => msg}/move.go (74%) create mode 100644 commands/msg/msg.go rename commands/{account => msg}/reply.go (96%) create mode 100644 widgets/providesmessage.go diff --git a/aerc.go b/aerc.go index 22df069..ffce931 100644 --- a/aerc.go +++ b/aerc.go @@ -13,6 +13,7 @@ import ( "git.sr.ht/~sircmpwn/aerc/commands" "git.sr.ht/~sircmpwn/aerc/commands/account" "git.sr.ht/~sircmpwn/aerc/commands/compose" + "git.sr.ht/~sircmpwn/aerc/commands/msg" "git.sr.ht/~sircmpwn/aerc/commands/msgview" "git.sr.ht/~sircmpwn/aerc/commands/terminal" "git.sr.ht/~sircmpwn/aerc/config" @@ -25,6 +26,7 @@ func getCommands(selected libui.Drawable) []*commands.Commands { case *widgets.AccountView: return []*commands.Commands{ account.AccountCommands, + msg.MessageCommands, commands.GlobalCommands, } case *widgets.Composer: @@ -35,6 +37,7 @@ func getCommands(selected libui.Drawable) []*commands.Commands { case *widgets.MessageViewer: return []*commands.Commands{ msgview.MessageViewCommands, + msg.MessageCommands, commands.GlobalCommands, } case *widgets.Terminal: diff --git a/commands/account/view.go b/commands/account/view.go index 40abec3..f7f3ec6 100644 --- a/commands/account/view.go +++ b/commands/account/view.go @@ -24,7 +24,7 @@ func ViewMessage(aerc *widgets.Aerc, args []string) error { if msg == nil { return nil } - viewer := widgets.NewMessageViewer(aerc.Config(), store, msg) + viewer := widgets.NewMessageViewer(acct, aerc.Config(), store, msg) aerc.NewTab(viewer, msg.Envelope.Subject) return nil } diff --git a/commands/account/copy.go b/commands/msg/copy.go similarity index 81% rename from commands/account/copy.go rename to commands/msg/copy.go index da26fec..57c93a3 100644 --- a/commands/account/copy.go +++ b/commands/msg/copy.go @@ -1,4 +1,4 @@ -package account +package msg import ( "errors" @@ -19,12 +19,13 @@ func Copy(aerc *widgets.Aerc, args []string) error { if len(args) != 2 { return errors.New("Usage: mv ") } - acct := aerc.SelectedAccount() + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() if acct == nil { return errors.New("No account selected") } - msg := acct.Messages().Selected() - store := acct.Messages().Store() + msg := widget.SelectedMessage() + store := widget.Store() store.Copy([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { switch msg := msg.(type) { case *types.Done: diff --git a/commands/account/delete.go b/commands/msg/delete.go similarity index 75% rename from commands/account/delete.go rename to commands/msg/delete.go index 65d6eb9..082dbe3 100644 --- a/commands/account/delete.go +++ b/commands/msg/delete.go @@ -1,4 +1,4 @@ -package account +package msg import ( "errors" @@ -19,12 +19,18 @@ func DeleteMessage(aerc *widgets.Aerc, args []string) error { if len(args) != 1 { return errors.New("Usage: :delete") } - acct := aerc.SelectedAccount() + + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() if acct == nil { return errors.New("No account selected") } - store := acct.Messages().Store() - msg := acct.Messages().Selected() + store := widget.Store() + msg := widget.SelectedMessage() + _, isMsgView := widget.(*widgets.MessageViewer) + if isMsgView { + aerc.RemoveTab(widget) + } acct.Messages().Next() store.Delete([]uint32{msg.Uid}, func(msg types.WorkerMessage) { switch msg := msg.(type) { diff --git a/commands/account/move.go b/commands/msg/move.go similarity index 74% rename from commands/account/move.go rename to commands/msg/move.go index d58a279..1224efa 100644 --- a/commands/account/move.go +++ b/commands/msg/move.go @@ -1,4 +1,4 @@ -package account +package msg import ( "errors" @@ -19,12 +19,17 @@ func Move(aerc *widgets.Aerc, args []string) error { if len(args) != 2 { return errors.New("Usage: mv ") } - acct := aerc.SelectedAccount() + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() if acct == nil { return errors.New("No account selected") } - msg := acct.Messages().Selected() - store := acct.Messages().Store() + msg := widget.SelectedMessage() + store := widget.Store() + _, isMsgView := widget.(*widgets.MessageViewer) + if isMsgView { + aerc.RemoveTab(widget) + } acct.Messages().Next() store.Move([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { switch msg := msg.(type) { diff --git a/commands/msg/msg.go b/commands/msg/msg.go new file mode 100644 index 0000000..73755aa --- /dev/null +++ b/commands/msg/msg.go @@ -0,0 +1,16 @@ +package msg + +import ( + "git.sr.ht/~sircmpwn/aerc/commands" +) + +var ( + MessageCommands *commands.Commands +) + +func register(name string, cmd commands.AercCommand) { + if MessageCommands == nil { + MessageCommands = commands.NewCommands() + } + MessageCommands.Register(name, cmd) +} diff --git a/commands/account/reply.go b/commands/msg/reply.go similarity index 96% rename from commands/account/reply.go rename to commands/msg/reply.go index ecc6239..e09a118 100644 --- a/commands/account/reply.go +++ b/commands/msg/reply.go @@ -1,4 +1,4 @@ -package account +package msg import ( "bufio" @@ -63,11 +63,15 @@ func Reply(aerc *widgets.Aerc, args []string) error { } } - acct := aerc.SelectedAccount() + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } conf := acct.AccountConfig() us, _ := gomail.ParseAddress(conf.From) - store := acct.Messages().Store() - msg := acct.Messages().Selected() + store := widget.Store() + msg := widget.SelectedMessage() acct.Logger().Println("Replying to email " + msg.Envelope.MessageId) var ( diff --git a/widgets/account.go b/widgets/account.go index f553a92..4526c02 100644 --- a/widgets/account.go +++ b/widgets/account.go @@ -157,6 +157,18 @@ func (acct *AccountView) Messages() *MessageList { return acct.msglist } +func (acct *AccountView) Store() *lib.MessageStore { + return acct.msglist.Store() +} + +func (acct *AccountView) SelectedMessage() *types.MessageInfo { + return acct.msglist.Selected() +} + +func (acct *AccountView) SelectedAccount() *AccountView { + return acct +} + func (acct *AccountView) onMessage(msg types.WorkerMessage) { switch msg := msg.(type) { case *types.Done: diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index cf360bc..9230ba3 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -24,6 +24,7 @@ import ( type MessageViewer struct { ui.Invalidatable + acct *AccountView conf *config.AercConfig err error grid *ui.Grid @@ -55,7 +56,7 @@ func formatAddresses(addrs []*imap.Address) string { return val.String() } -func NewMessageViewer(conf *config.AercConfig, +func NewMessageViewer(acct *AccountView, conf *config.AercConfig, store *lib.MessageStore, msg *types.MessageInfo) *MessageViewer { grid := ui.NewGrid().Rows([]ui.GridSpec{ @@ -124,6 +125,7 @@ func NewMessageViewer(conf *config.AercConfig, grid.AddChild(switcher).At(1, 0) return &MessageViewer{ + acct: acct, grid: grid, msg: msg, store: store, @@ -185,6 +187,18 @@ func (mv *MessageViewer) OnInvalidate(fn func(d ui.Drawable)) { }) } +func (mv *MessageViewer) Store() *lib.MessageStore { + return mv.store +} + +func (mv *MessageViewer) SelectedAccount() *AccountView { + return mv.acct +} + +func (mv *MessageViewer) SelectedMessage() *types.MessageInfo { + return mv.msg +} + func (mv *MessageViewer) CurrentPart() *PartInfo { switcher := mv.switcher part := switcher.parts[switcher.selected] diff --git a/widgets/providesmessage.go b/widgets/providesmessage.go new file mode 100644 index 0000000..341f83f --- /dev/null +++ b/widgets/providesmessage.go @@ -0,0 +1,14 @@ +package widgets + +import ( + "git.sr.ht/~sircmpwn/aerc/worker/types" + "git.sr.ht/~sircmpwn/aerc/lib" + "git.sr.ht/~sircmpwn/aerc/lib/ui" +) + +type ProvidesMessage interface { + ui.Drawable + Store() *lib.MessageStore + SelectedMessage() *types.MessageInfo + SelectedAccount() *AccountView +}