refactor: move shared packages up a level

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 (

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 {

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 {

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",

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")

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

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 (

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) {

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) {

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) {

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 (

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 (

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 {

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

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) {

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 (

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 {

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 {

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

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])")

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 {

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

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 {

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 {

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 {

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 {

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.

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) {

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 {

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 {

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{

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 {

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