glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-10 22:27:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 9656971389 into 3349bd9cc2

Browse source
This commit is contained in:
Kristin Laemmert 2019-06-15 15:58:36 +00:00 • committed by GitHub
commit b4264bedbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
viper.go
View file

@ -1346,14 +1346,11 @@ func (v *Viper) SafeWriteConfigAs(filename string) error {
func writeConfig(filename string, force bool) error { return v.writeConfig(filename, force) } func writeConfig(filename string, force bool) error { return v.writeConfig(filename, force) }
func (v *Viper) writeConfig(filename string, force bool) error { func (v *Viper) writeConfig(filename string, force bool) error {
jww.INFO.Println("Attempting to write configuration to file.") jww.INFO.Println("Attempting to write configuration to file.")
ext := filepath.Ext(filename)
if len(ext) <= 1 { if !stringInSlice(v.getConfigType(), SupportedExts) {
return fmt.Errorf("Filename: %s requires valid extension.", filename) return UnsupportedConfigError(v.getConfigType())
}
configType := ext[1:]
if !stringInSlice(configType, SupportedExts) {
return UnsupportedConfigError(configType)
} }
if v.config == nil { if v.config == nil {
v.config = make(map[string]interface{}) v.config = make(map[string]interface{})
} }
@ -1371,7 +1368,7 @@ func (v *Viper) writeConfig(filename string, force bool) error {
if err != nil { if err != nil {
return err return err
} }
return v.marshalWriter(f, configType) return v.marshalWriter(f, v.getConfigType())
} }
// Unmarshal a Reader into a map. // Unmarshal a Reader into a map.