1 files changed, 12 insertions, 30 deletions

diff --git a/commands/compose/switch.go b/commands/compose/switch.go
index 2b6aadb5..807ef8f2 100644
--- a/commands/compose/switch.go
+++ b/commands/compose/switch.go
@@ -2,17 +2,19 @@ package compose
 
 import (
 	"errors"
-	"fmt"
 
 	"git.sr.ht/~rjarry/aerc/widgets"
-	"git.sr.ht/~sircmpwn/getopt"
 )
 
 type AccountSwitcher interface {
 	SwitchAccount(*widgets.AccountView) error
 }
 
-type SwitchAccount struct{}
+type SwitchAccount struct {
+	Next    bool   `opt:"-n"`
+	Prev    bool   `opt:"-p"`
+	Account string `opt:"..." metavar:"ACCOUNT" required:"false"`
+}
 
 func init() {
 	register(SwitchAccount{})
@@ -26,30 +28,9 @@ func (SwitchAccount) Complete(aerc *widgets.Aerc, args []string) []string {
 	return aerc.AccountNames()
 }
 
-func (SwitchAccount) Execute(aerc *widgets.Aerc, args []string) error {
-	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 [-np] <account-name>")
+func (s SwitchAccount) Execute(aerc *widgets.Aerc, args []string) error {
+	if !s.Prev && !s.Next && s.Account == "" {
+		return errors.New("Usage: switch-account -n | -p | <account-name>")
 	}
 
 	switcher, ok := aerc.SelectedTabContent().(AccountSwitcher)
@@ -58,14 +39,15 @@ func (SwitchAccount) Execute(aerc *widgets.Aerc, args []string) error {
 	}
 
 	var acct *widgets.AccountView
+	var err error
 
 	switch {
-	case prev:
+	case s.Prev:
 		acct, err = aerc.PrevAccount()
-	case next:
+	case s.Next:
 		acct, err = aerc.NextAccount()
 	default:
-		acct, err = aerc.Account(posargs[0])
+		acct, err = aerc.Account(s.Account)
 	}
 	if err != nil {
 		return err