Skip to content

Commit

Permalink
refactor: do not merge settings
Browse files Browse the repository at this point in the history
This feature no longer serves its purpose
  • Loading branch information
JanDeDobbeleer committed Sep 20, 2020
1 parent 2603ff5 commit 8a3f330
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 23 deletions.
9 changes: 0 additions & 9 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Gopkg.toml
Expand Up @@ -34,10 +34,6 @@
name = "golang.org/x/text"
source = "golang.org/x/text"

[[constraint]]
version = "v0.3.7"
name = "github.com/imdario/mergo"

[[constraint]]
name = "github.com/stretchr/testify"
version = "1.3.0"
Expand Down
19 changes: 9 additions & 10 deletions settings.go
Expand Up @@ -4,8 +4,6 @@ import (
"encoding/json"
"fmt"
"os"

"github.com/imdario/mergo"
)

//Settings holds all the theme for rendering the prompt
Expand Down Expand Up @@ -45,15 +43,16 @@ type Block struct {

//GetSettings returns the default configuration including possible user overrides
func GetSettings(env environmentInfo) *Settings {
defaultSettings := getDefaultSettings()
settings := loadUserConfiguration(env)
_ = mergo.Merge(settings, defaultSettings)
settings, err := loadUserConfiguration(env)
if err != nil {
return getDefaultSettings()
}
return settings
}

func loadUserConfiguration(env environmentInfo) *Settings {
func loadUserConfiguration(env environmentInfo) (*Settings, error) {
var settings Settings
settingsFileLocation := fmt.Sprintf("%s/.go_my_psh", env.getenv("HOME"))
settingsFileLocation := fmt.Sprintf("%s/.go_my_posh", env.getenv("HOME"))
if _, err := os.Stat(*env.getArgs().Config); !os.IsNotExist(err) {
settingsFileLocation = *env.getArgs().Config
}
Expand All @@ -62,11 +61,11 @@ func loadUserConfiguration(env environmentInfo) *Settings {
_ = defaultSettings.Close()
}()
if err != nil {
return &settings
return nil, err
}
jsonParser := json.NewDecoder(defaultSettings)
_ = jsonParser.Decode(&settings)
return &settings
err = jsonParser.Decode(&settings)
return &settings, err
}

func getDefaultSettings() *Settings {
Expand Down

0 comments on commit 8a3f330

Please sign in to comment.