suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-10 16:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

detect inputFormat from filename

Browse Source
This commit is contained in:
ryenus 2023-03-02 17:04:34 +08:00
parent fed96f67ea
commit 66af38d4ca
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/constant.go
View File

@ -7,7 +7,8 @@ var unwrapScalar = false
var writeInplace = false var writeInplace = false
var outputToJSON = false var outputToJSON = false
var outputFormat = "yaml" var outputFormat = "yaml"
var inputFormat = "yaml" var inputFormatDefault = "yaml"
var inputFormat = "" // default to "" so that we can (lazily) detect inputFormat from input filename
var exitStatus = false var exitStatus = false
var forceColor = false var forceColor = false

2
cmd/evaluate_all_command.go
View File

@ -75,7 +75,7 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
return err return err
} }
decoder, err := configureDecoder(true) decoder, err := configureDecoder(true, args[0])
if err != nil { if err != nil {
return err return err
} }

2
cmd/evalute_sequence_command.go
View File

@ -100,7 +100,7 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
printer := yqlib.NewPrinter(encoder, printerWriter) printer := yqlib.NewPrinter(encoder, printerWriter)
decoder, err := configureDecoder(false) decoder, err := configureDecoder(false, args[0])
if err != nil { if err != nil {
return err return err
} }

2
cmd/root.go
View File

@ -85,7 +85,7 @@ yq -P sample.json
} }
rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "o", "yaml", "[yaml|y|json|j|props|p|xml|x] output format type.") rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "o", "yaml", "[yaml|y|json|j|props|p|xml|x] output format type.")
rootCmd.PersistentFlags().StringVarP(&inputFormat, "input-format", "p", "yaml", "[yaml|y|props|p|xml|x] parse format for input. Note that json is a subset of yaml.") rootCmd.PersistentFlags().StringVarP(&inputFormat, "input-format", "p", "", "[yaml|y|props|p|xml|x] parse format for input. Note that json is a subset of yaml.") // use "" as default instead of "yaml", to be able to detect from input filename
rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.AttributePrefix, "xml-attribute-prefix", yqlib.ConfiguredXMLPreferences.AttributePrefix, "prefix for xml attributes") rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.AttributePrefix, "xml-attribute-prefix", yqlib.ConfiguredXMLPreferences.AttributePrefix, "prefix for xml attributes")
rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.ContentName, "xml-content-name", yqlib.ConfiguredXMLPreferences.ContentName, "name for xml content (if no attribute name is present).") rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.ContentName, "xml-content-name", yqlib.ConfiguredXMLPreferences.ContentName, "name for xml content (if no attribute name is present).")

11
cmd/utils.go
View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"strings"
"github.com/mikefarah/yq/v4/pkg/yqlib" "github.com/mikefarah/yq/v4/pkg/yqlib"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -56,7 +57,15 @@ func initCommand(cmd *cobra.Command, args []string) (string, []string, error) {
return expression, args, nil return expression, args, nil
} }
func configureDecoder(evaluateTogether bool) (yqlib.Decoder, error) { func configureDecoder(evaluateTogether bool, inputFilename string) (yqlib.Decoder, error) {
if inputFormat == "" && inputFilename != "" {
nPos := strings.LastIndex(inputFilename, ".")
if nPos > -1 {
inputFormat = inputFilename[nPos+1:]
} else {
inputFormat = inputFormatDefault
}
}
yqlibInputFormat, err := yqlib.InputFormatFromString(inputFormat) yqlibInputFormat, err := yqlib.InputFormatFromString(inputFormat)
if err != nil { if err != nil {
return nil, err return nil, err

2
pkg/yqlib/decoder.go
View File

@ -25,7 +25,7 @@ type Decoder interface {
func InputFormatFromString(format string) (InputFormat, error) { func InputFormatFromString(format string) (InputFormat, error) {
switch format { switch format {
case "yaml", "y": case "yaml", "yml", "y":
return YamlInputFormat, nil return YamlInputFormat, nil
case "xml", "x": case "xml", "x":
return XMLInputFormat, nil return XMLInputFormat, nil