Moved ledis implementation to a new package

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()
+	propertyRepository := ledis.NewPropertyRepository()
-	mediaFolderRepository := persistence.NewMediaFolderRepository()
+	mediaFolderRepository := ledis.NewMediaFolderRepository()
-	artistIndexRepository := persistence.NewArtistIndexRepository()
+	artistIndexRepository := ledis.NewArtistIndexRepository()
-	artistRepository := persistence.NewArtistRepository()
+	artistRepository := ledis.NewArtistRepository()
-	albumRepository := persistence.NewAlbumRepository()
+	albumRepository := ledis.NewAlbumRepository()
-	mediaFileRepository := persistence.NewMediaFileRepository()
+	mediaFileRepository := ledis.NewMediaFileRepository()
 	browser := engine.NewBrowser(propertyRepository, mediaFolderRepository, artistIndexRepository, artistRepository, albumRepository, mediaFileRepository)
 	browsingController := NewBrowsingController(browser)
 	return browsingController
 }
 
 func initAlbumListController() *AlbumListController {
-	albumRepository := persistence.NewAlbumRepository()
+	albumRepository := ledis.NewAlbumRepository()
-	mediaFileRepository := persistence.NewMediaFileRepository()
+	mediaFileRepository := ledis.NewMediaFileRepository()
-	nowPlayingRepository := persistence.NewNowPlayingRepository()
+	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()
+	mediaFileRepository := ledis.NewMediaFileRepository()
-	nowPlayingRepository := persistence.NewNowPlayingRepository()
+	nowPlayingRepository := ledis.NewNowPlayingRepository()
 	scrobbler := engine.NewScrobbler(itunesControl, mediaFileRepository, nowPlayingRepository)
-	albumRepository := persistence.NewAlbumRepository()
+	albumRepository := ledis.NewAlbumRepository()
-	artistRepository := persistence.NewArtistRepository()
+	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()
+	playlistRepository := ledis.NewPlaylistRepository()
-	mediaFileRepository := persistence.NewMediaFileRepository()
+	mediaFileRepository := ledis.NewMediaFileRepository()
 	playlists := engine.NewPlaylists(itunesControl, playlistRepository, mediaFileRepository)
 	playlistsController := NewPlaylistsController(playlists)
 	return playlistsController
 }
 
 func initSearchingController() *SearchingController {
-	artistRepository := persistence.NewArtistRepository()
+	artistRepository := ledis.NewArtistRepository()
-	albumRepository := persistence.NewAlbumRepository()
+	albumRepository := ledis.NewAlbumRepository()
-	mediaFileRepository := persistence.NewMediaFileRepository()
+	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()
+	mediaFileRepository := ledis.NewMediaFileRepository()
-	albumRepository := persistence.NewAlbumRepository()
+	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())
 }

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())
 }

persistence/ledis/album_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"errors"

persistence/ledis/artist_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"errors"

persistence/ledis/checksum_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"errors"

persistence/ledis/index_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"errors"

persistence/ledis/index_repository_test.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"strconv"

persistence/ledis/ledis.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"sync"

persistence/ledis/ledis_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"crypto/md5"

persistence/ledis/ledis_repository_test.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"fmt"

persistence/ledis/mediafile_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"errors"

persistence/ledis/mediafolders_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"github.com/cloudsonic/sonic-server/conf"

persistence/ledis/nowplaying_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"encoding/json"

persistence/ledis/playlist_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"errors"

persistence/ledis/property_repository.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import (
 	"errors"

persistence/ledis/wire_providers.go

@@ -1,4 +1,4 @@
-package persistence
+package ledis
 
 import "github.com/google/wire"
 

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()
+	mediaFileRepository := ledis.NewMediaFileRepository()
-	albumRepository := persistence.NewAlbumRepository()
+	albumRepository := ledis.NewAlbumRepository()
-	artistRepository := persistence.NewArtistRepository()
+	artistRepository := ledis.NewArtistRepository()
-	artistIndexRepository := persistence.NewArtistIndexRepository()
+	artistIndexRepository := ledis.NewArtistIndexRepository()
-	playlistRepository := persistence.NewPlaylistRepository()
+	playlistRepository := ledis.NewPlaylistRepository()
-	propertyRepository := persistence.NewPropertyRepository()
+	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())
 }

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())
 }