Renamed project to CloudSonic
This commit is contained in:
+7
-7
@@ -8,10 +8,10 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
"github.com/deluan/gosonic/conf"
|
||||
"github.com/deluan/gosonic/domain"
|
||||
"github.com/deluan/gosonic/engine"
|
||||
"github.com/deluan/gosonic/utils"
|
||||
"github.com/cloudsonic/sonic-server/conf"
|
||||
"github.com/cloudsonic/sonic-server/domain"
|
||||
"github.com/cloudsonic/sonic-server/engine"
|
||||
"github.com/cloudsonic/sonic-server/utils"
|
||||
)
|
||||
|
||||
type Scanner interface {
|
||||
@@ -50,7 +50,7 @@ func CheckForUpdates(force bool) {
|
||||
|
||||
func startImport() {
|
||||
go func() {
|
||||
itunesLibrary = conf.GoSonic.MusicFolder
|
||||
itunesLibrary = conf.Sonic.MusicFolder
|
||||
|
||||
info, err := os.Stat(itunesLibrary)
|
||||
if err != nil {
|
||||
@@ -264,7 +264,7 @@ func (i *Importer) importArtists() domain.Artists {
|
||||
}
|
||||
|
||||
func (i *Importer) importArtistIndex() {
|
||||
indexGroups := utils.ParseIndexGroups(conf.GoSonic.IndexGroups)
|
||||
indexGroups := utils.ParseIndexGroups(conf.Sonic.IndexGroups)
|
||||
artistIndex := make(map[string]tempIndex)
|
||||
|
||||
for _, ar := range i.scanner.Artists() {
|
||||
@@ -281,7 +281,7 @@ func (i *Importer) importPlaylists() domain.Playlists {
|
||||
j := 0
|
||||
for _, pl := range i.scanner.Playlists() {
|
||||
pl.Public = true
|
||||
pl.Owner = conf.GoSonic.User
|
||||
pl.Owner = conf.Sonic.User
|
||||
pl.Comment = "Original: " + pl.FullPath
|
||||
pls[j] = *pl
|
||||
j++
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
package scanner
|
||||
|
||||
import (
|
||||
"github.com/deluan/gosonic/domain"
|
||||
"github.com/deluan/gosonic/tests"
|
||||
"github.com/deluan/gosonic/utils"
|
||||
. "github.com/smartystreets/goconvey/convey"
|
||||
"testing"
|
||||
|
||||
"github.com/cloudsonic/sonic-server/domain"
|
||||
"github.com/cloudsonic/sonic-server/tests"
|
||||
"github.com/cloudsonic/sonic-server/utils"
|
||||
. "github.com/smartystreets/goconvey/convey"
|
||||
)
|
||||
|
||||
func TestCollectIndex(t *testing.T) {
|
||||
|
||||
@@ -14,8 +14,8 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
"github.com/deluan/gosonic/conf"
|
||||
"github.com/deluan/gosonic/domain"
|
||||
"github.com/cloudsonic/sonic-server/conf"
|
||||
"github.com/cloudsonic/sonic-server/domain"
|
||||
"github.com/deluan/itl"
|
||||
"github.com/dhowden/tag"
|
||||
)
|
||||
@@ -103,8 +103,8 @@ func (s *ItunesScanner) ScanLibrary(lastModifiedSince time.Time, path string) (i
|
||||
beego.Debug("Saved", len(s.newSums), "checksums")
|
||||
}
|
||||
|
||||
ignFolders := conf.GoSonic.PlsIgnoreFolders
|
||||
ignPatterns := strings.Split(conf.GoSonic.PlsIgnoredPatterns, ";")
|
||||
ignFolders := conf.Sonic.PlsIgnoreFolders
|
||||
ignPatterns := strings.Split(conf.Sonic.PlsIgnoredPatterns, ";")
|
||||
for _, p := range l.Playlists {
|
||||
rel := plsRelation{pID: p.PlaylistPersistentID, parentPID: p.ParentPersistentID, name: unescape(p.Name)}
|
||||
s.pplaylists[p.PlaylistPersistentID] = rel
|
||||
|
||||
Reference in New Issue
Block a user