Updated api

Author: djthorpe

cmd/api/bitwarden.go

@@ -60,8 +60,8 @@ func bwRegister(flags *Flags) {
 			{Name: "auth", Description: "Authenticate with Bitwarden", Call: bwAuth},
 			{Name: "sync", Description: "Sync items from Bitwarden", Call: bwSync},
 			{Name: "folders", Description: "Retrieve folders", Call: bwFolders},
-			{Name: "logins", Description: "Retrieve login items", Call: bwLogins},
-			{Name: "password", Description: "Print a password to stdout", Call: bwGetPassword},
+			{Name: "logins", Description: "Retrieve login items", Call: bwLogins, MaxArgs: 1},
+			{Name: "password", Description: "Print a password to stdout", Call: bwGetPassword, MinArgs: 1, MaxArgs: 1},
 		},
 	})
 }

cmd/api/cmd.go

@@ -20,25 +20,32 @@ type Cmd struct {
 type Fn struct {
 	Name        string
 	Description string
+	MinArgs     uint
+	MaxArgs     uint
 	Call        func(*tablewriter.TableWriter) error
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
-func (c *Cmd) Get(args []string) *Fn {
+func (c *Cmd) Get(args []string) (*Fn, error) {
 	if len(args) == 0 {
-		return nil
+		return nil, fmt.Errorf("missing command")
 	}
-	fmt.Println("TODO: %q", args)
-	return nil
-	/*
-	   	for _, fn := range c.Fn {
-	   		if fn.Name == match {
-	   			return &fn
-	   		}
-	   	}
-
-	   return nil
-	*/
+	name := args[0]
+	nargs := uint(len(args[1:]))
+	for _, fn := range c.Fn {
+		if fn.Name != name {
+			continue
+		}
+		// Check number of arguments
+		if fn.MinArgs != 0 && nargs < fn.MinArgs {
+			return nil, fmt.Errorf("not enough arguments for %q", fn.Name)
+		} else if nargs > fn.MaxArgs {
+			return nil, fmt.Errorf("too many arguments for %q", fn.Name)
+		}
+		// Return the command
+		return &fn, nil
+	}
+	return nil, fmt.Errorf("unknown command: %q", name)
 }

cmd/api/main.go

@@ -37,14 +37,20 @@ func main() {
 		os.Exit(-1)
 	}
 
-	fn := cmd.Get(flags.Args()[1:])
+	// Get function
+	fn, err := cmd.Get(flags.Args()[1:])
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(-1)
+	}
+
+	// Run function
 	if fn != nil {
 		if err := Run(fn); err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			os.Exit(-2)
 		}
-	}
-	if flags.NArg() == 1 {
+	} else if flags.NArg() == 1 {
 		flags.PrintCommandUsage(cmd)
 	} else {
 		fmt.Fprintf(os.Stderr, "Unknown command: %q\n", flags.Args()[1:])