1 files changed, 18 insertions, 20 deletions
diff --git a/commands/move-tab.go b/commands/move-tab.go
index 76e5348d..0ebb1eb8 100644
--- a/commands/move-tab.go
+++ b/commands/move-tab.go
@@ -1,19 +1,33 @@
 package commands
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 
 	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
-type MoveTab struct{}
+type MoveTab struct {
+	Index    int `opt:"INDEX" metavar:"[+|-]INDEX" parse:"ParseIndex"`
+	Relative bool
+}
 
 func init() {
 	register(MoveTab{})
 }
 
+func (m *MoveTab) ParseIndex(arg string) error {
+	i, err := strconv.ParseInt(arg, 10, 64)
+	if err != nil {
+		return err
+	}
+	m.Index = int(i)
+	if strings.HasPrefix(arg, "+") || strings.HasPrefix(arg, "-") {
+		m.Relative = true
+	}
+	return nil
+}
+
 func (MoveTab) Aliases() []string {
 	return []string{"move-tab"}
 }
@@ -22,23 +36,7 @@ func (MoveTab) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (MoveTab) Execute(aerc *widgets.Aerc, args []string) error {
-	if len(args) == 1 {
-		return fmt.Errorf("Usage: %s [+|-]<index>", args[0])
-	}
-
-	joinedArgs := strings.Join(args[1:], "")
-
-	n, err := strconv.Atoi(joinedArgs)
-	if err != nil {
-		return fmt.Errorf("failed to parse index argument: %w", err)
-	}
-
-	var relative bool
-	if strings.HasPrefix(joinedArgs, "+") || strings.HasPrefix(joinedArgs, "-") {
-		relative = true
-	}
-	aerc.MoveTab(n, relative)
-
+func (m MoveTab) Execute(aerc *widgets.Aerc, args []string) error {
+	aerc.MoveTab(m.Index, m.Relative)
 	return nil
 }