Fixed api calls

Author: djthorpe

cmd/api/cmd.go

@@ -29,23 +29,39 @@ type Fn struct {
 // PUBLIC METHODS
 
 func (c *Cmd) Get(args []string) (*Fn, error) {
+	// Get the command function
+	var fn *Fn
+	var nargs uint
 	if len(args) == 0 {
-		return nil, fmt.Errorf("missing command")
+		fn = c.getFn("")
+	} else {
+		fn = c.getFn(args[0])
+		nargs = uint(len(args) - 1)
 	}
-	name := args[0]
-	nargs := uint(len(args[1:]))
+	if fn == nil {
+		// No arguments and no default command
+		return nil, nil
+	}
+
+	// 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
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// PRIVATE METHODS
+
+func (c *Cmd) getFn(name string) *Fn {
 	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)
+		if fn.Name == name {
+			return &fn
 		}
-		// Return the command
-		return &fn, nil
 	}
-	return nil, fmt.Errorf("unknown command: %q", name)
+	return nil
 }

cmd/api/main.go

@@ -37,24 +37,16 @@ func main() {
 		os.Exit(-1)
 	}
 
-	// Get function
+	// Get function then run it
 	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)
-		}
-	} else if flags.NArg() == 1 {
+	} else if fn == nil {
 		flags.PrintCommandUsage(cmd)
-	} else {
-		fmt.Fprintf(os.Stderr, "Unknown command: %q\n", flags.Args()[1:])
-		os.Exit(-1)
+	} else if err := Run(fn); err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(-2)
 	}
 }