1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Fix JSON parsing

Issue #600 points out Jenkins module panics occasionally
I noticed that a number of places panic because of JSON parsing
Centralize JSON parsing, have it return an error, and have widgets
report the error
This commit is contained in:
Sean Smith
2019-09-07 15:10:37 -04:00
parent 32884e5de4
commit 36fbad54d8
8 changed files with 73 additions and 162 deletions

View File

@@ -1,7 +1,10 @@
package utils
import (
"bytes"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"os/exec"
"regexp"
@@ -121,3 +124,22 @@ func ReadFileBytes(filePath string) ([]byte, error) {
return fileData, nil
}
// ParseJson is a standard JSON reader from text
func ParseJson(obj interface{}, text io.Reader) error {
jsonStream, err := ioutil.ReadAll(text)
if err != nil {
return err
}
decoder := json.NewDecoder(bytes.NewReader(jsonStream))
for {
if err := decoder.Decode(obj); err == io.EOF {
break
} else if err != nil {
return err
}
}
return nil
}