heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: move shared packages up a level

Browse Source
This commit is contained in:
sentriz
2022-04-13 00:09:10 +01:00
parent 165904c2bb
commit 8b803ecf20
53 changed files with 65 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/ctrlsubsonic/ctrl.go
View File

@@ -12,10 +12,10 @@ import (
"go.senan.xyz/gonic/server/ctrlbase"
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
"go.senan.xyz/gonic/server/jukebox"
"go.senan.xyz/gonic/server/podcasts"
"go.senan.xyz/gonic/server/scrobble"
"go.senan.xyz/gonic/server/transcode"
"go.senan.xyz/gonic/jukebox"
"go.senan.xyz/gonic/podcasts"
"go.senan.xyz/gonic/scrobble"
"go.senan.xyz/gonic/transcode"
)
type CtxKey int

6
server/ctrlsubsonic/ctrl_test.go
View File

@@ -18,9 +18,9 @@ import (
"go.senan.xyz/gonic/server/ctrlbase"
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/server/mockfs"
"go.senan.xyz/gonic/server/transcode"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/mockfs"
"go.senan.xyz/gonic/transcode"
)
var testCamelExpr = regexp.MustCompile("([a-z0-9])([A-Z])")

2
server/ctrlsubsonic/handlers_bookmark.go
View File

@@ -9,7 +9,7 @@ import (
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/db"
)
func (c *Controller) ServeGetBookmarks(r *http.Request) *spec.Response {

2
server/ctrlsubsonic/handlers_by_folder.go
View File

@@ -9,7 +9,7 @@ import (
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/db"
)
// the subsonic spec mentions "artist" a lot when talking about the

4
server/ctrlsubsonic/handlers_by_tags.go
View File

@@ -13,8 +13,8 @@ import (
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/server/scrobble/lastfm"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/scrobble/lastfm"
)
func (c *Controller) ServeGetArtists(r *http.Request) *spec.Response {

4
server/ctrlsubsonic/handlers_common.go
View File

@@ -14,8 +14,8 @@ import (
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/server/scanner"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/scanner"
)
func lowerUDecOrHash(in string) string {

2
server/ctrlsubsonic/handlers_playlist.go
View File

@@ -10,7 +10,7 @@ import (
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/db"
)
func playlistRender(c *Controller, playlist *db.Playlist) *spec.Playlist {

2
server/ctrlsubsonic/handlers_podcast.go
View File

@@ -8,7 +8,7 @@ import (
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/db"
)
func (c *Controller) ServeGetPodcasts(r *http.Request) *spec.Response {

4
server/ctrlsubsonic/handlers_raw.go
View File

@@ -17,8 +17,8 @@ import (
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/server/transcode"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/transcode"
)
// "raw" handlers are ones that don't always return a spec response.

4
server/ctrlsubsonic/handlers_raw_test.go
View File

@@ -12,8 +12,8 @@ import (
"time"
"github.com/matryer/is"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/server/transcode"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/transcode"
)
func TestServeStreamRaw(t *testing.T) {

2
server/ctrlsubsonic/spec/construct_by_folder.go
View File

@@ -3,7 +3,7 @@ package spec
import (
"path"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/db"
)
func NewAlbumByFolder(f *db.Album) *Album {

2
server/ctrlsubsonic/spec/construct_by_tags.go
View File

@@ -4,7 +4,7 @@ import (
"path"
"strings"
"go.senan.xyz/gonic/server/db"
"go.senan.xyz/gonic/db"
)
func NewAlbumByTags(a *db.Album, artist *db.Artist) *Album {

2
server/ctrlsubsonic/spec/construct_podcast.go
View File

@@ -1,6 +1,6 @@
package spec
import "go.senan.xyz/gonic/server/db"
import "go.senan.xyz/gonic/db"
func NewPodcastChannel(p *db.Podcast) *PodcastChannel {
ret := &PodcastChannel{