kyle
/
goutils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jlp: support reading JSON from stdin.

This commit is contained in:
Kyle Isom 2016-10-14 09:51:29 -07:00
parent b9deec27f0
commit c8b627565f
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/jlp/jlp.go
View File

@ -6,12 +6,21 @@ import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"github.com/kisom/goutils/lib" "github.com/kisom/goutils/lib"
) )
func prettify(file string, validateOnly bool) error { func prettify(file string, validateOnly bool) error {
in, err := ioutil.ReadFile(file) var in []byte
var err error
if file == "-" {
in, err = ioutil.ReadAll(os.Stdin)
} else {
in, err = ioutil.ReadFile(file)
}
if err != nil { if err != nil {
lib.Warn(err, "ReadFile") lib.Warn(err, "ReadFile")
return err return err
@ -28,7 +37,12 @@ func prettify(file string, validateOnly bool) error {
return nil return nil
} }
err = ioutil.WriteFile(file, buf.Bytes(), 0644) if file == "-" {
_, err = os.Stdout.Write(buf.Bytes())
} else {
err = ioutil.WriteFile(file, buf.Bytes(), 0644)
}
if err != nil { if err != nil {
lib.Warn(err, "WriteFile") lib.Warn(err, "WriteFile")
} }
@ -37,7 +51,15 @@ func prettify(file string, validateOnly bool) error {
} }
func compact(file string, validateOnly bool) error { func compact(file string, validateOnly bool) error {
in, err := ioutil.ReadFile(file) var in []byte
var err error
if file == "-" {
in, err = ioutil.ReadAll(os.Stdin)
} else {
in, err = ioutil.ReadFile(file)
}
if err != nil { if err != nil {
lib.Warn(err, "ReadFile") lib.Warn(err, "ReadFile")
return err return err
@ -54,7 +76,12 @@ func compact(file string, validateOnly bool) error {
return nil return nil
} }
err = ioutil.WriteFile(file, buf.Bytes(), 0644) if file == "-" {
_, err = os.Stdout.Write(buf.Bytes())
} else {
err = ioutil.WriteFile(file, buf.Bytes(), 0644)
}
if err != nil { if err != nil {
lib.Warn(err, "WriteFile") lib.Warn(err, "WriteFile")
} }