mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-28 20:39:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: allow jsonc

Browse source
This commit is contained in:
TravisTX 2020-12-20 18:20:48 -07:00 committed by Jan De Dobbeleer
parent 21f01d69e8
commit c8c027301d
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
go.mod
View file

@ -19,6 +19,7 @@ require (
golang.org/x/text v0.3.3
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 // indirect
muzzammil.xyz/jsonc v0.0.0-20200627155943-e1c384b63054
)
replace github.com/distatus/battery v0.10.1-0.20200722221337-7e1bf2bbb15c => github.com/JanDeDobbeleer/battery v0.10.1-0.20200909080331-bb0a7566dbb8

2
go.sum
View file

@ -57,3 +57,5 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C
howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 h1:AQkaJpH+/FmqRjmXZPELom5zIERYZfwTjnHpfoVMQEc=
howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
muzzammil.xyz/jsonc v0.0.0-20200627155943-e1c384b63054 h1:HhSLntk5Waqyx19MS886eRyllKmLtxBt6Lr0Z5Bk2bM=
muzzammil.xyz/jsonc v0.0.0-20200627155943-e1c384b63054/go.mod h1:rFv8tUUKe+QLh7v02BhfxXEf4ZHhYD7unR93HL/1Uvo=

12
settings.go
View file

@ -4,6 +4,8 @@ import (
"encoding/json"
"errors"
"os"
"muzzammil.xyz/jsonc"
)
// Settings holds all the theme for rendering the prompt
@ -67,15 +69,13 @@ func loadUserConfiguration(env environmentInfo) (*Settings, error) {
if _, err := os.Stat(settingsFile); os.IsNotExist(err) {
return nil, errors.New("INVALID CONFIG PATH")
}
defaultSettings, err := os.Open(settingsFile)
defer func() {
_ = defaultSettings.Close()
}()
_, j, err := jsonc.ReadFromFile(settingsFile)
if err != nil {
return nil, errors.New("UNABLE TO OPEN CONFIG")
}
jsonParser := json.NewDecoder(defaultSettings)
err = jsonParser.Decode(&settings)
err = json.Unmarshal(j, &settings)
if err != nil {
return nil, errors.New("INVALID CONFIG")
}