New configuration system

This commit is contained in:
Deluan
2016-03-30 00:05:57 -04:00
parent 9049d97820
commit c2b1f9782b
14 changed files with 101 additions and 41 deletions
+2 -2
View File
@@ -3,7 +3,7 @@ package persistence
import (
"sync"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/conf"
"github.com/siddontang/ledisdb/config"
"github.com/siddontang/ledisdb/ledis"
)
@@ -17,7 +17,7 @@ var (
func Db() *ledis.DB {
once.Do(func() {
config := config.NewConfigDefault()
config.DataDir = beego.AppConfig.String("dbPath")
config.DataDir = conf.GoSonic.DbPath
l, _ := ledis.Open(config)
instance, err := l.Select(0)
if err != nil {
+2 -2
View File
@@ -1,7 +1,7 @@
package persistence
import (
"github.com/astaxie/beego"
"github.com/deluan/gosonic/conf"
"github.com/deluan/gosonic/domain"
)
@@ -14,7 +14,7 @@ func NewMediaFolderRepository() domain.MediaFolderRepository {
}
func (*mediaFolderRepository) GetAll() (domain.MediaFolders, error) {
mediaFolder := domain.MediaFolder{Id: "0", Name: "iTunes Library", Path: beego.AppConfig.String("musicFolder")}
mediaFolder := domain.MediaFolder{Id: "0", Name: "iTunes Library", Path: conf.GoSonic.MusicFolder}
result := make(domain.MediaFolders, 1)
result[0] = mediaFolder
return result, nil