norohind/dive-zfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read entire json file on image parsing

Browse Source
This commit is contained in:
Alex Goodman 2018-12-03 11:16:19 -05:00
parent 40a30ea369
commit fbd2214a51
No known key found for this signature in database
GPG Key ID: 743640FAA11698A1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
image/image.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"strings" "strings"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -188,8 +189,6 @@ func InitializeData(imageID string) ([]*Layer, []*filetree.FileTree, float64, fi
layerProgress := fmt.Sprintf("[layer: %2d]", currentLayer) layerProgress := fmt.Sprintf("[layer: %2d]", currentLayer)
name := header.Name name := header.Name
var n int
// some layer tars can be relative layer symlinks to other layer tars // some layer tars can be relative layer symlinks to other layer tars
if header.Typeflag == tar.TypeSymlink || header.Typeflag == tar.TypeReg { if header.Typeflag == tar.TypeSymlink || header.Typeflag == tar.TypeReg {
@ -204,9 +203,8 @@ func InitializeData(imageID string) ([]*Layer, []*filetree.FileTree, float64, fi
layerReader := tar.NewReader(tarReader) layerReader := tar.NewReader(tarReader)
processLayerTar(layerMap, name, layerReader, layerProgress) processLayerTar(layerMap, name, layerReader, layerProgress)
} else if strings.HasSuffix(name, ".json") { } else if strings.HasSuffix(name, ".json") {
var fileBuffer = make([]byte, header.Size) fileBuffer, err := ioutil.ReadAll(tarReader)
n, err = tarReader.Read(fileBuffer) if err != nil {
if err != nil && err != io.EOF || int64(n) != header.Size {
logrus.Panic(err) logrus.Panic(err)
} }
jsonFiles[name] = fileBuffer jsonFiles[name] = fileBuffer