suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2025-01-23 22:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplified 'new' command

Browse Source
This commit is contained in:
Mike Farah 2018-06-15 16:21:18 +10:00
parent 94b217984c
commit 08870f8ec9
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
yq.go
View File

@ -256,18 +256,23 @@ func newYaml(args []string) (interface{}, error) {
return nil, writeCommandsError return nil, writeCommandsError
} }
var parsedData yaml.MapSlice var dataBucket interface{}
var prependCommand = ""
var isArray = strings.HasPrefix(writeCommands[0].Key.(string), "[") var isArray = strings.HasPrefix(writeCommands[0].Key.(string), "[")
if isArray { if isArray {
item := yaml.MapItem{Key: "thing", Value: make(yaml.MapSlice, 0)} dataBucket = make([]interface{}, 0)
parsedData = yaml.MapSlice{item}
prependCommand = "thing"
} else { } else {
parsedData = make(yaml.MapSlice, 0) dataBucket = make(yaml.MapSlice, 0)
} }
return updateParsedData(parsedData, writeCommands, prependCommand) for _, entry := range writeCommands {
path := entry.Key.(string)
value := entry.Value
log.Debugf("setting %v to %v", path, value)
var paths = parsePath(path)
dataBucket = updatedChildValue(dataBucket, paths, value)
}
return dataBucket, nil
} }
type updateDataFn func(dataBucket interface{}, currentIndex int) interface{} type updateDataFn func(dataBucket interface{}, currentIndex int) interface{}
@ -410,23 +415,6 @@ func mergeYaml(args []string) (interface{}, error) {
return mapToMapSlice(updatedData), nil return mapToMapSlice(updatedData), nil
} }
func updateParsedData(parsedData yaml.MapSlice, writeCommands yaml.MapSlice, prependCommand string) (interface{}, error) {
var prefix = ""
if prependCommand != "" {
prefix = prependCommand + "."
}
for _, entry := range writeCommands {
path := prefix + entry.Key.(string)
value := entry.Value
var paths = parsePath(path)
parsedData = writeMap(parsedData, paths, value)
}
if prependCommand != "" {
return readMap(parsedData, prependCommand, make([]string, 0))
}
return parsedData, nil
}
func readWriteCommands(args []string, expectedArgs int, badArgsMessage string) (yaml.MapSlice, error) { func readWriteCommands(args []string, expectedArgs int, badArgsMessage string) (yaml.MapSlice, error) {
var writeCommands yaml.MapSlice var writeCommands yaml.MapSlice
if writeScript != "" { if writeScript != "" {