3 files changed, 44 insertions, 22 deletions

diff --git a/commands/commands.go b/commands/commands.go
index 71dabe4..49a8b46 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -3,10 +3,12 @@ package commands
 import (
 	"errors"
 
+	"github.com/google/shlex"
+
 	"git.sr.ht/~sircmpwn/aerc2/widgets"
 )
 
-type AercCommand func(aerc *widgets.Aerc, cmd string) error
+type AercCommand func(aerc *widgets.Aerc, args []string) error
 
 var (
 	commands map[string]AercCommand
@@ -21,8 +23,15 @@ func Register(name string, cmd AercCommand) {
 }
 
 func ExecuteCommand(aerc *widgets.Aerc, cmd string) error {
-	if fn, ok := commands[cmd]; ok {
-		return fn(aerc, cmd)
+	args, err := shlex.Split(cmd)
+	if err != nil {
+		return err
+	}
+	if len(args) == 0 {
+		return errors.New("Expected a command.")
+	}
+	if fn, ok := commands[args[0]]; ok {
+		return fn(aerc, args)
 	}
-	return errors.New("Unknown command " + cmd)
+	return errors.New("Unknown command " + args[0])
 }
diff --git a/commands/next-folder.go b/commands/next-folder.go
index 02975e1..ed11615 100644
--- a/commands/next-folder.go
+++ b/commands/next-folder.go
@@ -1,15 +1,43 @@
 package commands
 
 import (
+	"errors"
+	"fmt"
+	"strconv"
+
 	"git.sr.ht/~sircmpwn/aerc2/widgets"
 )
 
 func init() {
-	Register("next-folder", NextFolder)
+	Register("next-folder", NextPrevFolder)
+	Register("prev-folder", NextPrevFolder)
+}
+
+func usage(cmd string) error {
+	return errors.New(fmt.Sprintf("Usage: %s [n]", cmd))
 }
 
-func NextFolder(aerc *widgets.Aerc, cmd string) error {
+func NextPrevFolder(aerc *widgets.Aerc, args []string) error {
+	if len(args) > 2 {
+		return usage(args[0])
+	}
+	var (
+		n   int = 1
+		err error
+	)
+	if len(args) > 1 {
+		n, err = strconv.Atoi(args[1])
+		if err != nil {
+			return usage(args[0])
+		}
+	}
 	acct := aerc.SelectedAccount()
-	acct.Directories().Next()
+	for ; n > 0; n-- {
+		if args[0] == "prev-folder" {
+			acct.Directories().Prev()
+		} else {
+			acct.Directories().Next()
+		}
+	}
 	return nil
 }
diff --git a/commands/prev-folder.go b/commands/prev-folder.go
deleted file mode 100644
index a38214f..0000000
--- a/commands/prev-folder.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package commands
-
-import (
-	"git.sr.ht/~sircmpwn/aerc2/widgets"
-)
-
-func init() {
-	Register("prev-folder", PrevFolder)
-}
-
-func PrevFolder(aerc *widgets.Aerc, cmd string) error {
-	acct := aerc.SelectedAccount()
-	acct.Directories().Prev()
-	return nil
-}