Renamed persistence packages

api/browsing.go

@@ -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

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

domain/index.go

@@ -9,7 +9,7 @@ type ArtistInfo struct {
 }
 
 type ArtistIndex struct {
-	Id      string
+	ID      string
 	Artists ArtistInfos
 }
 

persistence/db_ledis/album_repository.go

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

persistence/db_ledis/artist_repository.go

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

persistence/db_ledis/checksum_repository.go

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

persistence/db_ledis/index_repository.go

@@ -1,4 +1,4 @@
-package ledis
+package db_ledis
 
 import (
 	"errors"
@@ -18,11 +18,11 @@ func NewArtistIndexRepository() domain.ArtistIndexRepository {
 }
 
 func (r *artistIndexRepository) Put(m *domain.ArtistIndex) error {
-	if m.Id == "" {
+	if m.ID == "" {
 		return errors.New("index ID is not set")
 	}
 	sort.Sort(m.Artists)
-	return r.saveOrUpdate(m.Id, m)
+	return r.saveOrUpdate(m.ID, m)
 }
 
 func (r *artistIndexRepository) Get(id string) (*domain.ArtistIndex, error) {
@@ -40,7 +40,7 @@ func (r *artistIndexRepository) GetAll() (domain.ArtistIndexes, error) {
 func (r *artistIndexRepository) DeleteAll() error {
 	var empty domain.ArtistIndexes
 	_, err := r.purgeInactive(empty, func(e interface{}) string {
-		return e.(domain.ArtistIndex).Id
+		return e.(domain.ArtistIndex).ID
 	})
 
 	return err

persistence/db_ledis/index_repository_test.go

@@ -1,4 +1,4 @@
-package ledis
+package db_ledis
 
 import (
 	"strconv"
@@ -17,7 +17,7 @@ func TestIndexRepository(t *testing.T) {
 		repo := NewArtistIndexRepository()
 
 		Convey("It should be able to read and write to the database", func() {
-			i := &domain.ArtistIndex{Id: "123"}
+			i := &domain.ArtistIndex{ID: "123"}
 
 			repo.Put(i)
 			s, _ := repo.Get("123")
@@ -25,7 +25,7 @@ func TestIndexRepository(t *testing.T) {
 			So(s, shouldBeEqual, i)
 		})
 		Convey("It should be able to check for existence of an ID", func() {
-			i := &domain.ArtistIndex{Id: "123"}
+			i := &domain.ArtistIndex{ID: "123"}
 
 			repo.Put(i)
 
@@ -44,7 +44,7 @@ func TestIndexRepository(t *testing.T) {
 		})
 		Convey("Given that I have 4 records", func() {
 			for i := 1; i <= 4; i++ {
-				e := &domain.ArtistIndex{Id: strconv.Itoa(i)}
+				e := &domain.ArtistIndex{ID: strconv.Itoa(i)}
 				repo.Put(e)
 			}
 
@@ -58,7 +58,7 @@ func TestIndexRepository(t *testing.T) {
 				})
 				Convey("And the values should be retrieved", func() {
 					for _, e := range indices {
-						So(e.Id, ShouldBeIn, []string{"1", "2", "3", "4"})
+						So(e.ID, ShouldBeIn, []string{"1", "2", "3", "4"})
 					}
 				})
 			})

persistence/db_ledis/ledis.go

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

persistence/db_ledis/ledis_repository.go

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

persistence/db_ledis/ledis_repository_test.go

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

persistence/db_ledis/mediafile_repository.go

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

persistence/db_ledis/mediafolders_repository.go

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

persistence/db_ledis/nowplaying_repository.go

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

persistence/db_ledis/playlist_repository.go

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

persistence/db_ledis/property_repository.go

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

persistence/db_ledis/wire_providers.go

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

persistence/db_storm/album_repository.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"time"

persistence/db_storm/album_repository_test.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"github.com/cloudsonic/sonic-server/domain"

persistence/db_storm/artist_repository.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"github.com/cloudsonic/sonic-server/domain"

persistence/db_storm/artist_repository_test.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"github.com/cloudsonic/sonic-server/domain"

persistence/db_storm/index_repository.go

@@ -1,11 +1,11 @@
-package storm
+package db_storm
 
 import (
 	"github.com/cloudsonic/sonic-server/domain"
 )
 
 type _ArtistIndex struct {
-	Id      string
+	ID      string
 	Artists domain.ArtistInfos
 }
 

persistence/db_storm/mediafile_repository.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"time"

persistence/db_storm/property_repository.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"github.com/asdine/storm"

persistence/db_storm/property_repository_test.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"github.com/cloudsonic/sonic-server/domain"

persistence/db_storm/storm.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"sync"

persistence/db_storm/storm_repository.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"reflect"

persistence/db_storm/storm_suite_test.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import (
 	"testing"

persistence/db_storm/wire_providers.go

@@ -1,4 +1,4 @@
-package storm
+package db_storm
 
 import "github.com/google/wire"
 

scanner/importer.go

@@ -310,7 +310,7 @@ func (i *Importer) findGroup(ig utils.IndexGroups, name string) string {
 func (i *Importer) saveIndex(artistIndex map[string]tempIndex) error {
 	i.idxRepo.DeleteAll()
 	for k, temp := range artistIndex {
-		idx := &domain.ArtistIndex{Id: k}
+		idx := &domain.ArtistIndex{ID: k}
 		for _, v := range temp {
 			idx.Artists = append(idx.Artists, v)
 		}

wire_gen.go

@@ -8,25 +8,25 @@ package main
 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/cloudsonic/sonic-server/scanner"
 	"github.com/deluan/gomate"
-	ledis2 "github.com/deluan/gomate/ledis"
+	"github.com/deluan/gomate/ledis"
 	"github.com/google/wire"
 )
 
 // Injectors from wire_injectors.go:
 
 func initImporter(musicFolder string) *scanner.Importer {
-	checkSumRepository := ledis.NewCheckSumRepository()
+	checkSumRepository := db_ledis.NewCheckSumRepository()
 	itunesScanner := scanner.NewItunesScanner(checkSumRepository)
-	mediaFileRepository := storm.NewMediaFileRepository()
-	albumRepository := storm.NewAlbumRepository()
-	artistRepository := storm.NewArtistRepository()
-	artistIndexRepository := ledis.NewArtistIndexRepository()
-	playlistRepository := ledis.NewPlaylistRepository()
-	propertyRepository := storm.NewPropertyRepository()
+	mediaFileRepository := db_storm.NewMediaFileRepository()
+	albumRepository := db_storm.NewAlbumRepository()
+	artistRepository := db_storm.NewArtistRepository()
+	artistIndexRepository := db_storm.NewArtistIndexRepository()
+	playlistRepository := db_ledis.NewPlaylistRepository()
+	propertyRepository := db_storm.NewPropertyRepository()
 	db := newDB()
 	search := engine.NewSearch(artistRepository, albumRepository, mediaFileRepository, db)
 	importer := scanner.NewImporter(musicFolder, itunesScanner, mediaFileRepository, albumRepository, artistRepository, artistIndexRepository, playlistRepository, propertyRepository, search)
@@ -35,8 +35,8 @@ func initImporter(musicFolder string) *scanner.Importer {
 
 // wire_injectors.go:
 
-var allProviders = wire.NewSet(itunesbridge.NewItunesControl, ledis.Set, storm.Set, engine.Set, scanner.Set, newDB)
+var allProviders = wire.NewSet(itunesbridge.NewItunesControl, db_ledis.Set, db_storm.Set, engine.Set, scanner.Set, newDB)
 
 func newDB() gomate.DB {
-	return ledis2.NewEmbeddedDB(ledis.Db())
+	return ledis.NewEmbeddedDB(db_ledis.Db())
 }

wire_injectors.go

@@ -5,8 +5,8 @@ package main
 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/cloudsonic/sonic-server/scanner"
 	"github.com/deluan/gomate"
 	"github.com/deluan/gomate/ledis"
@@ -15,8 +15,8 @@ import (
 
 var allProviders = wire.NewSet(
 	itunesbridge.NewItunesControl,
-	ledis2.Set,
-	storm.Set,
+	db_ledis.Set,
+	db_storm.Set,
 	engine.Set,
 	scanner.Set,
 	newDB,
@@ -27,5 +27,5 @@ func initImporter(musicFolder string) *scanner.Importer {
 }
 
 func newDB() gomate.DB {
-	return ledis.NewEmbeddedDB(ledis2.Db())
+	return ledis.NewEmbeddedDB(db_ledis.Db())
 }