commands: parse arguments with go-opt

Use the argument parsing framework introduced earlier to unify the
parsing of (almost) all command options. Remove custom parsing code and
to avoid extraneous types, add fields with `opt` tags on command structs
that have options and arguments. Commands that take no argument do not
need anything.

Since the command objects now carry data, create a new temporary
instance of them before passing them to opt.ArgsToStruct when executing
a command.

A few of the commands use specific semantics for parsing (:choose), or
are delegating argument parsing to another function (:sort, :search,
:filter). For these commands, simply add a dummy "-" passthrough
argument. Since all commands still have the argument list (after split)
nothing needs to be changed in this area.

There should be no functional change besides the Usage strings and
reported errors which are now generated automatically.

Signed-off-by: Robin Jarry <robin@jarry.cc>
Reviewed-by: Koni Marti <koni.marti@gmail.com>
Tested-by: Moritz Poldrack <moritz@poldrack.dev>
Tested-by: Inwit <inwit@sindominio.net>

1 files changed, 9 insertions, 12 deletions

diff --git a/commands/ct.go b/commands/ct.go
index 1b5659c7..8a6bb063 100644
--- a/commands/ct.go
+++ b/commands/ct.go
@@ -2,14 +2,15 @@ package commands
 
 import (
 	"errors"
-	"fmt"
 	"strconv"
 	"strings"
 
 	"git.sr.ht/~rjarry/aerc/app"
 )
 
-type ChangeTab struct{}
+type ChangeTab struct {
+	Tab string `opt:"tab"`
+}
 
 func init() {
 	register(ChangeTab{})
@@ -27,25 +28,21 @@ func (ChangeTab) Complete(args []string) []string {
 	return FilterList(app.TabNames(), joinedArgs, "", app.SelectedAccountUiConfig().FuzzyComplete)
 }
 
-func (ChangeTab) Execute(args []string) error {
-	if len(args) == 1 {
-		return fmt.Errorf("Usage: %s <tab>", args[0])
-	}
-	joinedArgs := strings.Join(args[1:], " ")
-	if joinedArgs == "-" {
+func (c ChangeTab) Execute(args []string) error {
+	if c.Tab == "-" {
 		ok := app.SelectPreviousTab()
 		if !ok {
 			return errors.New("No previous tab to return to")
 		}
 	} else {
-		n, err := strconv.Atoi(joinedArgs)
+		n, err := strconv.Atoi(c.Tab)
 		if err == nil {
 			switch {
-			case strings.HasPrefix(joinedArgs, "+"):
+			case strings.HasPrefix(c.Tab, "+"):
 				for ; n > 0; n-- {
 					app.NextTab()
 				}
-			case strings.HasPrefix(joinedArgs, "-"):
+			case strings.HasPrefix(c.Tab, "-"):
 				for ; n < 0; n++ {
 					app.PrevTab()
 				}
@@ -57,7 +54,7 @@ func (ChangeTab) Execute(args []string) error {
 				}
 			}
 		} else {
-			ok := app.SelectTab(joinedArgs)
+			ok := app.SelectTab(c.Tab)
 			if !ok {
 				return errors.New("No tab with that name")
 			}