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

cmd: continue lint fixes.

Browse Source
This commit is contained in:
Kyle Isom
2025-11-16 01:32:19 -08:00
parent f31d74243f
commit 0f77bd49dc
44 changed files with 888 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
cmd/jlp/jlp.go → cmd/jlp/main.go
View File

@@ -1,51 +1,51 @@
package main
import (
"bytes"
"encoding/json"
"flag"
"fmt"
"io"
"os"
"bytes"
"encoding/json"
"flag"
"fmt"
"io"
"os"
"git.wntrmute.dev/kyle/goutils/lib"
"git.wntrmute.dev/kyle/goutils/lib"
)
func prettify(file string, validateOnly bool) error {
var in []byte
var err error
if file == "-" {
in, err = io.ReadAll(os.Stdin)
} else {
in, err = os.ReadFile(file)
}
if file == "-" {
in, err = io.ReadAll(os.Stdin)
} else {
in, err = os.ReadFile(file)
}
if err != nil {
_, _ = lib.Warn(err, "ReadFile")
return err
}
if err != nil {
_, _ = lib.Warn(err, "ReadFile")
return err
}
var buf = &bytes.Buffer{}
err = json.Indent(buf, in, "", " ")
if err != nil {
_, _ = lib.Warn(err, "%s", file)
return err
}
if err != nil {
_, _ = lib.Warn(err, "%s", file)
return err
}
if validateOnly {
return nil
}
if file == "-" {
_, err = os.Stdout.Write(buf.Bytes())
} else {
err = os.WriteFile(file, buf.Bytes(), 0o644)
}
if file == "-" {
_, err = os.Stdout.Write(buf.Bytes())
} else {
err = os.WriteFile(file, buf.Bytes(), 0o644)
}
if err != nil {
_, _ = lib.Warn(err, "WriteFile")
}
if err != nil {
_, _ = lib.Warn(err, "WriteFile")
}
return err
}
@@ -54,44 +54,44 @@ func compact(file string, validateOnly bool) error {
var in []byte
var err error
if file == "-" {
in, err = io.ReadAll(os.Stdin)
} else {
in, err = os.ReadFile(file)
}
if file == "-" {
in, err = io.ReadAll(os.Stdin)
} else {
in, err = os.ReadFile(file)
}
if err != nil {
_, _ = lib.Warn(err, "ReadFile")
return err
}
if err != nil {
_, _ = lib.Warn(err, "ReadFile")
return err
}
var buf = &bytes.Buffer{}
err = json.Compact(buf, in)
if err != nil {
_, _ = lib.Warn(err, "%s", file)
return err
}
if err != nil {
_, _ = lib.Warn(err, "%s", file)
return err
}
if validateOnly {
return nil
}
if file == "-" {
_, err = os.Stdout.Write(buf.Bytes())
} else {
err = os.WriteFile(file, buf.Bytes(), 0o644)
}
if file == "-" {
_, err = os.Stdout.Write(buf.Bytes())
} else {
err = os.WriteFile(file, buf.Bytes(), 0o644)
}
if err != nil {
_, _ = lib.Warn(err, "WriteFile")
}
if err != nil {
_, _ = lib.Warn(err, "WriteFile")
}
return err
}
func usage() {
progname := lib.ProgName()
fmt.Fprintf(os.Stdout, `Usage: %s [-h] files...
progname := lib.ProgName()
fmt.Fprintf(os.Stdout, `Usage: %s [-h] files...
%s is used to lint and prettify (or compact) JSON files. The
files will be updated in-place.
@@ -100,7 +100,6 @@ func usage() {
-h Print this help message.
-n Don't prettify; only perform validation.
`, progname, progname)
}
func init() {