New configuration system

conf/app.conf

@@ -1,34 +1,15 @@
 appname = github.com/deluan/gosonic
 serverName = GoSonic
-httpPort = 8080
 runMode = dev
 autoRender = false
 copyRequestBody = true
-enableAdmin = true
+enableAdmin = false
 
 apiVersion = 1.8.0
-ignoredArticles="The El La Los Las Le Les Os As O A"
-indexGroups=A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)
-
-musicFolder=./iTunes1.xml
-user=deluan
-password=wordpass
-dbPath=./devDb
-enableDownsampling = true
-downsampleCommand=ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -
-plsIgnoreFolders = true
-plsIgnoredPatterns = ^iCloud;^CDs para;^Skipped;Christian
 
 [dev]
-disableValidation = true
 enableAdmin = true
 
 [test]
 enableAdmin = false
-disableValidation = false
 httpPort = 8081
-user = deluan
-password = wordpass
-dbPath = /tmp/testDb
-musicFolder = ./tests/itunes-library.xml
-downsampleCommand = ffmpeg -i %s -b:a %bk mp3 -

conf/configuration.go

@@ -0,0 +1,57 @@
+package conf
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/koding/multiconfig"
+)
+
+type goSonic struct {
+	Port        int    `default:"8080"`
+	MusicFolder string `default:"./iTunes1.xml"`
+	DbPath      string `default:"./devDb"`
+
+	IgnoredArticles string `default:"The El La Los Las Le Les Os As O A"`
+	IndexGroups     string `default:"A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)"`
+
+	User     string `default:"deluan"`
+	Password string `default:"wordpass"`
+
+	DisableDownsampling bool   `default:"false"`
+	DisableValidation   bool   `default:"false"`
+	DownsampleCommand   string `default:"ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -"`
+	PlsIgnoreFolders    bool   `default:"true"`
+	PlsIgnoredPatterns  string `default:"^iCloud;^CDs para;^Skipped;Christian"`
+	RunMode             string `default:"dev"`
+}
+
+var GoSonic *goSonic
+
+func LoadFromFlags() {
+	l := &multiconfig.FlagLoader{}
+	l.Load(GoSonic)
+}
+
+func LoadFromFile(tomlFile string) {
+	l := &multiconfig.TOMLLoader{Path: tomlFile}
+	err := l.Load(GoSonic)
+	if err != nil {
+		fmt.Printf("Error loading %s: %v\n", tomlFile, err)
+	}
+}
+
+func LoadFromLocalFile() {
+	if _, err := os.Stat("./gosonic.toml"); err == nil {
+		LoadFromFile("./gosonic.toml")
+	}
+}
+
+func init() {
+	GoSonic = new(goSonic)
+	var l multiconfig.Loader
+	l = &multiconfig.TagLoader{}
+	l.Load(GoSonic)
+	l = &multiconfig.EnvironmentLoader{}
+	l.Load(GoSonic)
+}