diff --git a/api/wire_gen.go b/api/wire_gen.go index e6e6ccdc0..966be65ad 100644 --- a/api/wire_gen.go +++ b/api/wire_gen.go @@ -8,9 +8,9 @@ package api import ( "github.com/cloudsonic/sonic-server/engine" "github.com/cloudsonic/sonic-server/itunesbridge" - "github.com/cloudsonic/sonic-server/persistence" + "github.com/cloudsonic/sonic-server/persistence/ledis" "github.com/deluan/gomate" - "github.com/deluan/gomate/ledis" + ledis2 "github.com/deluan/gomate/ledis" "github.com/google/wire" ) @@ -22,21 +22,21 @@ func initSystemController() *SystemController { } func initBrowsingController() *BrowsingController { - propertyRepository := persistence.NewPropertyRepository() - mediaFolderRepository := persistence.NewMediaFolderRepository() - artistIndexRepository := persistence.NewArtistIndexRepository() - artistRepository := persistence.NewArtistRepository() - albumRepository := persistence.NewAlbumRepository() - mediaFileRepository := persistence.NewMediaFileRepository() + propertyRepository := ledis.NewPropertyRepository() + mediaFolderRepository := ledis.NewMediaFolderRepository() + artistIndexRepository := ledis.NewArtistIndexRepository() + artistRepository := ledis.NewArtistRepository() + albumRepository := ledis.NewAlbumRepository() + mediaFileRepository := ledis.NewMediaFileRepository() browser := engine.NewBrowser(propertyRepository, mediaFolderRepository, artistIndexRepository, artistRepository, albumRepository, mediaFileRepository) browsingController := NewBrowsingController(browser) return browsingController } func initAlbumListController() *AlbumListController { - albumRepository := persistence.NewAlbumRepository() - mediaFileRepository := persistence.NewMediaFileRepository() - nowPlayingRepository := persistence.NewNowPlayingRepository() + albumRepository := ledis.NewAlbumRepository() + mediaFileRepository := ledis.NewMediaFileRepository() + nowPlayingRepository := ledis.NewNowPlayingRepository() listGenerator := engine.NewListGenerator(albumRepository, mediaFileRepository, nowPlayingRepository) albumListController := NewAlbumListController(listGenerator) return albumListController @@ -44,11 +44,11 @@ func initAlbumListController() *AlbumListController { func initMediaAnnotationController() *MediaAnnotationController { itunesControl := itunesbridge.NewItunesControl() - mediaFileRepository := persistence.NewMediaFileRepository() - nowPlayingRepository := persistence.NewNowPlayingRepository() + mediaFileRepository := ledis.NewMediaFileRepository() + nowPlayingRepository := ledis.NewNowPlayingRepository() scrobbler := engine.NewScrobbler(itunesControl, mediaFileRepository, nowPlayingRepository) - albumRepository := persistence.NewAlbumRepository() - artistRepository := persistence.NewArtistRepository() + albumRepository := ledis.NewAlbumRepository() + artistRepository := ledis.NewArtistRepository() ratings := engine.NewRatings(itunesControl, mediaFileRepository, albumRepository, artistRepository) mediaAnnotationController := NewMediaAnnotationController(scrobbler, ratings) return mediaAnnotationController @@ -56,17 +56,17 @@ func initMediaAnnotationController() *MediaAnnotationController { func initPlaylistsController() *PlaylistsController { itunesControl := itunesbridge.NewItunesControl() - playlistRepository := persistence.NewPlaylistRepository() - mediaFileRepository := persistence.NewMediaFileRepository() + playlistRepository := ledis.NewPlaylistRepository() + mediaFileRepository := ledis.NewMediaFileRepository() playlists := engine.NewPlaylists(itunesControl, playlistRepository, mediaFileRepository) playlistsController := NewPlaylistsController(playlists) return playlistsController } func initSearchingController() *SearchingController { - artistRepository := persistence.NewArtistRepository() - albumRepository := persistence.NewAlbumRepository() - mediaFileRepository := persistence.NewMediaFileRepository() + artistRepository := ledis.NewArtistRepository() + albumRepository := ledis.NewAlbumRepository() + mediaFileRepository := ledis.NewMediaFileRepository() db := newDB() search := engine.NewSearch(artistRepository, albumRepository, mediaFileRepository, db) searchingController := NewSearchingController(search) @@ -79,22 +79,22 @@ func initUsersController() *UsersController { } func initMediaRetrievalController() *MediaRetrievalController { - mediaFileRepository := persistence.NewMediaFileRepository() - albumRepository := persistence.NewAlbumRepository() + mediaFileRepository := ledis.NewMediaFileRepository() + albumRepository := ledis.NewAlbumRepository() cover := engine.NewCover(mediaFileRepository, albumRepository) mediaRetrievalController := NewMediaRetrievalController(cover) return mediaRetrievalController } func initStreamController() *StreamController { - mediaFileRepository := persistence.NewMediaFileRepository() + mediaFileRepository := ledis.NewMediaFileRepository() streamController := NewStreamController(mediaFileRepository) return streamController } // wire_injectors.go: -var allProviders = wire.NewSet(itunesbridge.NewItunesControl, persistence.Set, engine.Set, NewSystemController, +var allProviders = wire.NewSet(itunesbridge.NewItunesControl, ledis.Set, engine.Set, NewSystemController, NewBrowsingController, NewAlbumListController, NewMediaAnnotationController, @@ -107,5 +107,5 @@ var allProviders = wire.NewSet(itunesbridge.NewItunesControl, persistence.Set, e ) func newDB() gomate.DB { - return ledis.NewEmbeddedDB(persistence.Db()) + return ledis2.NewEmbeddedDB(ledis.Db()) } diff --git a/api/wire_injectors.go b/api/wire_injectors.go index b8eee4172..80beee0fd 100644 --- a/api/wire_injectors.go +++ b/api/wire_injectors.go @@ -5,7 +5,7 @@ package api import ( "github.com/cloudsonic/sonic-server/engine" "github.com/cloudsonic/sonic-server/itunesbridge" - "github.com/cloudsonic/sonic-server/persistence" + ledis2 "github.com/cloudsonic/sonic-server/persistence/ledis" "github.com/deluan/gomate" "github.com/deluan/gomate/ledis" "github.com/google/wire" @@ -13,7 +13,7 @@ import ( var allProviders = wire.NewSet( itunesbridge.NewItunesControl, - persistence.Set, + ledis2.Set, engine.Set, NewSystemController, NewBrowsingController, @@ -64,5 +64,5 @@ func initStreamController() *StreamController { } func newDB() gomate.DB { - return ledis.NewEmbeddedDB(persistence.Db()) + return ledis.NewEmbeddedDB(ledis2.Db()) } diff --git a/persistence/.goconvey.goconvey b/persistence/ledis/.goconvey.goconvey similarity index 100% rename from persistence/.goconvey.goconvey rename to persistence/ledis/.goconvey.goconvey diff --git a/persistence/album_repository.go b/persistence/ledis/album_repository.go similarity index 98% rename from persistence/album_repository.go rename to persistence/ledis/album_repository.go index b93b7c5ad..55d54dd95 100644 --- a/persistence/album_repository.go +++ b/persistence/ledis/album_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "errors" diff --git a/persistence/artist_repository.go b/persistence/ledis/artist_repository.go similarity index 97% rename from persistence/artist_repository.go rename to persistence/ledis/artist_repository.go index ec25ce4a0..378ed0e7e 100644 --- a/persistence/artist_repository.go +++ b/persistence/ledis/artist_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "errors" diff --git a/persistence/checksum_repository.go b/persistence/ledis/checksum_repository.go similarity index 98% rename from persistence/checksum_repository.go rename to persistence/ledis/checksum_repository.go index 6bf4e2647..31570be25 100644 --- a/persistence/checksum_repository.go +++ b/persistence/ledis/checksum_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "errors" diff --git a/persistence/index_repository.go b/persistence/ledis/index_repository.go similarity index 98% rename from persistence/index_repository.go rename to persistence/ledis/index_repository.go index 068380825..0aba67698 100644 --- a/persistence/index_repository.go +++ b/persistence/ledis/index_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "errors" diff --git a/persistence/index_repository_test.go b/persistence/ledis/index_repository_test.go similarity index 98% rename from persistence/index_repository_test.go rename to persistence/ledis/index_repository_test.go index cb73efdbf..ac166d274 100644 --- a/persistence/index_repository_test.go +++ b/persistence/ledis/index_repository_test.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "strconv" diff --git a/persistence/ledis.go b/persistence/ledis/ledis.go similarity index 96% rename from persistence/ledis.go rename to persistence/ledis/ledis.go index a864690be..da4c0a227 100644 --- a/persistence/ledis.go +++ b/persistence/ledis/ledis.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "sync" diff --git a/persistence/ledis_repository.go b/persistence/ledis/ledis_repository.go similarity index 99% rename from persistence/ledis_repository.go rename to persistence/ledis/ledis_repository.go index 2897c61c4..83dad793c 100644 --- a/persistence/ledis_repository.go +++ b/persistence/ledis/ledis_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "crypto/md5" diff --git a/persistence/ledis_repository_test.go b/persistence/ledis/ledis_repository_test.go similarity index 99% rename from persistence/ledis_repository_test.go rename to persistence/ledis/ledis_repository_test.go index 33c31ad9c..b11c46329 100644 --- a/persistence/ledis_repository_test.go +++ b/persistence/ledis/ledis_repository_test.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "fmt" diff --git a/persistence/mediafile_repository.go b/persistence/ledis/mediafile_repository.go similarity index 98% rename from persistence/mediafile_repository.go rename to persistence/ledis/mediafile_repository.go index cff7eee86..8d48181c6 100644 --- a/persistence/mediafile_repository.go +++ b/persistence/ledis/mediafile_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "errors" diff --git a/persistence/mediafolders_repository.go b/persistence/ledis/mediafolders_repository.go similarity index 96% rename from persistence/mediafolders_repository.go rename to persistence/ledis/mediafolders_repository.go index 62f7f4c5f..81b5dc384 100644 --- a/persistence/mediafolders_repository.go +++ b/persistence/ledis/mediafolders_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "github.com/cloudsonic/sonic-server/conf" diff --git a/persistence/nowplaying_repository.go b/persistence/ledis/nowplaying_repository.go similarity index 99% rename from persistence/nowplaying_repository.go rename to persistence/ledis/nowplaying_repository.go index 0b498e8a6..ce9907f35 100644 --- a/persistence/nowplaying_repository.go +++ b/persistence/ledis/nowplaying_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "encoding/json" diff --git a/persistence/playlist_repository.go b/persistence/ledis/playlist_repository.go similarity index 98% rename from persistence/playlist_repository.go rename to persistence/ledis/playlist_repository.go index b69d681e0..f56ebb0c5 100644 --- a/persistence/playlist_repository.go +++ b/persistence/ledis/playlist_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "errors" diff --git a/persistence/property_repository.go b/persistence/ledis/property_repository.go similarity index 97% rename from persistence/property_repository.go rename to persistence/ledis/property_repository.go index 716fce73f..4f5f05d3b 100644 --- a/persistence/property_repository.go +++ b/persistence/ledis/property_repository.go @@ -1,4 +1,4 @@ -package persistence +package ledis import ( "errors" diff --git a/persistence/wire_providers.go b/persistence/ledis/wire_providers.go similarity index 93% rename from persistence/wire_providers.go rename to persistence/ledis/wire_providers.go index 27d9ffc41..7cbf5e17b 100644 --- a/persistence/wire_providers.go +++ b/persistence/ledis/wire_providers.go @@ -1,4 +1,4 @@ -package persistence +package ledis import "github.com/google/wire" diff --git a/wire_gen.go b/wire_gen.go index 29bc81fea..65074ec93 100644 --- a/wire_gen.go +++ b/wire_gen.go @@ -8,24 +8,24 @@ package main import ( "github.com/cloudsonic/sonic-server/engine" "github.com/cloudsonic/sonic-server/itunesbridge" - "github.com/cloudsonic/sonic-server/persistence" + "github.com/cloudsonic/sonic-server/persistence/ledis" "github.com/cloudsonic/sonic-server/scanner" "github.com/deluan/gomate" - "github.com/deluan/gomate/ledis" + ledis2 "github.com/deluan/gomate/ledis" "github.com/google/wire" ) // Injectors from wire_injectors.go: func initImporter(musicFolder string) *scanner.Importer { - checkSumRepository := persistence.NewCheckSumRepository() + checkSumRepository := ledis.NewCheckSumRepository() itunesScanner := scanner.NewItunesScanner(checkSumRepository) - mediaFileRepository := persistence.NewMediaFileRepository() - albumRepository := persistence.NewAlbumRepository() - artistRepository := persistence.NewArtistRepository() - artistIndexRepository := persistence.NewArtistIndexRepository() - playlistRepository := persistence.NewPlaylistRepository() - propertyRepository := persistence.NewPropertyRepository() + mediaFileRepository := ledis.NewMediaFileRepository() + albumRepository := ledis.NewAlbumRepository() + artistRepository := ledis.NewArtistRepository() + artistIndexRepository := ledis.NewArtistIndexRepository() + playlistRepository := ledis.NewPlaylistRepository() + propertyRepository := ledis.NewPropertyRepository() db := newDB() search := engine.NewSearch(artistRepository, albumRepository, mediaFileRepository, db) importer := scanner.NewImporter(musicFolder, itunesScanner, mediaFileRepository, albumRepository, artistRepository, artistIndexRepository, playlistRepository, propertyRepository, search) @@ -34,8 +34,8 @@ func initImporter(musicFolder string) *scanner.Importer { // wire_injectors.go: -var allProviders = wire.NewSet(itunesbridge.NewItunesControl, persistence.Set, engine.Set, scanner.Set, newDB) +var allProviders = wire.NewSet(itunesbridge.NewItunesControl, ledis.Set, engine.Set, scanner.Set, newDB) func newDB() gomate.DB { - return ledis.NewEmbeddedDB(persistence.Db()) + return ledis2.NewEmbeddedDB(ledis.Db()) } diff --git a/wire_injectors.go b/wire_injectors.go index 1b999fa1e..2887d4569 100644 --- a/wire_injectors.go +++ b/wire_injectors.go @@ -5,7 +5,7 @@ package main import ( "github.com/cloudsonic/sonic-server/engine" "github.com/cloudsonic/sonic-server/itunesbridge" - "github.com/cloudsonic/sonic-server/persistence" + ledis2 "github.com/cloudsonic/sonic-server/persistence/ledis" "github.com/cloudsonic/sonic-server/scanner" "github.com/deluan/gomate" "github.com/deluan/gomate/ledis" @@ -14,7 +14,7 @@ import ( var allProviders = wire.NewSet( itunesbridge.NewItunesControl, - persistence.Set, + ledis2.Set, engine.Set, scanner.Set, newDB, @@ -25,5 +25,5 @@ func initImporter(musicFolder string) *scanner.Importer { } func newDB() gomate.DB { - return ledis.NewEmbeddedDB(persistence.Db()) + return ledis.NewEmbeddedDB(ledis2.Db()) }