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

Renamed project to CloudSonic

Browse Source
This commit is contained in:
Deluan
2017-04-01 09:47:14 -04:00
parent ce863f0f35
commit c417a00e62
67 changed files with 190 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/album_lists.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"errors"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/utils"
)
type AlbumListController struct {
api/album_lists_test.go
+6 -6
View File
@@ -3,12 +3,12 @@ package api_test
import (
"testing"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/persistence"
. "github.com/deluan/gosonic/tests"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/domain"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/persistence"
. "github.com/cloudsonic/sonic-server/tests"
"github.com/cloudsonic/sonic-server/utils"
. "github.com/smartystreets/goconvey/convey"
)
api/api_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings"
"github.com/astaxie/beego"
_ "github.com/deluan/gosonic/init"
_ "github.com/cloudsonic/sonic-server/init"
)
const (
api/base_api_controller.go
+4 -5
View File
@@ -3,14 +3,13 @@ package api
import (
"encoding/xml"
"fmt"
"strconv"
"time"
"strconv"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/utils"
)
type BaseAPIController struct{ beego.Controller }
api/browsing.go
+6 -6
View File
@@ -5,11 +5,11 @@ import (
"time"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"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/api/responses"
"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 BrowsingController struct {
@@ -41,7 +41,7 @@ func (c *BrowsingController) getArtistIndex(ifModifiedSince time.Time) responses
}
res := responses.Indexes{
IgnoredArticles: conf.GoSonic.IgnoredArticles,
IgnoredArticles: conf.Sonic.IgnoredArticles,
LastModified: fmt.Sprint(utils.ToMillis(lastModified)),
}
api/browsing_test.go
+6 -6
View File
@@ -3,12 +3,12 @@ package api_test
import (
"testing"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/persistence"
. "github.com/deluan/gosonic/tests"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/domain"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/persistence"
. "github.com/cloudsonic/sonic-server/tests"
"github.com/cloudsonic/sonic-server/utils"
. "github.com/smartystreets/goconvey/convey"
)
api/media_annotation.go
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"time"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/domain"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/utils"
)
type MediaAnnotationController struct {
api/media_retrieval.go
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"os"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/domain"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/utils"
)
type MediaRetrievalController struct {
api/media_retrieval_test.go
+6 -7
View File
@@ -1,18 +1,17 @@
package api_test
import (
"testing"
"fmt"
"net/http"
"net/http/httptest"
"testing"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/persistence"
. "github.com/deluan/gosonic/tests"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/domain"
"github.com/cloudsonic/sonic-server/persistence"
. "github.com/cloudsonic/sonic-server/tests"
"github.com/cloudsonic/sonic-server/utils"
. "github.com/smartystreets/goconvey/convey"
)
api/playlists.go
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"fmt"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/domain"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/utils"
)
type PlaylistsController struct {
api/responses/responses_test.go
+5 -5
View File
@@ -4,8 +4,8 @@ import (
"testing"
"time"
. "github.com/deluan/gosonic/api/responses"
. "github.com/deluan/gosonic/tests"
. "github.com/cloudsonic/sonic-server/api/responses"
. "github.com/cloudsonic/sonic-server/tests"
. "github.com/smartystreets/goconvey/convey"
)
@@ -163,13 +163,13 @@ func TestSubsonicResponses(t *testing.T) {
})
})
Convey("With optional fields", func() {
response.User.Email = "gosonic@deluan.com"
response.User.Email = "cloudsonic@deluan.com"
response.User.Folder = []int{1}
Convey("XML", func() {
So(response, ShouldMatchXML, `<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.0.0"><user username="deluan" email="gosonic@deluan.com" scrobblingEnabled="false" adminRole="false" settingsRole="false" downloadRole="false" uploadRole="false" playlistRole="false" coverArtRole="false" commentRole="false" podcastRole="false" streamRole="false" jukeboxRole="false" shareRole="false" videoConversionRole="false"><folder>1</folder></user></subsonic-response>`)
So(response, ShouldMatchXML, `<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.0.0"><user username="deluan" email="cloudsonic@deluan.com" scrobblingEnabled="false" adminRole="false" settingsRole="false" downloadRole="false" uploadRole="false" playlistRole="false" coverArtRole="false" commentRole="false" podcastRole="false" streamRole="false" jukeboxRole="false" shareRole="false" videoConversionRole="false"><folder>1</folder></user></subsonic-response>`)
})
Convey("JSON", func() {
So(response, ShouldMatchJSON, `{"status":"ok","user":{"adminRole":false,"commentRole":false,"coverArtRole":false,"downloadRole":false,"email":"gosonic@deluan.com","folder":[1],"jukeboxRole":false,"playlistRole":false,"podcastRole":false,"scrobblingEnabled":false,"settingsRole":false,"shareRole":false,"streamRole":false,"uploadRole":false,"username":"deluan","videoConversionRole":false},"version":"1.0.0"}`)
So(response, ShouldMatchJSON, `{"status":"ok","user":{"adminRole":false,"commentRole":false,"coverArtRole":false,"downloadRole":false,"email":"cloudsonic@deluan.com","folder":[1],"jukeboxRole":false,"playlistRole":false,"podcastRole":false,"scrobblingEnabled":false,"settingsRole":false,"shareRole":false,"streamRole":false,"uploadRole":false,"username":"deluan","videoConversionRole":false},"version":"1.0.0"}`)
})
})
})
api/searching.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/utils"
)
type SearchingController struct {
api/stream.go
+4 -4
View File
@@ -2,10 +2,10 @@ package api
import (
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/domain"
"github.com/cloudsonic/sonic-server/engine"
"github.com/cloudsonic/sonic-server/utils"
)
type StreamController struct {
api/stream_test.go
+6 -7
View File
@@ -1,18 +1,17 @@
package api_test
import (
"testing"
"fmt"
"net/http"
"net/http/httptest"
"testing"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/persistence"
. "github.com/deluan/gosonic/tests"
"github.com/deluan/gosonic/utils"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/domain"
"github.com/cloudsonic/sonic-server/persistence"
. "github.com/cloudsonic/sonic-server/tests"
"github.com/cloudsonic/sonic-server/utils"
. "github.com/smartystreets/goconvey/convey"
)
api/system.go
+1 -1
View File
@@ -1,6 +1,6 @@
package api
import "github.com/deluan/gosonic/api/responses"
import "github.com/cloudsonic/sonic-server/api/responses"
type SystemController struct{ BaseAPIController }
api/system_test.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"encoding/json"
"testing"
"github.com/deluan/gosonic/api/responses"
. "github.com/deluan/gosonic/tests"
"github.com/cloudsonic/sonic-server/api/responses"
. "github.com/cloudsonic/sonic-server/tests"
. "github.com/smartystreets/goconvey/convey"
)
api/users.go
+1 -1
View File
@@ -1,6 +1,6 @@
package api
import "github.com/deluan/gosonic/api/responses"
import "github.com/cloudsonic/sonic-server/api/responses"
type UsersController struct{ BaseAPIController }
api/validation.go
+5 -5
View File
@@ -7,8 +7,8 @@ import (
"strings"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/conf"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/conf"
)
type ControllerInterface interface {
@@ -18,7 +18,7 @@ type ControllerInterface interface {
}
func Validate(controller BaseAPIController) {
if !conf.GoSonic.DisableValidation {
if !conf.Sonic.DisableValidation {
checkParameters(controller)
authenticate(controller)
// TODO Validate version
@@ -41,7 +41,7 @@ func checkParameters(c BaseAPIController) {
}
func authenticate(c BaseAPIController) {
password := conf.GoSonic.Password
password := conf.Sonic.Password
user := c.GetString("u")
pass := c.GetString("p")
salt := c.GetString("s")
@@ -62,7 +62,7 @@ func authenticate(c BaseAPIController) {
valid = (t == token)
}
if user != conf.GoSonic.User || !valid {
if user != conf.Sonic.User || !valid {
logWarn(c, fmt.Sprintf(`Invalid login for user "%s"`, user))
abortRequest(c, responses.ErrorAuthenticationFail)
}
api/validation_test.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"fmt"
"testing"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/tests"
"github.com/cloudsonic/sonic-server/api/responses"
"github.com/cloudsonic/sonic-server/tests"
. "github.com/smartystreets/goconvey/convey"
)