- [*] add sub-commands to the program

Author: suntong

cmdArch.go

@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////
+// Program: picv
+// Purpose: picture vault
+// Authors: Tong Sun (c) 2017, All rights reserved
+////////////////////////////////////////////////////////////////////////////
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/mkideal/cli"
+)
+
+////////////////////////////////////////////////////////////////////////////
+// Constant and data type/structure definitions
+
+////////////////////////////////////////////////////////////////////////////
+// arch
+
+func archCLI(ctx *cli.Context) error {
+	rootArgv := ctx.RootArgv().(*rootT)
+	argv := ctx.Argv().(*archT)
+	fmt.Printf("[arch]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
+	return nil
+}

cmdCut.go

@@ -23,18 +23,19 @@ type OptsT struct {
 
 var Opts OptsT
 
-//==========================================================================
-// Main dispatcher
+////////////////////////////////////////////////////////////////////////////
+// cut
 
-func picv(ctx *cli.Context) error {
-	ctx.JSON(ctx.RootArgv())
-	fmt.Println()
-	ctx.JSON(ctx.Argv())
-	fmt.Println()
-	argv := ctx.Argv().(*rootT)
-	Opts.Gap, Opts.Pod, Opts.Verbose = argv.Gap, argv.Pod, argv.Verbose.Value()
+func cutCLI(ctx *cli.Context) error {
+	rootArgv := ctx.RootArgv().(*rootT)
+	argv := ctx.Argv().(*cutT)
+	Opts.Gap, Opts.Pod, Opts.Verbose = argv.Gap, argv.Pod, rootArgv.Verbose.Value()
 	ctx.JSON(Opts)
 	fmt.Println()
 
+	return picVault()
+}
+
+func picVault() error {
 	return nil
 }

picv.yaml

@@ -6,12 +6,11 @@ PackageName: main
 Name: picv
 Desc: "picture vault"
 Text: Tool to deal with camera pictures and put them in vault
-#NumArg
+Global: true
 #NumOption: cli.AtLeast(1)
-# Handle the rest of CLI args ourselves
-CanSubRoute: true
+NumArg: cli.AtLeast(1)
 
-UsageLead: "Usage:\\n  picv [Options] dir [dirs...]"
+#UsageLead: "Usage:\\n  picv [Options] dir [dirs...]"
 
 Options:
   # - Name: Dir
@@ -20,19 +19,37 @@ Options:
   #   Usage: pic source dir
   #   Value: "./"
 
-  - Name: Gap
-    Type: int
-    Flag: g,gap
-    Usage: Gap in days to be considered as different group/vault
-    Value: 5
-    
-  - Name: Pod
-    Type: int
-    Flag: p,pod
-    Usage: Minimum number of picture to have before splitting to a different group/vault
-    Value: 15
-
   - Name: Verbose
     Type: cli.Counter
     Flag: v,verbose
     Usage: Verbose mode (Multiple -v options increase the verbosity.)
+
+Command:
+
+  - Name: cut
+    Desc: "Separate picture into groups"
+    # NumArg: cli.AtLeast(1)
+    #NumOption: cli.AtLeast(1)
+    # Handle the rest of CLI args ourselves
+    CanSubRoute: true
+
+    Options:
+      - Name: Gap
+        Type: int
+        Flag: g,gap
+        Usage: Gap in days to be considered as different group/vault
+        Value: 5
+    
+      - Name: Pod
+        Type: int
+        Flag: p,pod
+        Usage: Minimum number of picture to have before splitting to a different group/vault
+        Value: 15
+
+  - Name: arch
+    Desc: "Archive groups of picture into vaults"
+    # NumArg: cli.AtLeast(1)
+    #NumOption: cli.AtLeast(1)
+    # Handle the rest of CLI args ourselves
+    CanSubRoute: true
+

picvCLIDef.go

@@ -18,20 +18,18 @@ import (
 
 type rootT struct {
 	cli.Helper
-	Gap     int         `cli:"g,gap" usage:"Gap in days to be considered as different group/vault" dft:"5"`
-	Pod     int         `cli:"p,pod" usage:"Minimum number of picture to have before splitting to a different group/vault" dft:"15"`
 	Verbose cli.Counter `cli:"v,verbose" usage:"Verbose mode (Multiple -v options increase the verbosity.)"`
 }
 
 var root = &cli.Command{
-	Name: "picv",
-	Desc: "picture vault\nbuilt on " + buildTime,
-	Text: "Tool to deal with camera pictures and put them in vault" +
-		"\n\nUsage:\n  picv [Options] dir [dirs...]",
-	Argv: func() interface{} { return new(rootT) },
-	Fn:   picv,
+	Name:   "picv",
+	Desc:   "picture vault\nbuilt on " + buildTime,
+	Text:   "Tool to deal with camera pictures and put them in vault",
+	Global: true,
+	Argv:   func() interface{} { return new(rootT) },
+	Fn:     picv,
 
-	CanSubRoute: true,
+	NumArg: cli.AtLeast(1),
 }
 
 // Template for main starts here
@@ -52,7 +50,9 @@ var root = &cli.Command{
 //  	cli.SetUsageStyle(cli.ManualStyle) // up-down, for left-right, use NormalStyle
 //  	//NOTE: You can set any writer implements io.Writer
 //  	// default writer is os.Stdout
-//  	if err := cli.Root(root,).Run(os.Args[1:]); err != nil {
+//  	if err := cli.Root(root,
+//  		cli.Tree(cutDef),
+//  		cli.Tree(archDef)).Run(os.Args[1:]); err != nil {
 //  		fmt.Fprintln(os.Stderr, err)
 //  	}
 //  	fmt.Println("")
@@ -71,3 +71,49 @@ var root = &cli.Command{
 //  }
 
 // Template for CLI handling starts here
+
+////////////////////////////////////////////////////////////////////////////
+// cut
+
+// func cutCLI(ctx *cli.Context) error {
+// 	rootArgv = ctx.RootArgv().(*rootT)
+// 	argv := ctx.Argv().(*cutT)
+// 	fmt.Printf("[cut]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
+// 	return nil
+// }
+
+type cutT struct {
+	Gap int `cli:"g,gap" usage:"Gap in days to be considered as different group/vault" dft:"5"`
+	Pod int `cli:"p,pod" usage:"Minimum number of picture to have before splitting to a different group/vault" dft:"15"`
+}
+
+var cutDef = &cli.Command{
+	Name: "cut",
+	Desc: "Separate picture into groups",
+	Argv: func() interface{} { return new(cutT) },
+	Fn:   cutCLI,
+
+	CanSubRoute: true,
+}
+
+////////////////////////////////////////////////////////////////////////////
+// arch
+
+// func archCLI(ctx *cli.Context) error {
+// 	rootArgv = ctx.RootArgv().(*rootT)
+// 	argv := ctx.Argv().(*archT)
+// 	fmt.Printf("[arch]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
+// 	return nil
+// }
+
+type archT struct {
+}
+
+var archDef = &cli.Command{
+	Name: "arch",
+	Desc: "Archive groups of picture into vaults",
+	Argv: func() interface{} { return new(archT) },
+	Fn:   archCLI,
+
+	CanSubRoute: true,
+}

picvMain.go

@@ -20,7 +20,7 @@ import (
 
 var (
 	progname  = "picv"
-	VERSION   = "0.1.1"
+	VERSION   = "0.2.0"
 	buildTime = "2017-06-03"
 )
 
@@ -31,8 +31,21 @@ var (
 func main() {
 	//NOTE: You can set any writer implements io.Writer
 	// default writer is os.Stdout
-	if err := cli.Root(root).Run(os.Args[1:]); err != nil {
+	if err := cli.Root(root,
+		cli.Tree(cutDef),
+		cli.Tree(archDef)).Run(os.Args[1:]); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 	}
 	fmt.Println("")
 }
+
+//==========================================================================
+// Main dispatcher
+
+func picv(ctx *cli.Context) error {
+	ctx.JSON(ctx.RootArgv())
+	ctx.JSON(ctx.Argv())
+	fmt.Println()
+
+	return nil
+}