Commit f44996d

committed

- [+] implement the business logic of cmd:x2j

1 parent 9e3ed13 commit f44996dCopy full SHA for f44996d

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,4 @@`
`13`	`13`	`# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736`
`14`	`14`	`.glide/`
`15`	`15`	`jsonfiddle`
	`16`	`+jsonfiddle.exe`

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,11 @@ package main`
`8`	`8`
`9`	`9`	`import (`
`10`	`10`	`"fmt"`
	`11`	`+ "io"`
`11`	`12`	`"os"`
`12`	`13`
	`14`	`+ xj "github.com/basgys/goxml2json"`
	`15`	`+`
`13`	`16`	`"github.com/mkideal/cli"`
`14`	`17`	`"github.com/mkideal/cli/clis"`
`15`	`18`	`)`
`@@ -24,15 +27,19 @@ func x2jCLI(ctx *cli.Context) error {`
`24`	`27`	`clis.Verbose(2, "<%s> -\n %+v\n %+v\n %v\n", ctx.Path(), rootArgv, argv, ctx.Args())`
`25`	`28`	`Opts.Compact, Opts.Prefix, Opts.Indent, Opts.Protect, Opts.Verbose =`
`26`	`29`	`rootArgv.Compact, rootArgv.Prefix, rootArgv.Indent, rootArgv.Protect, rootArgv.Verbose.Value()`
`27`		`- // argv.Filei, argv.Fileo,`
`28`		`-//return nil`
`29`		`- return DoX2j()`
	`30`	`+ // argv.Filei, argv.Fileo,`
	`31`	`+`
	`32`	`+ return DoX2j(argv.Filei, argv.Fileo)`
`30`	`33`	`}`
`31`	`34`
`32`		`-//`
`33`	`35`	// DoX2j implements the business logic of command `x2j`
`34`		`-func DoX2j() error {`
	`36`	`+func DoX2j(cin io.Reader, cout io.Writer) error {`
`35`	`37`	`fmt.Fprintf(os.Stderr, "%s v%s. x2j - XML to JSON\n", progname, version)`
`36`	`38`	`// fmt.Fprintf(os.Stderr, "Copyright (C) 2019, Tong Sun\n\n")`
	`39`	`+`
	`40`	`+ json, err := xj.Convert(cin)`
	`41`	`+ abortOn("[::x2j] Convert from xml to json", err)`
	`42`	`+`
	`43`	`+ fmt.Fprintln(cout, json.String())`
`37`	`44`	`return nil`
`38`	`45`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ type OptsT struct {`
`37`	`37`	`var (`
`38`	`38`	`progname = "jsonfiddle"`
`39`	`39`	`// version tracks the release version.`
`40`		`- version = "v0.5.0"`
	`40`	`+ version = "0.5.0"`
`41`	`41`	`date = "2019年05月30日"`
`42`	`42`	`)`
`43`	`43`

Comments

(0)