arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Renamed persistence packages

Browse Source
This commit is contained in:
Deluan
2020-01-10 19:41:35 -05:00
committed by Deluan Quintão
parent a1d837cb9b
commit 11f4505925
34 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/browsing.go
+1 -1
View File
@@ -47,7 +47,7 @@ func (c *BrowsingController) getArtistIndex(r *http.Request, ifModifiedSince tim
res.Index = make([]responses.Index, len(indexes))
for i, idx := range indexes {
res.Index[i].Name = idx.Id
res.Index[i].Name = idx.ID
res.Index[i].Artists = make([]responses.Artist, len(idx.Artists))
for j, a := range idx.Artists {
res.Index[i].Artists[j].Id = a.ArtistID
api/wire_gen.go
+26 -26
View File
@@ -8,10 +8,10 @@ package api
import (
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/itunesbridge"
"github.com/cloudsonic/sonic-server/persistence/ledis"
"github.com/cloudsonic/sonic-server/persistence/storm"
"github.com/cloudsonic/sonic-server/persistence/db_ledis"
"github.com/cloudsonic/sonic-server/persistence/db_storm"
"github.com/deluan/gomate"
ledis2 "github.com/deluan/gomate/ledis"
"github.com/deluan/gomate/ledis"
"github.com/google/wire"
)
@@ -23,21 +23,21 @@ func initSystemController() *SystemController {
}
func initBrowsingController() *BrowsingController {
propertyRepository := storm.NewPropertyRepository()
mediaFolderRepository := ledis.NewMediaFolderRepository()
artistIndexRepository := ledis.NewArtistIndexRepository()
artistRepository := storm.NewArtistRepository()
albumRepository := storm.NewAlbumRepository()
mediaFileRepository := storm.NewMediaFileRepository()
propertyRepository := db_storm.NewPropertyRepository()
mediaFolderRepository := db_ledis.NewMediaFolderRepository()
artistIndexRepository := db_storm.NewArtistIndexRepository()
artistRepository := db_storm.NewArtistRepository()
albumRepository := db_storm.NewAlbumRepository()
mediaFileRepository := db_storm.NewMediaFileRepository()
browser := engine.NewBrowser(propertyRepository, mediaFolderRepository, artistIndexRepository, artistRepository, albumRepository, mediaFileRepository)
browsingController := NewBrowsingController(browser)
return browsingController
}
func initAlbumListController() *AlbumListController {
albumRepository := storm.NewAlbumRepository()
mediaFileRepository := storm.NewMediaFileRepository()
nowPlayingRepository := ledis.NewNowPlayingRepository()
albumRepository := db_storm.NewAlbumRepository()
mediaFileRepository := db_storm.NewMediaFileRepository()
nowPlayingRepository := db_ledis.NewNowPlayingRepository()
listGenerator := engine.NewListGenerator(albumRepository, mediaFileRepository, nowPlayingRepository)
albumListController := NewAlbumListController(listGenerator)
return albumListController
@@ -45,11 +45,11 @@ func initAlbumListController() *AlbumListController {
func initMediaAnnotationController() *MediaAnnotationController {
itunesControl := itunesbridge.NewItunesControl()
mediaFileRepository := storm.NewMediaFileRepository()
nowPlayingRepository := ledis.NewNowPlayingRepository()
mediaFileRepository := db_storm.NewMediaFileRepository()
nowPlayingRepository := db_ledis.NewNowPlayingRepository()
scrobbler := engine.NewScrobbler(itunesControl, mediaFileRepository, nowPlayingRepository)
albumRepository := storm.NewAlbumRepository()
artistRepository := storm.NewArtistRepository()
albumRepository := db_storm.NewAlbumRepository()
artistRepository := db_storm.NewArtistRepository()
ratings := engine.NewRatings(itunesControl, mediaFileRepository, albumRepository, artistRepository)
mediaAnnotationController := NewMediaAnnotationController(scrobbler, ratings)
return mediaAnnotationController
@@ -57,17 +57,17 @@ func initMediaAnnotationController() *MediaAnnotationController {
func initPlaylistsController() *PlaylistsController {
itunesControl := itunesbridge.NewItunesControl()
playlistRepository := ledis.NewPlaylistRepository()
mediaFileRepository := storm.NewMediaFileRepository()
playlistRepository := db_ledis.NewPlaylistRepository()
mediaFileRepository := db_storm.NewMediaFileRepository()
playlists := engine.NewPlaylists(itunesControl, playlistRepository, mediaFileRepository)
playlistsController := NewPlaylistsController(playlists)
return playlistsController
}
func initSearchingController() *SearchingController {
artistRepository := storm.NewArtistRepository()
albumRepository := storm.NewAlbumRepository()
mediaFileRepository := storm.NewMediaFileRepository()
artistRepository := db_storm.NewArtistRepository()
albumRepository := db_storm.NewAlbumRepository()
mediaFileRepository := db_storm.NewMediaFileRepository()
db := newDB()
search := engine.NewSearch(artistRepository, albumRepository, mediaFileRepository, db)
searchingController := NewSearchingController(search)
@@ -80,22 +80,22 @@ func initUsersController() *UsersController {
}
func initMediaRetrievalController() *MediaRetrievalController {
mediaFileRepository := storm.NewMediaFileRepository()
albumRepository := storm.NewAlbumRepository()
mediaFileRepository := db_storm.NewMediaFileRepository()
albumRepository := db_storm.NewAlbumRepository()
cover := engine.NewCover(mediaFileRepository, albumRepository)
mediaRetrievalController := NewMediaRetrievalController(cover)
return mediaRetrievalController
}
func initStreamController() *StreamController {
mediaFileRepository := storm.NewMediaFileRepository()
mediaFileRepository := db_storm.NewMediaFileRepository()
streamController := NewStreamController(mediaFileRepository)
return streamController
}
// wire_injectors.go:
var allProviders = wire.NewSet(itunesbridge.NewItunesControl, ledis.Set, storm.Set, engine.Set, NewSystemController,
var allProviders = wire.NewSet(itunesbridge.NewItunesControl, db_ledis.Set, db_storm.Set, engine.Set, NewSystemController,
NewBrowsingController,
NewAlbumListController,
NewMediaAnnotationController,
@@ -108,5 +108,5 @@ var allProviders = wire.NewSet(itunesbridge.NewItunesControl, ledis.Set, storm.S
)
func newDB() gomate.DB {
return ledis2.NewEmbeddedDB(ledis.Db())
return ledis.NewEmbeddedDB(db_ledis.Db())
}
api/wire_injectors.go
+5 -5
View File
@@ -5,8 +5,8 @@ package api
import (
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/itunesbridge"
ledis2 "github.com/cloudsonic/sonic-server/persistence/ledis"
"github.com/cloudsonic/sonic-server/persistence/storm"
"github.com/cloudsonic/sonic-server/persistence/db_ledis"
"github.com/cloudsonic/sonic-server/persistence/db_storm"
"github.com/deluan/gomate"
"github.com/deluan/gomate/ledis"
"github.com/google/wire"
@@ -14,8 +14,8 @@ import (
var allProviders = wire.NewSet(
itunesbridge.NewItunesControl,
ledis2.Set,
storm.Set,
db_ledis.Set,
db_storm.Set,
engine.Set,
NewSystemController,
NewBrowsingController,
@@ -66,5 +66,5 @@ func initStreamController() *StreamController {
}
func newDB() gomate.DB {
return ledis.NewEmbeddedDB(ledis2.Db())
return ledis.NewEmbeddedDB(db_ledis.Db())
}