suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-09-02 23:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed collect object for multi doc

Browse Source
This commit is contained in:
Mike Farah
2020-11-13 13:19:54 +11:00
parent 2edf64182b
commit 708ff02e8d
17 changed files with 404 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yqlib/printer.go
+18 -7
View File
@@ -9,7 +9,7 @@ import (
)
type Printer interface {
PrintResults(matchingNodes *list.List, writer io.Writer) error
PrintResults(matchingNodes *list.List) error
}
type resultsPrinter struct {
@@ -18,10 +18,20 @@ type resultsPrinter struct {
colorsEnabled bool
indent int
printDocSeparators bool
writer io.Writer
firstTimePrinting bool
}
func NewPrinter(outputToJSON bool, unwrapScalar bool, colorsEnabled bool, indent int, printDocSeparators bool) Printer {
return &resultsPrinter{outputToJSON, unwrapScalar, colorsEnabled, indent, printDocSeparators}
func NewPrinter(writer io.Writer, outputToJSON bool, unwrapScalar bool, colorsEnabled bool, indent int, printDocSeparators bool) Printer {
return &resultsPrinter{
writer: writer,
outputToJSON: outputToJSON,
unwrapScalar: unwrapScalar,
colorsEnabled: colorsEnabled,
indent: indent,
printDocSeparators: printDocSeparators,
firstTimePrinting: true,
}
}
func (p *resultsPrinter) printNode(node *yaml.Node, writer io.Writer) error {
@@ -42,7 +52,7 @@ func (p *resultsPrinter) writeString(writer io.Writer, txt string) error {
return errorWriting
}
func (p *resultsPrinter) PrintResults(matchingNodes *list.List, writer io.Writer) error {
func (p *resultsPrinter) PrintResults(matchingNodes *list.List) error {
var err error
if p.outputToJSON {
explodeOp := Operation{OperationType: Explode}
@@ -53,7 +63,7 @@ func (p *resultsPrinter) PrintResults(matchingNodes *list.List, writer io.Writer
}
}
bufferedWriter := bufio.NewWriter(writer)
bufferedWriter := bufio.NewWriter(p.writer)
defer safelyFlush(bufferedWriter)
if matchingNodes.Len() == 0 {
@@ -61,12 +71,12 @@ func (p *resultsPrinter) PrintResults(matchingNodes *list.List, writer io.Writer
return nil
}
var previousDocIndex uint = matchingNodes.Front().Value.(*CandidateNode).Document
previousDocIndex := matchingNodes.Front().Value.(*CandidateNode).Document
for el := matchingNodes.Front(); el != nil; el = el.Next() {
mappedDoc := el.Value.(*CandidateNode)
if previousDocIndex != mappedDoc.Document && p.printDocSeparators {
if (!p.firstTimePrinting || (previousDocIndex != mappedDoc.Document)) && p.printDocSeparators {
p.writeString(bufferedWriter, "---\n")
}
@@ -76,6 +86,7 @@ func (p *resultsPrinter) PrintResults(matchingNodes *list.List, writer io.Writer
previousDocIndex = mappedDoc.Document
}
p.firstTimePrinting = false
return nil
}