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

commands/helper: remove duplicated method

This commit is contained in:
Reto Brunner 2020-05-09 11:50:30 +02:00 committed by Drew DeVault
parent c5fdefe7af
commit 381c1fc05f
6 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/msg/copy.go
View File

@ -44,7 +44,7 @@ func (Copy) Execute(aerc *widgets.Aerc, args []string) error {
} }
} }
h := newHelper(aerc) h := newHelper(aerc)
uids, err := h.uids() uids, err := h.markedOrSelectedUids()
if err != nil { if err != nil {
return err return err
} }

2
commands/msg/delete.go
View File

@ -34,7 +34,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
if err != nil { if err != nil {
return err return err
} }
uids, err := h.uids() uids, err := h.markedOrSelectedUids()
if err != nil { if err != nil {
return err return err
} }

2
commands/msg/modify-labels.go
View File

@ -34,7 +34,7 @@ func (ModifyLabels) Execute(aerc *widgets.Aerc, args []string) error {
if err != nil { if err != nil {
return err return err
} }
uids, err := h.uids() uids, err := h.markedOrSelectedUids()
if err != nil { if err != nil {
return err return err
} }

2
commands/msg/move.go
View File

@ -49,7 +49,7 @@ func (Move) Execute(aerc *widgets.Aerc, args []string) error {
if err != nil { if err != nil {
return err return err
} }
uids, err := h.uids() uids, err := h.markedOrSelectedUids()
if err != nil { if err != nil {
return err return err
} }

2
commands/msg/read.go
View File

@ -54,7 +54,7 @@ func (Read) Execute(aerc *widgets.Aerc, args []string) error {
// ignore commmand given, simply toggle all the read states // ignore commmand given, simply toggle all the read states
return submitToggle(aerc, store, h) return submitToggle(aerc, store, h)
} }
msgUids, err := h.messageUids() msgUids, err := h.markedOrSelectedUids()
if err != nil { if err != nil {
return err return err
} }

10
commands/msg/utils.go
View File

@ -17,7 +17,7 @@ func newHelper(aerc *widgets.Aerc) *helper {
return &helper{aerc.SelectedTab().(widgets.ProvidesMessages)} return &helper{aerc.SelectedTab().(widgets.ProvidesMessages)}
} }
func (h *helper) uids() ([]uint32, error) { func (h *helper) markedOrSelectedUids() ([]uint32, error) {
msgs, err := commands.MarkedOrSelected(h.msgProvider) msgs, err := commands.MarkedOrSelected(h.msgProvider)
if err != nil { if err != nil {
return nil, err return nil, err
@ -45,11 +45,3 @@ func (h *helper) account() (*widgets.AccountView, error) {
func (h *helper) messages() ([]*models.MessageInfo, error) { func (h *helper) messages() ([]*models.MessageInfo, error) {
return commands.MarkedOrSelected(h.msgProvider) return commands.MarkedOrSelected(h.msgProvider)
} }
func (h *helper) messageUids() ([]uint32, error) {
msgs, err := h.messages()
if err != nil {
return nil, err
}
return commands.UidsFromMessageInfos(msgs), nil
}