redid the docopt

serra.go

@@ -2,44 +2,66 @@
 package main
 
 import (
+	"fmt"
+
 	"github.com/docopt/docopt-go"
 	"github.com/noqqe/serra/src/serra"
 )
 
+//[--count:1 <card>:[mmq/1] <set>:<nil> add:true cards:false remove:false set:false sets:false stats:false update:false]
+
+var opts struct {
+	Add     bool     `docopt:"add"`
+	Remove  bool     `docopt:"remove"`
+	Cards   bool     `docopt:"cards"`
+	Set     bool     `docopt:"set"`
+	Sets    bool     `docopt:"sets"`
+	Stats   bool     `docopt:"stats"`
+	Update  bool     `docopt:"update"`
+	Card    []string `docopt:"<card>"`
+	SetCode string   `docopt:"<setcode>"`
+	Count   int64    `docopt:"--count"`
+}
+
 // Main Loop
 func main() {
 
 	usage := `Serra
 
 Usage:
-  serra add <card>...
+  serra add <card>... [--count=<number>]
   serra remove <card>...
   serra cards
-  serra set <set>
+  serra set <setcode>
   serra sets
   serra update
   serra stats
 
 Options:
-  -h --help     Show this screen.
+  -h --help					Show this screen.
-  --version     Show version.
+	--count=<number>	Count of card to add.  [default: 1].
+  --version					Show version.
 `
 
 	args, _ := docopt.ParseDoc(usage)
+	err := args.Bind(&opts)
+	if err != nil {
+		fmt.Println(err)
+	}
 
-	if args["add"].(bool) {
+	if opts.Add {
-		serra.Add(args["<card>"].([]string))
+		serra.Add(opts.Card, opts.Count)
-	} else if args["remove"].(bool) {
+	} else if opts.Remove {
-		serra.Remove(args["<card>"].([]string))
+		serra.Remove(opts.Card)
-	} else if args["cards"].(bool) {
+	} else if opts.Cards {
 		serra.Cards()
-	} else if args["sets"].(bool) {
+	} else if opts.Sets {
 		serra.Sets()
-	} else if args["set"].(bool) {
+	} else if opts.Set {
-		serra.ShowSet(args["<set>"].(string))
+		serra.ShowSet(opts.SetCode)
-	} else if args["update"].(bool) {
+	} else if opts.Update {
 		serra.Update()
-	} else if args["stats"].(bool) {
+	} else if opts.Stats {
 		serra.Stats()
 	}
 

src/serra/root.go

@@ -15,9 +15,11 @@ const (
 )
 
 // Add
-func Add(cards []string) {
+func Add(cards []string, count int64) error {
 	LogMessage(fmt.Sprintf("Serra %v\n", version), "green")
 
+	fmt.Println(count)
+	return nil
 	client := storage_connect()
 	coll := &Collection{client.Database("serra").Collection("cards")}
 
@@ -49,6 +51,7 @@ func Add(cards []string) {
 		LogMessage(fmt.Sprintf("\"%s\" (%.2f Eur) added to Collection.", c.Name, c.Prices.Eur), "green")
 	}
 	storage_disconnect(client)
+	return nil
 }
 
 // Remove