refactor: move shared packages up a level

sentriz · Apr 13, 2022 · 8b803ec · 8b803ec
1 parent 165904c
commit 8b803ec
Show file tree

Hide file tree

Showing 53 changed files with 65 additions and 68 deletions.
diff --git a/cmd/gonic/gonic.go b/cmd/gonic/gonic.go
@@ -18,7 +18,7 @@ import (
 
 	"go.senan.xyz/gonic"
 	"go.senan.xyz/gonic/server"
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 const (

diff --git a/server/db/db.go → db/db.go b/server/db/db.go → db/db.go
diff --git a/server/db/db_test.go → db/db_test.go b/server/db/db_test.go → db/db_test.go
diff --git a/server/db/migrations.go → db/migrations.go b/server/db/migrations.go → db/migrations.go
diff --git a/server/db/model.go → db/model.go b/server/db/model.go → db/model.go
@@ -15,7 +15,7 @@ import (
 	// TODO: remove this dep
 
 	"go.senan.xyz/gonic/server/ctrlsubsonic/specid"
-	"go.senan.xyz/gonic/server/mime"
+	"go.senan.xyz/gonic/mime"
 )
 
 func splitInt(in, sep string) []int {

diff --git a/server/jukebox/jukebox.go → jukebox/jukebox.go b/server/jukebox/jukebox.go → jukebox/jukebox.go
@@ -14,7 +14,7 @@ import (
 	"github.com/faiface/beep/mp3"
 	"github.com/faiface/beep/speaker"
 
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 type Status struct {

diff --git a/server/mime/mime.go → mime/mime.go b/server/mime/mime.go → mime/mime.go
@@ -1,8 +1,5 @@
 package mime
 
-// this package is at such a high level in the hierarchy because
-// it's used by both `server/db` and `server/scanner`
-
 func FromExtension(ext string) (string, bool) {
 	types := map[string]string{
 		"mp3":  "audio/mpeg",

diff --git a/server/mockfs/mockfs.go → mockfs/mockfs.go b/server/mockfs/mockfs.go → mockfs/mockfs.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/mattn/go-sqlite3"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scanner"
-	"go.senan.xyz/gonic/server/scanner/tags"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scanner"
+	"go.senan.xyz/gonic/scanner/tags"
 )
 
 var ErrPathNotFound = errors.New("path not found")

diff --git a/server/podcasts/podcasts.go → podcasts/podcasts.go b/server/podcasts/podcasts.go → podcasts/podcasts.go
@@ -19,9 +19,9 @@ import (
 	"github.com/mmcdole/gofeed"
 
 	"go.senan.xyz/gonic/multierr"
-	"go.senan.xyz/gonic/server/db"
-	gmime "go.senan.xyz/gonic/server/mime"
-	"go.senan.xyz/gonic/server/scanner/tags"
+	"go.senan.xyz/gonic/db"
+	gmime "go.senan.xyz/gonic/mime"
+	"go.senan.xyz/gonic/scanner/tags"
 )
 
 const downloadAllWaitInterval = 3 * time.Second

diff --git a/server/podcasts/podcasts_test.go → podcasts/podcasts_test.go b/server/podcasts/podcasts_test.go → podcasts/podcasts_test.go
diff --git a/server/podcasts/testdata/rss.new → podcasts/testdata/rss.new b/server/podcasts/testdata/rss.new → podcasts/testdata/rss.new
diff --git a/server/scanner/scanner.go → scanner/scanner.go b/server/scanner/scanner.go → scanner/scanner.go
@@ -18,9 +18,9 @@ import (
 	"github.com/rainycape/unidecode"
 
 	"go.senan.xyz/gonic/multierr"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/mime"
-	"go.senan.xyz/gonic/server/scanner/tags"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/mime"
+	"go.senan.xyz/gonic/scanner/tags"
 )
 
 var (

diff --git a/server/scanner/scanner_benchmark_test.go → scanner/scanner_benchmark_test.go b/server/scanner/scanner_benchmark_test.go → scanner/scanner_benchmark_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"go.senan.xyz/gonic/server/mockfs"
+	"go.senan.xyz/gonic/mockfs"
 )
 
 func BenchmarkScanIncremental(b *testing.B) {

diff --git a/server/scanner/scanner_fuzz_test.go → scanner/scanner_fuzz_test.go b/server/scanner/scanner_fuzz_test.go → scanner/scanner_fuzz_test.go
@@ -11,7 +11,7 @@ import (
 
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
 	"github.com/matryer/is"
-	"go.senan.xyz/gonic/server/mockfs"
+	"go.senan.xyz/gonic/mockfs"
 )
 
 func FuzzScanner(f *testing.F) {

diff --git a/server/scanner/scanner_test.go → scanner/scanner_test.go b/server/scanner/scanner_test.go → scanner/scanner_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/matryer/is"
 
 	"go.senan.xyz/gonic/multierr"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/mockfs"
-	"go.senan.xyz/gonic/server/scanner"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/mockfs"
+	"go.senan.xyz/gonic/scanner"
 )
 
 func TestMain(m *testing.M) {

diff --git a/server/scanner/tags/tags.go → scanner/tags/tags.go b/server/scanner/tags/tags.go → scanner/tags/tags.go
diff --git a/...a903114a127d16fbf11dbd52256541a17c9f60b07 → ...a903114a127d16fbf11dbd52256541a17c9f60b07 b/...a903114a127d16fbf11dbd52256541a17c9f60b07 → ...a903114a127d16fbf11dbd52256541a17c9f60b07
diff --git a/...9f288aff8610f2cac65b7cf65b8708eb0ea104519 → ...9f288aff8610f2cac65b7cf65b8708eb0ea104519 b/...9f288aff8610f2cac65b7cf65b8708eb0ea104519 → ...9f288aff8610f2cac65b7cf65b8708eb0ea104519
diff --git a/...7f28d6e1e447100179409d69a827c6651370d96cc → ...7f28d6e1e447100179409d69a827c6651370d96cc b/...7f28d6e1e447100179409d69a827c6651370d96cc → ...7f28d6e1e447100179409d69a827c6651370d96cc
diff --git a/...f537d4d81f389524539f402d13aa01f93a65ac7e9 → ...f537d4d81f389524539f402d13aa01f93a65ac7e9 b/...f537d4d81f389524539f402d13aa01f93a65ac7e9 → ...f537d4d81f389524539f402d13aa01f93a65ac7e9
diff --git a/server/scrobble/lastfm/lastfm.go → scrobble/lastfm/lastfm.go b/server/scrobble/lastfm/lastfm.go → scrobble/lastfm/lastfm.go
@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"time"
 
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scrobble"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scrobble"
 )
 
 const (

diff --git a/server/scrobble/lastfm/lastfm_test.go → scrobble/lastfm/lastfm_test.go b/server/scrobble/lastfm/lastfm_test.go → scrobble/lastfm/lastfm_test.go
diff --git a/server/scrobble/listenbrainz/listenbrainz.go → scrobble/listenbrainz/listenbrainz.go b/server/scrobble/listenbrainz/listenbrainz.go → scrobble/listenbrainz/listenbrainz.go
@@ -10,8 +10,8 @@ import (
 	"net/http/httputil"
 	"time"
 
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scrobble"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scrobble"
 )
 
 const (

diff --git a/server/scrobble/scrobble.go → scrobble/scrobble.go b/server/scrobble/scrobble.go → scrobble/scrobble.go
@@ -3,7 +3,7 @@ package scrobble
 import (
 	"time"
 
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 type Scrobbler interface {

diff --git a/server/ctrladmin/ctrl.go b/server/ctrladmin/ctrl.go
@@ -23,8 +23,8 @@ import (
 	"go.senan.xyz/gonic"
 	"go.senan.xyz/gonic/server/assets"
 	"go.senan.xyz/gonic/server/ctrlbase"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/podcasts"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/podcasts"
 )
 
 type CtxKey int

diff --git a/server/ctrladmin/handlers.go b/server/ctrladmin/handlers.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/mmcdole/gofeed"
 
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scanner"
-	"go.senan.xyz/gonic/server/scrobble/lastfm"
-	"go.senan.xyz/gonic/server/scrobble/listenbrainz"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scanner"
+	"go.senan.xyz/gonic/scrobble/lastfm"
+	"go.senan.xyz/gonic/scrobble/listenbrainz"
+	"go.senan.xyz/gonic/transcode"
 )
 
 func doScan(scanner *scanner.Scanner, opts scanner.ScanOptions) {

diff --git a/server/ctrladmin/handlers_playlist.go b/server/ctrladmin/handlers_playlist.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/jinzhu/gorm"
 
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 var (

diff --git a/server/ctrladmin/middleware.go b/server/ctrladmin/middleware.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gorilla/sessions"
 
 	"go.senan.xyz/gonic"
-	"go.senan.xyz/gonic/server/db"
+	"go.senan.xyz/gonic/db"
 )
 
 func (c *Controller) WithSession(next http.Handler) http.Handler {

diff --git a/server/ctrlbase/ctrl.go b/server/ctrlbase/ctrl.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"path"
 
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/scanner"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/scanner"
 )
 
 type statusWriter struct {

diff --git a/server/ctrlsubsonic/ctrl.go b/server/ctrlsubsonic/ctrl.go
@@ -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

diff --git a/server/ctrlsubsonic/ctrl_test.go b/server/ctrlsubsonic/ctrl_test.go
@@ -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])")

diff --git a/server/ctrlsubsonic/handlers_bookmark.go b/server/ctrlsubsonic/handlers_bookmark.go
@@ -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 {

diff --git a/server/ctrlsubsonic/handlers_by_folder.go b/server/ctrlsubsonic/handlers_by_folder.go
@@ -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

diff --git a/server/ctrlsubsonic/handlers_by_tags.go b/server/ctrlsubsonic/handlers_by_tags.go
@@ -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 {

diff --git a/server/ctrlsubsonic/handlers_common.go b/server/ctrlsubsonic/handlers_common.go
@@ -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 {

diff --git a/server/ctrlsubsonic/handlers_playlist.go b/server/ctrlsubsonic/handlers_playlist.go
@@ -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 {

diff --git a/server/ctrlsubsonic/handlers_podcast.go b/server/ctrlsubsonic/handlers_podcast.go
@@ -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 {

diff --git a/server/ctrlsubsonic/handlers_raw.go b/server/ctrlsubsonic/handlers_raw.go
@@ -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.

diff --git a/server/ctrlsubsonic/handlers_raw_test.go b/server/ctrlsubsonic/handlers_raw_test.go
@@ -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) {

diff --git a/server/ctrlsubsonic/spec/construct_by_folder.go b/server/ctrlsubsonic/spec/construct_by_folder.go
@@ -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 {

diff --git a/server/ctrlsubsonic/spec/construct_by_tags.go b/server/ctrlsubsonic/spec/construct_by_tags.go
@@ -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 {

diff --git a/server/ctrlsubsonic/spec/construct_podcast.go b/server/ctrlsubsonic/spec/construct_podcast.go
@@ -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{

diff --git a/server/server.go b/server/server.go
@@ -15,15 +15,15 @@ import (
 	"go.senan.xyz/gonic/server/ctrladmin"
 	"go.senan.xyz/gonic/server/ctrlbase"
 	"go.senan.xyz/gonic/server/ctrlsubsonic"
-	"go.senan.xyz/gonic/server/db"
-	"go.senan.xyz/gonic/server/jukebox"
-	"go.senan.xyz/gonic/server/podcasts"
-	"go.senan.xyz/gonic/server/scanner"
-	"go.senan.xyz/gonic/server/scanner/tags"
-	"go.senan.xyz/gonic/server/scrobble"
-	"go.senan.xyz/gonic/server/scrobble/lastfm"
-	"go.senan.xyz/gonic/server/scrobble/listenbrainz"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/db"
+	"go.senan.xyz/gonic/jukebox"
+	"go.senan.xyz/gonic/podcasts"
+	"go.senan.xyz/gonic/scanner"
+	"go.senan.xyz/gonic/scanner/tags"
+	"go.senan.xyz/gonic/scrobble"
+	"go.senan.xyz/gonic/scrobble/lastfm"
+	"go.senan.xyz/gonic/scrobble/listenbrainz"
+	"go.senan.xyz/gonic/transcode"
 )
 
 type Options struct {

diff --git a/server/transcode/testdata/10s.mp3 → transcode/testdata/10s.mp3 b/server/transcode/testdata/10s.mp3 → transcode/testdata/10s.mp3
diff --git a/server/transcode/testdata/5s.mp3 → transcode/testdata/5s.mp3 b/server/transcode/testdata/5s.mp3 → transcode/testdata/5s.mp3
diff --git a/...5414e7e41d5c802b4db45ebc79abe0397fb915a0c → ...5414e7e41d5c802b4db45ebc79abe0397fb915a0c b/...5414e7e41d5c802b4db45ebc79abe0397fb915a0c → ...5414e7e41d5c802b4db45ebc79abe0397fb915a0c
diff --git a/...337a79e1e6bfebf7e5eb7421878c911df2d78d1ac → ...337a79e1e6bfebf7e5eb7421878c911df2d78d1ac b/...337a79e1e6bfebf7e5eb7421878c911df2d78d1ac → ...337a79e1e6bfebf7e5eb7421878c911df2d78d1ac
diff --git a/...77772cacc3ca86d524cbb2d3a769248625bc3edc8 → ...77772cacc3ca86d524cbb2d3a769248625bc3edc8 b/...77772cacc3ca86d524cbb2d3a769248625bc3edc8 → ...77772cacc3ca86d524cbb2d3a769248625bc3edc8
diff --git a/server/transcode/transcode.go → transcode/transcode.go b/server/transcode/transcode.go → transcode/transcode.go
diff --git a/server/transcode/transcode_test.go → transcode/transcode_test.go b/server/transcode/transcode_test.go → transcode/transcode_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/matryer/is"
-	"go.senan.xyz/gonic/server/transcode"
+	"go.senan.xyz/gonic/transcode"
 )
 
 // FuzzGuessExpectedSize makes sure all of our profile's estimated transcode

diff --git a/server/transcode/transcoder_caching.go → transcode/transcoder_caching.go b/server/transcode/transcoder_caching.go → transcode/transcoder_caching.go
diff --git a/server/transcode/transcoder_ffmpeg.go → transcode/transcoder_ffmpeg.go b/server/transcode/transcoder_ffmpeg.go → transcode/transcoder_ffmpeg.go
diff --git a/server/transcode/transcoder_none.go → transcode/transcoder_none.go b/server/transcode/transcoder_none.go → transcode/transcoder_none.go