mirrors
/
go-mtree
mirror of https://github.com/vbatts/go-mtree.git
1
0
Fork 0
Code Releases Activity

main: --file flag can be repeated now 

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Vincent Batts 2022-04-04 16:25:30 -04:00
parent fc2975ed32
commit bdace0aacf
Signed by: vbatts
GPG Key ID: 10937E57733F1362
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/gomtree/main.go
View File

@ -27,7 +27,7 @@ func main() {
Aliases: []string{"c"},
Usage: "Create a directory hierarchy spec",
},
&cli.StringFlag{
&cli.StringSliceFlag{
Name: "file",
Aliases: []string{"f"},
Usage: "Directory hierarchy spec to validate",
@ -182,9 +182,9 @@ func mainApp(c *cli.Context) error {
)
// -f <file>
if c.String("file") != "" && !c.Bool("create") {
if len(c.StringSlice("file")) > 0 && !c.Bool("create") {
// load the hierarchy, if we're not creating a new spec
fh, err := os.Open(c.String("file"))
fh, err := os.Open(c.StringSlice("file")[0])
if err != nil {
return err
}
@ -206,21 +206,25 @@ func mainApp(c *cli.Context) error {
}
if c.String("result-format") == "json" {
// if they're asking for json, give it to them
data := map[string][]mtree.Keyword{c.String("file"): specKeywords}
buf, err := json.MarshalIndent(data, "", " ")
if err != nil {
return err
}
fmt.Println(string(buf))
} else {
fmt.Printf("Keywords used in [%s]:\n", c.String("file"))
for _, kw := range specKeywords {
fmt.Printf(" %s", kw)
if _, ok := mtree.KeywordFuncs[kw]; !ok {
fmt.Print(" (unsupported)")
for _, file := range c.StringSlice("file") {
// if they're asking for json, give it to them
data := map[string][]mtree.Keyword{file: specKeywords}
buf, err := json.MarshalIndent(data, "", " ")
if err != nil {
return err
}
fmt.Println(string(buf))
}
} else {
for _, file := range c.StringSlice("file") {
fmt.Printf("Keywords used in [%s]:\n", file)
for _, kw := range specKeywords {
fmt.Printf(" %s", kw)
if _, ok := mtree.KeywordFuncs[kw]; !ok {
fmt.Print(" (unsupported)")
}
fmt.Printf("\n")
}
fmt.Printf("\n")
}
}
return nil
@ -338,8 +342,8 @@ func mainApp(c *cli.Context) error {
// -c
if c.Bool("create") {
fh := os.Stdout
if c.String("file") != "" {
fh, err = os.Create(c.String("file"))
if len(c.StringSlice("file")) > 0 {
fh, err = os.Create(c.StringSlice("file")[0])
if err != nil {
return err
}