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

switch: add -n and -p flags for relative switch

Browse source 
Allow switching to next or previous account with switch-account -n and
switch-account -p, respectively. By default, these are bound to Alt-n
and Alt-p.

Signed-off-by: Robin Jarry <robin@jarry.cc>
Tested-by: Koni Marti <koni.marti@gmail.com>
This commit is contained in:
Robin Jarry 2022-09-19 23:58:24 +02:00
parent fcd75ab529
commit bb9ac43e13
5 changed files with 79 additions and 9 deletions
commands/compose
switch.go

40
commands/compose/switch.go
View file

@ -5,6 +5,7 @@ import (
"fmt"
"git.sr.ht/~rjarry/aerc/widgets"
"git.sr.ht/~sircmpwn/getopt"
)
type AccountSwitcher interface {
@ -26,12 +27,29 @@ func (SwitchAccount) Complete(aerc *widgets.Aerc, args []string) []string {
}
func (SwitchAccount) Execute(aerc *widgets.Aerc, args []string) error {
if len(args) != 2 {
opts, optind, err := getopt.Getopts(args, "np")
if err != nil {
return err
}
var next, prev bool
for _, opt := range opts {
switch opt.Option {
case 'n':
next = true
prev = false
case 'p':
next = false
prev = true
}
}
posargs := args[optind:]
// NOT ((prev || next) XOR (len(posargs) == 1))
if (prev || next) == (len(posargs) == 1) {
name := ""
if acct := aerc.SelectedAccount(); acct != nil {
name = fmt.Sprintf("Current account: %s. ", acct.Name())
}
return errors.New(name + "Usage: switch-account <account-name>")
return errors.New(name + "Usage: switch-account [-np] <account-name>")
}
switcher, ok := aerc.SelectedTabContent().(AccountSwitcher)
@ -39,9 +57,19 @@ func (SwitchAccount) Execute(aerc *widgets.Aerc, args []string) error {
return errors.New("this tab cannot switch accounts")
}
if acct, err := aerc.Account(args[1]); err != nil {
return err
} else {
return switcher.SwitchAccount(acct)
var acct *widgets.AccountView
switch {
case prev:
acct, err = aerc.PrevAccount()
case next:
acct, err = aerc.NextAccount()
default:
acct, err = aerc.Account(posargs[0])
}
if err != nil {
return err
}
return switcher.SwitchAccount(acct)
}