From 97e9675dca5e40ac91dcfe04f8f8894c7c87f252 Mon Sep 17 00:00:00 2001 From: sentriz Date: Wed, 4 Oct 2023 20:52:06 +0100 Subject: [PATCH] reorg packages --- .../artistinfocache.go | 0 .../artistinfocache_test.go | 0 cmd/gonic/gonic.go | 6 +++--- podcasts/podcasts.go => podcast/podcast.go | 2 +- podcasts/podcasts_test.go => podcast/podcast_test.go | 2 +- {podcasts => podcast}/testdata/rss.new | 0 server/ctrladmin/ctrl.go | 6 +++--- server/ctrlsubsonic/ctrl.go | 8 ++++---- server/ctrlsubsonic/handlers_raw.go | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename {server/ctrlsubsonic/artistinfocache => artistinfocache}/artistinfocache.go (100%) rename {server/ctrlsubsonic/artistinfocache => artistinfocache}/artistinfocache_test.go (100%) rename podcasts/podcasts.go => podcast/podcast.go (99%) rename podcasts/podcasts_test.go => podcast/podcast_test.go (99%) rename {podcasts => podcast}/testdata/rss.new (100%) diff --git a/server/ctrlsubsonic/artistinfocache/artistinfocache.go b/artistinfocache/artistinfocache.go similarity index 100% rename from server/ctrlsubsonic/artistinfocache/artistinfocache.go rename to artistinfocache/artistinfocache.go diff --git a/server/ctrlsubsonic/artistinfocache/artistinfocache_test.go b/artistinfocache/artistinfocache_test.go similarity index 100% rename from server/ctrlsubsonic/artistinfocache/artistinfocache_test.go rename to artistinfocache/artistinfocache_test.go diff --git a/cmd/gonic/gonic.go b/cmd/gonic/gonic.go index eee83bf..d9383dc 100644 --- a/cmd/gonic/gonic.go +++ b/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, diff --git a/podcasts/podcasts.go b/podcast/podcast.go similarity index 99% rename from podcasts/podcasts.go rename to podcast/podcast.go index 966305b..6cf078f 100644 --- a/podcasts/podcasts.go +++ b/podcast/podcast.go @@ -1,4 +1,4 @@ -package podcasts +package podcast import ( "errors" diff --git a/podcasts/podcasts_test.go b/podcast/podcast_test.go similarity index 99% rename from podcasts/podcasts_test.go rename to podcast/podcast_test.go index 0108b8a..377565d 100644 --- a/podcasts/podcasts_test.go +++ b/podcast/podcast_test.go @@ -1,4 +1,4 @@ -package podcasts +package podcast import ( "bytes" diff --git a/podcasts/testdata/rss.new b/podcast/testdata/rss.new similarity index 100% rename from podcasts/testdata/rss.new rename to podcast/testdata/rss.new diff --git a/server/ctrladmin/ctrl.go b/server/ctrladmin/ctrl.go index e239de1..b2a5214 100644 --- a/server/ctrladmin/ctrl.go +++ b/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(), diff --git a/server/ctrlsubsonic/ctrl.go b/server/ctrlsubsonic/ctrl.go index f3e409c..3a8dd50 100644 --- a/server/ctrlsubsonic/ctrl.go +++ b/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(), diff --git a/server/ctrlsubsonic/handlers_raw.go b/server/ctrlsubsonic/handlers_raw.go index d41c66d..dfef237 100644 --- a/server/ctrlsubsonic/handlers_raw.go +++ b/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"