towk/makeshift
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

refactor: minor changes and fixes

Browse source
This commit is contained in:
David Allen 2025-08-30 00:23:53 -06:00
parent b791b84890
commit dc8a9cff20
Signed by: towk
GPG key ID: 0430CDBE22619155
5 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/format/format.go
View file

@ -11,9 +11,9 @@ import (
type DataFormat string
const (
List DataFormat = "list"
JSON DataFormat = "json"
FORMAT_YAML DataFormat = "yaml"
List DataFormat = "list"
JSON DataFormat = "json"
YAML DataFormat = "yaml"
)
func (df DataFormat) String() string {
@ -22,12 +22,12 @@ func (df DataFormat) String() string {
func (df *DataFormat) Set(v string) error {
switch DataFormat(v) {
case List, JSON, FORMAT_YAML:
case List, JSON, YAML:
*df = DataFormat(v)
return nil
default:
return fmt.Errorf("must be one of %v", []DataFormat{
List, JSON, FORMAT_YAML,
List, JSON, YAML,
})
}
}
@ -48,7 +48,7 @@ func Marshal(data interface{}, outFormat DataFormat) ([]byte, error) {
} else {
return bytes, nil
}
case FORMAT_YAML:
case YAML:
if bytes, err := yaml.Marshal(data); err != nil {
return nil, fmt.Errorf("failed to marshal data into YAML: %w", err)
} else {
@ -72,7 +72,7 @@ func Unmarshal(data []byte, v interface{}, inFormat DataFormat) error {
if err := json.Unmarshal(data, v); err != nil {
return fmt.Errorf("failed to unmarshal data into JSON: %w", err)
}
case FORMAT_YAML:
case YAML:
if err := yaml.Unmarshal(data, v); err != nil {
return fmt.Errorf("failed to unmarshal data into YAML: %w", err)
}
@ -98,7 +98,7 @@ func DataFormatFromFileExt(path string, defaultFmt DataFormat) DataFormat {
return JSON
case ".yaml", ".yml", ".YAML", ".YML":
// The file is a YAML file
return FORMAT_YAML
return YAML
}
return defaultFmt
}