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

store: extract marking behavior and add tests

Browse source 
Separate the marking functions from the message store and extract the
marking behavior into its own class with tests.

Signed-off-by: Koni Marti <koni.marti@gmail.com>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Koni Marti 2022-08-08 22:21:41 +02:00 • committed by Robin Jarry
parent ee961d3b1d
commit cfc19a7ec2
14 changed files with 373 additions and 177 deletions
commands/msg
mark.go

15
commands/msg/mark.go
View file

@ -31,6 +31,7 @@ func (Mark) Execute(aerc *widgets.Aerc, args []string) error {
if err != nil {
return err
}
marker := store.Marker()
opts, _, err := getopt.Getopts(args, "atv")
if err != nil {
return err
@ -57,9 +58,9 @@ func (Mark) Execute(aerc *widgets.Aerc, args []string) error {
var modFunc func(uint32)
if toggle {
modFunc = store.ToggleMark
modFunc = marker.ToggleMark
} else {
modFunc = store.Mark
modFunc = marker.Mark
}
switch {
case all:
@ -69,7 +70,7 @@ func (Mark) Execute(aerc *widgets.Aerc, args []string) error {
}
return nil
case visual:
store.ToggleVisualMark()
marker.ToggleVisualMark()
return nil
default:
modFunc(selected.Uid)
@ -85,21 +86,21 @@ func (Mark) Execute(aerc *widgets.Aerc, args []string) error {
case all && toggle:
uids := store.Uids()
for _, uid := range uids {
store.ToggleMark(uid)
marker.ToggleMark(uid)
}
return nil
case all && !toggle:
store.ClearVisualMark()
marker.ClearVisualMark()
return nil
default:
store.Unmark(selected.Uid)
marker.Unmark(selected.Uid)
return nil
}
case "remark":
if all || visual || toggle {
return fmt.Errorf("Usage: :remark")
}
store.Remark()
marker.Remark()
return nil
}
return nil // never reached