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

Added XML decoder (#1044)

Browse Source
This commit is contained in:
Mike Farah
2021-12-21 15:02:07 +11:00
committed by GitHub
parent 915e9de437
commit df32baedf1
154 changed files with 725 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yqlib/operator_load.go
+4 -3
View File
@@ -12,6 +12,7 @@ import (
type loadPrefs struct {
loadAsString bool
decoder Decoder
}
func loadString(filename string) (*CandidateNode, error) {
@@ -26,7 +27,7 @@ func loadString(filename string) (*CandidateNode, error) {
return &CandidateNode{Node: &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!str", Value: string(filebytes)}}, nil
}
func loadYaml(filename string) (*CandidateNode, error) {
func loadYaml(filename string, decoder Decoder) (*CandidateNode, error) {
file, err := os.Open(filename) // #nosec
if err != nil {
@@ -34,7 +35,7 @@ func loadYaml(filename string) (*CandidateNode, error) {
}
reader := bufio.NewReader(file)
documents, err := readDocuments(reader, filename, 0)
documents, err := readDocuments(reader, filename, 0, decoder)
if err != nil {
return nil, err
}
@@ -83,7 +84,7 @@ func loadYamlOperator(d *dataTreeNavigator, context Context, expressionNode *Exp
if loadPrefs.loadAsString {
contentsCandidate, err = loadString(filename)
} else {
contentsCandidate, err = loadYaml(filename)
contentsCandidate, err = loadYaml(filename, loadPrefs.decoder)
}
if err != nil {
return Context{}, fmt.Errorf("Failed to load %v: %w", filename, err)