mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Simplified DI resolution

Browse source
This commit is contained in:
Deluan 2016-03-11 15:16:17 -05:00
parent e9861e1b26
commit f4c1dbdd3c
8 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/browsing.go
View file

@ -7,7 +7,6 @@ import (
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
)
type BrowsingController struct {
@ -16,7 +15,7 @@ type BrowsingController struct {
}
func (c *BrowsingController) Prepare() {
inject.ExtractAssignable(utils.Graph, &c.browser)
utils.ResolveDependencies(&c.browser)
}
func (c *BrowsingController) GetMediaFolders() {

3
api/get_album_list.go
View file

@ -8,7 +8,6 @@ import (
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
)
type GetAlbumListController struct {
@ -20,7 +19,7 @@ type GetAlbumListController struct {
type strategy func(offset int, size int) (*domain.Albums, error)
func (c *GetAlbumListController) Prepare() {
inject.ExtractAssignable(utils.Graph, &c.listGen)
utils.ResolveDependencies(&c.listGen)
c.types = map[string]strategy{
"random": func(o int, s int) (*domain.Albums, error) { return c.listGen.GetRandom(o, s) },

3
api/get_cover_art.go
View file

@ -5,7 +5,6 @@ import (
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
)
type GetCoverArtController struct {
@ -14,7 +13,7 @@ type GetCoverArtController struct {
}
func (c *GetCoverArtController) Prepare() {
inject.ExtractAssignable(utils.Graph, &c.cover)
utils.ResolveDependencies(&c.cover)
}
func (c *GetCoverArtController) Get() {

3
api/playlists.go
View file

@ -5,7 +5,6 @@ import (
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
)
type PlaylistsController struct {
@ -14,7 +13,7 @@ type PlaylistsController struct {
}
func (c *PlaylistsController) Prepare() {
inject.ExtractAssignable(utils.Graph, &c.pls)
utils.ResolveDependencies(&c.pls)
}
func (c *PlaylistsController) GetAll() {

3
api/searching.go
View file

@ -5,7 +5,6 @@ import (
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
)
type SearchingController struct {
@ -14,7 +13,7 @@ type SearchingController struct {
}
func (c *SearchingController) Prepare() {
inject.ExtractAssignable(utils.Graph, &c.search)
utils.ResolveDependencies(&c.search)
}
func (c *SearchingController) Search2() {

3
api/stream.go
View file

@ -6,7 +6,6 @@ import (
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/karlkfi/inject"
)
type StreamController struct {
@ -17,7 +16,7 @@ type StreamController struct {
}
func (c *StreamController) Prepare() {
inject.ExtractAssignable(utils.Graph, &c.repo)
utils.ResolveDependencies(&c.repo)
c.id = c.RequiredParamString("id", "id parameter required")

10
scanner/importer.go
View file

@ -27,14 +27,8 @@ func StartImport() {
go func() {
// TODO Move all to DI
i := &Importer{mediaFolder: beego.AppConfig.String("musicFolder")}
utils.ResolveDependency(&i.mfRepo)
utils.ResolveDependency(&i.albumRepo)
utils.ResolveDependency(&i.artistRepo)
utils.ResolveDependency(&i.idxRepo)
utils.ResolveDependency(&i.plsRepo)
utils.ResolveDependency(&i.propertyRepo)
utils.ResolveDependency(&i.search)
utils.ResolveDependency(&i.scanner)
utils.ResolveDependencies(&i.mfRepo, &i.albumRepo, &i.artistRepo, &i.idxRepo, &i.plsRepo,
&i.propertyRepo, &i.search, &i.scanner)
i.Run()
}()
}

6
utils/graph.go
View file

@ -25,8 +25,10 @@ func DefineSingleton(ptr interface{}, constructor interface{}) interface{} {
return ptr
}
func ResolveDependency(ptr interface{}) {
inject.ExtractAssignable(Graph, ptr)
func ResolveDependencies(ptrs ...interface{}) {
for _, p := range ptrs {
inject.ExtractAssignable(Graph, p)
}
}
func init() {