Moved package api to subsonic under server

server/subsonic/album_lists.go

@@ -1,12 +1,12 @@
-package api
+package subsonic
 
 import (
 	"errors"
 	"net/http"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/log"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 	"github.com/cloudsonic/sonic-server/utils"
 )
 

server/subsonic/album_lists_test.go

@@ -1,4 +1,4 @@
-package api
+package subsonic
 
 import (
 	"errors"

server/subsonic/api.go

@@ -1,4 +1,4 @@
-package api
+package subsonic
 
 import (
 	"encoding/json"
@@ -6,15 +6,15 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/conf"
 	"github.com/cloudsonic/sonic-server/engine"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 	"github.com/go-chi/chi"
 )
 
 const Version = "1.8.0"
 
-type SubsonicHandler = func(http.ResponseWriter, *http.Request) (*responses.Subsonic, error)
+type Handler = func(http.ResponseWriter, *http.Request) (*responses.Subsonic, error)
 
 type Router struct {
 	Browser       engine.Browser
@@ -123,7 +123,7 @@ func (api *Router) routes() http.Handler {
 
 // Add the Subsonic handler, with and without `.view` extension
 // Ex: if path = `ping` it will create the routes `/ping` and `/ping.view`
-func H(r chi.Router, path string, f SubsonicHandler) {
+func H(r chi.Router, path string, f Handler) {
 	handle := func(w http.ResponseWriter, r *http.Request) {
 		res, err := f(w, r)
 		if err != nil {

server/subsonic/api_suite_test.go

@@ -1,4 +1,4 @@
-package api
+package subsonic
 
 import (
 	"testing"

server/subsonic/browsing.go

@@ -1,15 +1,15 @@
-package api
+package subsonic
 
 import (
 	"fmt"
 	"net/http"
 	"time"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/conf"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/log"
 	"github.com/cloudsonic/sonic-server/model"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 	"github.com/cloudsonic/sonic-server/utils"
 )
 

server/subsonic/helpers.go

@@ -1,4 +1,4 @@
-package api
+package subsonic
 
 import (
 	"fmt"
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/model"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 	"github.com/cloudsonic/sonic-server/utils"
 )
 

server/subsonic/media_annotation.go

@@ -1,13 +1,13 @@
-package api
+package subsonic
 
 import (
 	"net/http"
 	"time"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/log"
 	"github.com/cloudsonic/sonic-server/model"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 )
 
 type MediaAnnotationController struct {

server/subsonic/media_retrieval.go

@@ -1,14 +1,14 @@
-package api
+package subsonic
 
 import (
 	"io"
 	"net/http"
 	"os"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/log"
 	"github.com/cloudsonic/sonic-server/model"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 )
 
 type MediaRetrievalController struct {

server/subsonic/media_retrieval_test.go

@@ -1,4 +1,4 @@
-package api
+package subsonic
 
 import (
 	"errors"

server/subsonic/middlewares.go

@@ -1,4 +1,4 @@
-package api
+package subsonic
 
 import (
 	"context"
@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/conf"
 	"github.com/cloudsonic/sonic-server/log"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 )
 
 func checkRequiredParameters(next http.Handler) http.Handler {

server/subsonic/middlewares_test.go

@@ -1,4 +1,4 @@
-package api
+package subsonic
 
 import (
 	"net/http"

server/subsonic/playlists.go

@@ -1,13 +1,13 @@
-package api
+package subsonic
 
 import (
 	"fmt"
 	"net/http"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/log"
 	"github.com/cloudsonic/sonic-server/model"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 )
 
 type PlaylistsController struct {

server/subsonic/responses/responses_test.go

@@ -10,7 +10,7 @@ import (
 	"encoding/xml"
 	"time"
 
-	. "github.com/cloudsonic/sonic-server/api/responses"
+	. "github.com/cloudsonic/sonic-server/server/subsonic/responses"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

server/subsonic/searching.go

@@ -1,12 +1,12 @@
-package api
+package subsonic
 
 import (
 	"fmt"
 	"net/http"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/log"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 )
 
 type SearchingController struct {

server/subsonic/stream.go

@@ -1,12 +1,12 @@
-package api
+package subsonic
 
 import (
 	"net/http"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/log"
 	"github.com/cloudsonic/sonic-server/model"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 	"github.com/cloudsonic/sonic-server/utils"
 )
 

server/subsonic/system.go

@@ -1,9 +1,9 @@
-package api
+package subsonic
 
 import (
 	"net/http"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 )
 
 type SystemController struct{}

server/subsonic/users.go

@@ -1,9 +1,9 @@
-package api
+package subsonic
 
 import (
 	"net/http"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 )
 
 type UsersController struct{}

server/subsonic/wire_gen.go

@@ -3,7 +3,7 @@
 //go:generate wire
 //+build !wireinject
 
-package api
+package subsonic
 
 import (
 	"github.com/google/wire"

server/subsonic/wire_injectors.go

@@ -1,6 +1,6 @@
 //+build wireinject
 
-package api
+package subsonic
 
 import (
 	"github.com/google/wire"

tests/matchers.go

@@ -7,7 +7,7 @@ import (
 	"encoding/xml"
 	"fmt"
 
-	"github.com/cloudsonic/sonic-server/api/responses"
+	"github.com/cloudsonic/sonic-server/server/subsonic/responses"
 	"github.com/smartystreets/goconvey/convey"
 )
 

wire_gen.go

@@ -6,11 +6,11 @@
 package main
 
 import (
-	"github.com/cloudsonic/sonic-server/api"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/persistence"
 	"github.com/cloudsonic/sonic-server/scanner"
 	"github.com/cloudsonic/sonic-server/server"
+	"github.com/cloudsonic/sonic-server/server/subsonic"
 	"github.com/google/wire"
 )
 
@@ -23,7 +23,7 @@ func CreateApp(musicFolder string) *server.Server {
 	return serverServer
 }
 
-func CreateSubsonicAPIRouter() *api.Router {
+func CreateSubsonicAPIRouter() *subsonic.Router {
 	dataStore := persistence.New()
 	browser := engine.NewBrowser(dataStore)
 	cover := engine.NewCover(dataStore)
@@ -33,10 +33,10 @@ func CreateSubsonicAPIRouter() *api.Router {
 	ratings := engine.NewRatings(dataStore)
 	scrobbler := engine.NewScrobbler(dataStore, nowPlayingRepository)
 	search := engine.NewSearch(dataStore)
-	router := api.NewRouter(browser, cover, listGenerator, playlists, ratings, scrobbler, search)
+	router := subsonic.NewRouter(browser, cover, listGenerator, playlists, ratings, scrobbler, search)
 	return router
 }
 
 // wire_injectors.go:
 
-var allProviders = wire.NewSet(engine.Set, scanner.New, api.NewRouter, persistence.Set)
+var allProviders = wire.NewSet(engine.Set, scanner.New, subsonic.NewRouter, persistence.Set)

wire_injectors.go

@@ -3,18 +3,18 @@
 package main
 
 import (
-	"github.com/cloudsonic/sonic-server/api"
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/persistence"
 	"github.com/cloudsonic/sonic-server/scanner"
 	"github.com/cloudsonic/sonic-server/server"
+	"github.com/cloudsonic/sonic-server/server/subsonic"
 	"github.com/google/wire"
 )
 
 var allProviders = wire.NewSet(
 	engine.Set,
 	scanner.New,
-	api.NewRouter,
+	subsonic.NewRouter,
 	persistence.Set,
 )
 
@@ -25,6 +25,6 @@ func CreateApp(musicFolder string) *server.Server {
 	))
 }
 
-func CreateSubsonicAPIRouter() *api.Router {
+func CreateSubsonicAPIRouter() *subsonic.Router {
 	panic(wire.Build(allProviders))
 }