reorg packages

cmd/gonic/gonic.go

@@ -30,20 +30,20 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"go.senan.xyz/gonic"
+	"go.senan.xyz/gonic/artistinfocache"
 	"go.senan.xyz/gonic/db"
 	"go.senan.xyz/gonic/handlerutil"
 	"go.senan.xyz/gonic/jukebox"
 	"go.senan.xyz/gonic/lastfm"
 	"go.senan.xyz/gonic/listenbrainz"
 	"go.senan.xyz/gonic/playlist"
-	"go.senan.xyz/gonic/podcasts"
+	"go.senan.xyz/gonic/podcast"
 	"go.senan.xyz/gonic/scanner"
 	"go.senan.xyz/gonic/scanner/tags/tagcommon"
 	"go.senan.xyz/gonic/scanner/tags/taglib"
 	"go.senan.xyz/gonic/scrobble"
 	"go.senan.xyz/gonic/server/ctrladmin"
 	"go.senan.xyz/gonic/server/ctrlsubsonic"
-	"go.senan.xyz/gonic/server/ctrlsubsonic/artistinfocache"
 	"go.senan.xyz/gonic/transcode"
 )
 
@@ -187,7 +187,7 @@ func main() {
 		tagReader,
 		*confExcludePatterns,
 	)
-	podcast := podcasts.New(dbc, *confPodcastPath, tagReader)
+	podcast := podcast.New(dbc, *confPodcastPath, tagReader)
 	transcoder := transcode.NewCachingTranscoder(
 		transcode.NewFFmpegTranscoder(),
 		cacheDirAudio,

podcast/podcast.go

@@ -1,4 +1,4 @@
-package podcasts
+package podcast
 
 import (
 	"errors"

podcast/podcast_test.go

@@ -1,4 +1,4 @@
-package podcasts
+package podcast
 
 import (
 	"bytes"

server/ctrladmin/ctrl.go

@@ -26,7 +26,7 @@ import (
 	"go.senan.xyz/gonic/db"
 	"go.senan.xyz/gonic/handlerutil"
 	"go.senan.xyz/gonic/lastfm"
-	"go.senan.xyz/gonic/podcasts"
+	"go.senan.xyz/gonic/podcast"
 	"go.senan.xyz/gonic/scanner"
 	"go.senan.xyz/gonic/server/ctrladmin/adminui"
 )
@@ -44,14 +44,14 @@ type Controller struct {
 	dbc              *db.DB
 	sessDB           *gormstore.Store
 	scanner          *scanner.Scanner
-	podcasts         *podcasts.Podcasts
+	podcasts         *podcast.Podcasts
 	lastfmClient     *lastfm.Client
 	resolveProxyPath ProxyPathResolver
 }
 
 type ProxyPathResolver func(in string) string
 
-func New(dbc *db.DB, sessDB *gormstore.Store, scanner *scanner.Scanner, podcasts *podcasts.Podcasts, lastfmClient *lastfm.Client, resolveProxyPath ProxyPathResolver) (*Controller, error) {
+func New(dbc *db.DB, sessDB *gormstore.Store, scanner *scanner.Scanner, podcasts *podcast.Podcasts, lastfmClient *lastfm.Client, resolveProxyPath ProxyPathResolver) (*Controller, error) {
 	c := Controller{
 		ServeMux: http.NewServeMux(),
 

server/ctrlsubsonic/ctrl.go

@@ -16,10 +16,10 @@ import (
 	"go.senan.xyz/gonic/jukebox"
 	"go.senan.xyz/gonic/lastfm"
 	"go.senan.xyz/gonic/playlist"
-	"go.senan.xyz/gonic/podcasts"
+	"go.senan.xyz/gonic/podcast"
 	"go.senan.xyz/gonic/scanner"
 	"go.senan.xyz/gonic/scrobble"
-	"go.senan.xyz/gonic/server/ctrlsubsonic/artistinfocache"
+	"go.senan.xyz/gonic/artistinfocache"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
 	"go.senan.xyz/gonic/transcode"
@@ -59,14 +59,14 @@ type Controller struct {
 	jukebox          *jukebox.Jukebox
 	playlistStore    *playlist.Store
 	scrobblers       []scrobble.Scrobbler
-	podcasts         *podcasts.Podcasts
+	podcasts         *podcast.Podcasts
 	transcoder       transcode.Transcoder
 	lastFMClient     *lastfm.Client
 	artistInfoCache  *artistinfocache.ArtistInfoCache
 	resolveProxyPath ProxyPathResolver
 }
 
-func New(dbc *db.DB, scannr *scanner.Scanner, musicPaths []MusicPath, podcastsPath string, cacheAudioPath string, cacheCoverPath string, jukebox *jukebox.Jukebox, playlistStore *playlist.Store, scrobblers []scrobble.Scrobbler, podcasts *podcasts.Podcasts, transcoder transcode.Transcoder, lastFMClient *lastfm.Client, artistInfoCache *artistinfocache.ArtistInfoCache, resolveProxyPath ProxyPathResolver) (*Controller, error) {
+func New(dbc *db.DB, scannr *scanner.Scanner, musicPaths []MusicPath, podcastsPath string, cacheAudioPath string, cacheCoverPath string, jukebox *jukebox.Jukebox, playlistStore *playlist.Store, scrobblers []scrobble.Scrobbler, podcasts *podcast.Podcasts, transcoder transcode.Transcoder, lastFMClient *lastfm.Client, artistInfoCache *artistinfocache.ArtistInfoCache, resolveProxyPath ProxyPathResolver) (*Controller, error) {
 	c := Controller{
 		ServeMux: http.NewServeMux(),
 

server/ctrlsubsonic/handlers_raw.go

@@ -16,7 +16,7 @@ import (
 	"github.com/jinzhu/gorm"
 
 	"go.senan.xyz/gonic/db"
-	"go.senan.xyz/gonic/server/ctrlsubsonic/artistinfocache"
+	"go.senan.xyz/gonic/artistinfocache"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
 	"go.senan.xyz/gonic/server/ctrlsubsonic/specid"