Fixed config loading, some formatting

This commit is contained in:
Matthieu Grieger 2014-12-15 16:41:15 -08:00
parent 687bef93c9
commit e7afe60331

View file

@ -9,6 +9,9 @@ package main
import (
"code.google.com/p/gcfg"
"errors"
"fmt"
"os/user"
)
type DjConfig struct {
@ -42,6 +45,11 @@ type DjConfig struct {
}
}
func loadConfiguration() (error) {
return gcfg.ReadFileInto(&dj.conf, "mumbledj.gcfg")
func loadConfiguration() error {
usr, err := user.Current()
if err == nil {
return gcfg.ReadFileInto(&dj.conf, fmt.Sprintf("%s/.mumbledj/config/mumbledj.gcfg", usr.HomeDir))
} else {
return errors.New("Configuration load failed.")
}
}