From d25ce44708c6eb30555fff60b9852869f3ffca7f Mon Sep 17 00:00:00 2001 From: Rodrigo Chiossi Date: Wed, 25 Jul 2018 21:03:16 +0000 Subject: [PATCH] config: Add default values on conversion When config is created during mixer init, default values are set for all variables. To mimic this behavior, LoadDefaults must be called on conversion as well. There is also no need to perform a conversion if the parsed version number is the same as the current version number. Signed-off-by: Rodrigo Chiossi --- config/config.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/config.go b/config/config.go index e6c3ecb..701dba6 100644 --- a/config/config.go +++ b/config/config.go @@ -449,10 +449,22 @@ func (config *MixConfig) Convert(filename string) error { return err } + if err := config.LoadDefaults(false); err != nil { + return err + } + + // Reset version for files without versioning + config.version = "0.0" + if err := config.Parse(); err != nil { return err } + // Config is already in the current format + if config.version == CurrentConfigVersion { + return nil + } + if err := helpers.CopyFile(config.filename+".bkp", config.filename); err != nil { return err }