MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-03 01:46:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

quick: Simplify Load() and CheckVersion() (#3831)

Browse Source
This commit is contained in:
Anis Elleuch 2017-03-02 19:29:07 +01:00 committed by Harshavardhana
parent d1afd16955
commit a179fc9658
1 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/quick/quick.go
View File

@ -85,34 +85,12 @@ func New(data interface{}) (Config, error) {
// CheckVersion - loads json and compares the version number provided returns back true or false - any failure // CheckVersion - loads json and compares the version number provided returns back true or false - any failure
// is returned as error. // is returned as error.
func CheckVersion(filename string, version string) (bool, error) { func CheckVersion(filename string, version string) (bool, error) {
_, err := os.Stat(filename)
if err != nil {
return false, err
}
fileData, err := ioutil.ReadFile(filename)
if err != nil {
return false, err
}
if runtime.GOOS == "windows" {
fileData = []byte(strings.Replace(string(fileData), "\r\n", "\n", -1))
}
data := struct { data := struct {
Version string Version string
}{ }{
Version: "", Version: "",
} }
err = json.Unmarshal(fileData, &data) config, err := Load(filename, &data)
if err != nil {
switch err := err.(type) {
case *json.SyntaxError:
return false, FormatJSONSyntaxError(bytes.NewReader(fileData), err)
default:
return false, err
}
}
config, err := New(data)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -124,35 +102,14 @@ func CheckVersion(filename string, version string) (bool, error) {
// Load - loads json config from filename for the a given struct data // Load - loads json config from filename for the a given struct data
func Load(filename string, data interface{}) (Config, error) { func Load(filename string, data interface{}) (Config, error) {
_, err := os.Stat(filename)
if err != nil {
return nil, err
}
fileData, err := ioutil.ReadFile(filename)
if err != nil {
return nil, err
}
if runtime.GOOS == "windows" {
fileData = []byte(strings.Replace(string(fileData), "\r\n", "\n", -1))
}
err = json.Unmarshal(fileData, &data)
if err != nil {
switch err := err.(type) {
case *json.SyntaxError:
return nil, FormatJSONSyntaxError(bytes.NewReader(fileData), err)
default:
return nil, err
}
}
config, err := New(data) config, err := New(data)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = config.Load(filename)
if err != nil {
return nil, err
}
return config, nil return config, nil
} }