From 857661ebf99d20af73b93be2ce99133bae0103d1 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Fri, 24 Nov 2023 00:07:47 +0100 Subject: [PATCH] Restructured code, moved all modules into internal For now all modules are considered internal. This might change later --- cmd/auth.go | 6 +-- cmd/backends.go | 2 +- cmd/listens.go | 6 +-- cmd/loves.go | 6 +-- cmd/progress.go | 2 +- {backends => internal/backends}/auth.go | 4 +- {backends => internal/backends}/auth_test.go | 2 +- {backends => internal/backends}/backends.go | 20 +++---- .../backends}/backends_test.go | 18 +++---- .../backends}/deezer/auth.go | 0 .../backends}/deezer/client.go | 0 .../backends}/deezer/client_test.go | 2 +- .../backends}/deezer/deezer.go | 2 +- .../backends}/deezer/deezer_test.go | 2 +- .../backends}/deezer/models.go | 0 .../backends}/deezer/models_test.go | 2 +- .../backends}/deezer/testdata/listen.json | 0 .../backends}/deezer/testdata/track.json | 0 .../deezer/testdata/user-history.json | 0 .../deezer/testdata/user-tracks.json | 0 {backends => internal/backends}/dump/dump.go | 2 +- .../backends}/funkwhale/client.go | 0 .../backends}/funkwhale/client_test.go | 2 +- .../backends}/funkwhale/funkwhale.go | 2 +- .../backends}/funkwhale/funkwhale_test.go | 4 +- .../backends}/funkwhale/models.go | 0 .../funkwhale/testdata/favorite-tracks.json | 0 .../funkwhale/testdata/listenings.json | 0 {backends => internal/backends}/jspf/jspf.go | 2 +- .../backends}/jspf/jspf_test.go | 2 +- .../backends}/jspf/models.go | 0 .../backends}/jspf/models_test.go | 2 +- .../jspf/testdata/comprehensive.jspf | 0 .../backends}/jspf/testdata/lb-playlist.jspf | 0 .../backends}/jspf/testdata/simple.jspf | 0 .../backends}/listenbrainz/client.go | 0 .../backends}/listenbrainz/client_test.go | 2 +- .../backends}/listenbrainz/listenbrainz.go | 2 +- .../listenbrainz/listenbrainz_test.go | 4 +- .../backends}/listenbrainz/models.go | 0 .../backends}/listenbrainz/models_test.go | 2 +- .../listenbrainz/testdata/feedback.json | 0 .../listenbrainz/testdata/listen.json | 53 +++++++++++++++++++ .../listenbrainz/testdata/listens.json | 0 .../listenbrainz/testdata/lookup.json | 0 .../backends}/maloja/client.go | 0 .../backends}/maloja/client_test.go | 2 +- .../backends}/maloja/maloja.go | 2 +- .../backends}/maloja/maloja_test.go | 2 +- .../backends}/maloja/models.go | 0 .../maloja/testdata/newscrobble-result.json | 0 .../backends}/maloja/testdata/scrobbles.json | 0 {backends => internal/backends}/process.go | 2 +- .../backends}/scrobblerlog/parser.go | 2 +- .../backends}/scrobblerlog/parser_test.go | 4 +- .../backends}/scrobblerlog/scrobblerlog.go | 2 +- .../scrobblerlog/scrobblerlog_test.go | 2 +- .../backends}/spotify/client.go | 0 .../backends}/spotify/client_test.go | 2 +- .../backends}/spotify/models.go | 0 .../backends}/spotify/models_test.go | 2 +- .../backends}/spotify/spotify.go | 2 +- .../backends}/spotify/spotify_test.go | 2 +- .../backends}/spotify/testdata/listen.json | 0 .../spotify/testdata/recently-played.json | 0 .../backends}/spotify/testdata/track.json | 0 .../spotify/testdata/user-tracks.json | 0 .../backends}/subsonic/subsonic.go | 2 +- .../backends}/subsonic/subsonic_test.go | 2 +- .../backends}/tokensource.go | 2 +- {models => internal/models}/interfaces.go | 0 {models => internal/models}/models.go | 0 {models => internal/models}/models_test.go | 2 +- {storage => internal/storage}/database.go | 0 .../storage}/database_test.go | 2 +- {storage => internal/storage}/models.go | 0 76 files changed, 121 insertions(+), 68 deletions(-) rename {backends => internal/backends}/auth.go (94%) rename {backends => internal/backends}/auth_test.go (96%) rename {backends => internal/backends}/backends.go (87%) rename {backends => internal/backends}/backends_test.go (87%) rename {backends => internal/backends}/deezer/auth.go (100%) rename {backends => internal/backends}/deezer/client.go (100%) rename {backends => internal/backends}/deezer/client_test.go (98%) rename {backends => internal/backends}/deezer/deezer.go (99%) rename {backends => internal/backends}/deezer/deezer_test.go (97%) rename {backends => internal/backends}/deezer/models.go (100%) rename {backends => internal/backends}/deezer/models_test.go (97%) rename {backends => internal/backends}/deezer/testdata/listen.json (100%) rename {backends => internal/backends}/deezer/testdata/track.json (100%) rename {backends => internal/backends}/deezer/testdata/user-history.json (100%) rename {backends => internal/backends}/deezer/testdata/user-tracks.json (100%) rename {backends => internal/backends}/dump/dump.go (97%) rename {backends => internal/backends}/funkwhale/client.go (100%) rename {backends => internal/backends}/funkwhale/client_test.go (98%) rename {backends => internal/backends}/funkwhale/funkwhale.go (98%) rename {backends => internal/backends}/funkwhale/funkwhale_test.go (97%) rename {backends => internal/backends}/funkwhale/models.go (100%) rename {backends => internal/backends}/funkwhale/testdata/favorite-tracks.json (100%) rename {backends => internal/backends}/funkwhale/testdata/listenings.json (100%) rename {backends => internal/backends}/jspf/jspf.go (98%) rename {backends => internal/backends}/jspf/jspf_test.go (94%) rename {backends => internal/backends}/jspf/models.go (100%) rename {backends => internal/backends}/jspf/models_test.go (98%) rename {backends => internal/backends}/jspf/testdata/comprehensive.jspf (100%) rename {backends => internal/backends}/jspf/testdata/lb-playlist.jspf (100%) rename {backends => internal/backends}/jspf/testdata/simple.jspf (100%) rename {backends => internal/backends}/listenbrainz/client.go (100%) rename {backends => internal/backends}/listenbrainz/client_test.go (98%) rename {backends => internal/backends}/listenbrainz/listenbrainz.go (99%) rename {backends => internal/backends}/listenbrainz/listenbrainz_test.go (97%) rename {backends => internal/backends}/listenbrainz/models.go (100%) rename {backends => internal/backends}/listenbrainz/models_test.go (98%) rename {backends => internal/backends}/listenbrainz/testdata/feedback.json (100%) create mode 100644 internal/backends/listenbrainz/testdata/listen.json rename {backends => internal/backends}/listenbrainz/testdata/listens.json (100%) rename {backends => internal/backends}/listenbrainz/testdata/lookup.json (100%) rename {backends => internal/backends}/maloja/client.go (100%) rename {backends => internal/backends}/maloja/client_test.go (98%) rename {backends => internal/backends}/maloja/maloja.go (98%) rename {backends => internal/backends}/maloja/maloja_test.go (96%) rename {backends => internal/backends}/maloja/models.go (100%) rename {backends => internal/backends}/maloja/testdata/newscrobble-result.json (100%) rename {backends => internal/backends}/maloja/testdata/scrobbles.json (100%) rename {backends => internal/backends}/process.go (98%) rename {backends => internal/backends}/scrobblerlog/parser.go (99%) rename {backends => internal/backends}/scrobblerlog/parser_test.go (97%) rename {backends => internal/backends}/scrobblerlog/scrobblerlog.go (98%) rename {backends => internal/backends}/scrobblerlog/scrobblerlog_test.go (94%) rename {backends => internal/backends}/spotify/client.go (100%) rename {backends => internal/backends}/spotify/client_test.go (98%) rename {backends => internal/backends}/spotify/models.go (100%) rename {backends => internal/backends}/spotify/models_test.go (96%) rename {backends => internal/backends}/spotify/spotify.go (99%) rename {backends => internal/backends}/spotify/spotify_test.go (98%) rename {backends => internal/backends}/spotify/testdata/listen.json (100%) rename {backends => internal/backends}/spotify/testdata/recently-played.json (100%) rename {backends => internal/backends}/spotify/testdata/track.json (100%) rename {backends => internal/backends}/spotify/testdata/user-tracks.json (100%) rename {backends => internal/backends}/subsonic/subsonic.go (98%) rename {backends => internal/backends}/subsonic/subsonic_test.go (97%) rename {backends => internal/backends}/tokensource.go (97%) rename {models => internal/models}/interfaces.go (100%) rename {models => internal/models}/models.go (100%) rename {models => internal/models}/models_test.go (99%) rename {storage => internal/storage}/database.go (100%) rename {storage => internal/storage}/database_test.go (97%) rename {storage => internal/storage}/models.go (100%) diff --git a/cmd/auth.go b/cmd/auth.go index 7ab9e19..810c41a 100644 --- a/cmd/auth.go +++ b/cmd/auth.go @@ -23,10 +23,10 @@ import ( "github.com/cli/browser" "github.com/spf13/cobra" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/backends" "go.uploadedlobster.com/scotty/internal/auth" - "go.uploadedlobster.com/scotty/models" - "go.uploadedlobster.com/scotty/storage" + "go.uploadedlobster.com/scotty/internal/backends" + "go.uploadedlobster.com/scotty/internal/models" + "go.uploadedlobster.com/scotty/internal/storage" "golang.org/x/oauth2" ) diff --git a/cmd/backends.go b/cmd/backends.go index 0e0a4e4..7d6383e 100644 --- a/cmd/backends.go +++ b/cmd/backends.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/spf13/cobra" - "go.uploadedlobster.com/scotty/backends" + "go.uploadedlobster.com/scotty/internal/backends" ) // backendsCmd represents the backends command diff --git a/cmd/listens.go b/cmd/listens.go index 9bc6945..c18bace 100644 --- a/cmd/listens.go +++ b/cmd/listens.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/backends" - "go.uploadedlobster.com/scotty/models" - "go.uploadedlobster.com/scotty/storage" + "go.uploadedlobster.com/scotty/internal/backends" + "go.uploadedlobster.com/scotty/internal/models" + "go.uploadedlobster.com/scotty/internal/storage" ) // listensCmd represents the listens command diff --git a/cmd/loves.go b/cmd/loves.go index 29fd625..941290f 100644 --- a/cmd/loves.go +++ b/cmd/loves.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/backends" - "go.uploadedlobster.com/scotty/models" - "go.uploadedlobster.com/scotty/storage" + "go.uploadedlobster.com/scotty/internal/backends" + "go.uploadedlobster.com/scotty/internal/models" + "go.uploadedlobster.com/scotty/internal/storage" ) // lovesCmd represents the loves command diff --git a/cmd/progress.go b/cmd/progress.go index ef1d541..b328f29 100644 --- a/cmd/progress.go +++ b/cmd/progress.go @@ -24,7 +24,7 @@ import ( "github.com/fatih/color" "github.com/vbauerster/mpb/v8" "github.com/vbauerster/mpb/v8/decor" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) func progressBar(wg *sync.WaitGroup, exportProgress chan models.Progress, importProgress chan models.Progress) *mpb.Progress { diff --git a/backends/auth.go b/internal/backends/auth.go similarity index 94% rename from backends/auth.go rename to internal/backends/auth.go index 2309826..5bca84c 100644 --- a/backends/auth.go +++ b/internal/backends/auth.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/models" - "go.uploadedlobster.com/scotty/storage" + "go.uploadedlobster.com/scotty/internal/models" + "go.uploadedlobster.com/scotty/internal/storage" ) func BuildRedirectURL(config *viper.Viper, backend string) (*url.URL, error) { diff --git a/backends/auth_test.go b/internal/backends/auth_test.go similarity index 96% rename from backends/auth_test.go rename to internal/backends/auth_test.go index f4e1c4d..67ecf4e 100644 --- a/backends/auth_test.go +++ b/internal/backends/auth_test.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends" + "go.uploadedlobster.com/scotty/internal/backends" ) func TestBuildRedirectURL(t *testing.T) { diff --git a/backends/backends.go b/internal/backends/backends.go similarity index 87% rename from backends/backends.go rename to internal/backends/backends.go index aad5af7..cf78dad 100644 --- a/backends/backends.go +++ b/internal/backends/backends.go @@ -23,16 +23,16 @@ import ( "strings" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/backends/deezer" - "go.uploadedlobster.com/scotty/backends/dump" - "go.uploadedlobster.com/scotty/backends/funkwhale" - "go.uploadedlobster.com/scotty/backends/jspf" - "go.uploadedlobster.com/scotty/backends/listenbrainz" - "go.uploadedlobster.com/scotty/backends/maloja" - "go.uploadedlobster.com/scotty/backends/scrobblerlog" - "go.uploadedlobster.com/scotty/backends/spotify" - "go.uploadedlobster.com/scotty/backends/subsonic" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/backends/deezer" + "go.uploadedlobster.com/scotty/internal/backends/dump" + "go.uploadedlobster.com/scotty/internal/backends/funkwhale" + "go.uploadedlobster.com/scotty/internal/backends/jspf" + "go.uploadedlobster.com/scotty/internal/backends/listenbrainz" + "go.uploadedlobster.com/scotty/internal/backends/maloja" + "go.uploadedlobster.com/scotty/internal/backends/scrobblerlog" + "go.uploadedlobster.com/scotty/internal/backends/spotify" + "go.uploadedlobster.com/scotty/internal/backends/subsonic" + "go.uploadedlobster.com/scotty/internal/models" ) type BackendInfo struct { diff --git a/backends/backends_test.go b/internal/backends/backends_test.go similarity index 87% rename from backends/backends_test.go rename to internal/backends/backends_test.go index 8eea87a..89407a3 100644 --- a/backends/backends_test.go +++ b/internal/backends/backends_test.go @@ -23,15 +23,15 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "go.uploadedlobster.com/scotty/backends" - "go.uploadedlobster.com/scotty/backends/dump" - "go.uploadedlobster.com/scotty/backends/funkwhale" - "go.uploadedlobster.com/scotty/backends/jspf" - "go.uploadedlobster.com/scotty/backends/listenbrainz" - "go.uploadedlobster.com/scotty/backends/maloja" - "go.uploadedlobster.com/scotty/backends/scrobblerlog" - "go.uploadedlobster.com/scotty/backends/subsonic" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/backends" + "go.uploadedlobster.com/scotty/internal/backends/dump" + "go.uploadedlobster.com/scotty/internal/backends/funkwhale" + "go.uploadedlobster.com/scotty/internal/backends/jspf" + "go.uploadedlobster.com/scotty/internal/backends/listenbrainz" + "go.uploadedlobster.com/scotty/internal/backends/maloja" + "go.uploadedlobster.com/scotty/internal/backends/scrobblerlog" + "go.uploadedlobster.com/scotty/internal/backends/subsonic" + "go.uploadedlobster.com/scotty/internal/models" ) func TestResolveBackend(t *testing.T) { diff --git a/backends/deezer/auth.go b/internal/backends/deezer/auth.go similarity index 100% rename from backends/deezer/auth.go rename to internal/backends/deezer/auth.go diff --git a/backends/deezer/client.go b/internal/backends/deezer/client.go similarity index 100% rename from backends/deezer/client.go rename to internal/backends/deezer/client.go diff --git a/backends/deezer/client_test.go b/internal/backends/deezer/client_test.go similarity index 98% rename from backends/deezer/client_test.go rename to internal/backends/deezer/client_test.go index b7b7f66..f8240f8 100644 --- a/backends/deezer/client_test.go +++ b/internal/backends/deezer/client_test.go @@ -29,7 +29,7 @@ import ( "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/deezer" + "go.uploadedlobster.com/scotty/internal/backends/deezer" "golang.org/x/oauth2" ) diff --git a/backends/deezer/deezer.go b/internal/backends/deezer/deezer.go similarity index 99% rename from backends/deezer/deezer.go rename to internal/backends/deezer/deezer.go index 4420da8..c35b8ae 100644 --- a/backends/deezer/deezer.go +++ b/internal/backends/deezer/deezer.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/viper" "go.uploadedlobster.com/scotty/internal/auth" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" "golang.org/x/oauth2" ) diff --git a/backends/deezer/deezer_test.go b/internal/backends/deezer/deezer_test.go similarity index 97% rename from backends/deezer/deezer_test.go rename to internal/backends/deezer/deezer_test.go index 4d1d50c..c1bc23d 100644 --- a/backends/deezer/deezer_test.go +++ b/internal/backends/deezer/deezer_test.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/deezer" + "go.uploadedlobster.com/scotty/internal/backends/deezer" ) func TestFromConfig(t *testing.T) { diff --git a/backends/deezer/models.go b/internal/backends/deezer/models.go similarity index 100% rename from backends/deezer/models.go rename to internal/backends/deezer/models.go diff --git a/backends/deezer/models_test.go b/internal/backends/deezer/models_test.go similarity index 97% rename from backends/deezer/models_test.go rename to internal/backends/deezer/models_test.go index ca2fa18..6a38b5c 100644 --- a/backends/deezer/models_test.go +++ b/internal/backends/deezer/models_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/deezer" + "go.uploadedlobster.com/scotty/internal/backends/deezer" ) func TestUserTracksResult(t *testing.T) { diff --git a/backends/deezer/testdata/listen.json b/internal/backends/deezer/testdata/listen.json similarity index 100% rename from backends/deezer/testdata/listen.json rename to internal/backends/deezer/testdata/listen.json diff --git a/backends/deezer/testdata/track.json b/internal/backends/deezer/testdata/track.json similarity index 100% rename from backends/deezer/testdata/track.json rename to internal/backends/deezer/testdata/track.json diff --git a/backends/deezer/testdata/user-history.json b/internal/backends/deezer/testdata/user-history.json similarity index 100% rename from backends/deezer/testdata/user-history.json rename to internal/backends/deezer/testdata/user-history.json diff --git a/backends/deezer/testdata/user-tracks.json b/internal/backends/deezer/testdata/user-tracks.json similarity index 100% rename from backends/deezer/testdata/user-tracks.json rename to internal/backends/deezer/testdata/user-tracks.json diff --git a/backends/dump/dump.go b/internal/backends/dump/dump.go similarity index 97% rename from backends/dump/dump.go rename to internal/backends/dump/dump.go index 851693d..a5c3751 100644 --- a/backends/dump/dump.go +++ b/internal/backends/dump/dump.go @@ -18,7 +18,7 @@ package dump import ( "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) type DumpBackend struct{} diff --git a/backends/funkwhale/client.go b/internal/backends/funkwhale/client.go similarity index 100% rename from backends/funkwhale/client.go rename to internal/backends/funkwhale/client.go diff --git a/backends/funkwhale/client_test.go b/internal/backends/funkwhale/client_test.go similarity index 98% rename from backends/funkwhale/client_test.go rename to internal/backends/funkwhale/client_test.go index ff08871..89325cd 100644 --- a/backends/funkwhale/client_test.go +++ b/internal/backends/funkwhale/client_test.go @@ -28,7 +28,7 @@ import ( "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/funkwhale" + "go.uploadedlobster.com/scotty/internal/backends/funkwhale" ) func TestNewClient(t *testing.T) { diff --git a/backends/funkwhale/funkwhale.go b/internal/backends/funkwhale/funkwhale.go similarity index 98% rename from backends/funkwhale/funkwhale.go rename to internal/backends/funkwhale/funkwhale.go index 1437c0c..617b90a 100644 --- a/backends/funkwhale/funkwhale.go +++ b/internal/backends/funkwhale/funkwhale.go @@ -21,7 +21,7 @@ import ( "time" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) const FunkwhaleClientName = "Funkwhale" diff --git a/backends/funkwhale/funkwhale_test.go b/internal/backends/funkwhale/funkwhale_test.go similarity index 97% rename from backends/funkwhale/funkwhale_test.go rename to internal/backends/funkwhale/funkwhale_test.go index 3047d43..1047671 100644 --- a/backends/funkwhale/funkwhale_test.go +++ b/internal/backends/funkwhale/funkwhale_test.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/funkwhale" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/backends/funkwhale" + "go.uploadedlobster.com/scotty/internal/models" ) func TestFromConfig(t *testing.T) { diff --git a/backends/funkwhale/models.go b/internal/backends/funkwhale/models.go similarity index 100% rename from backends/funkwhale/models.go rename to internal/backends/funkwhale/models.go diff --git a/backends/funkwhale/testdata/favorite-tracks.json b/internal/backends/funkwhale/testdata/favorite-tracks.json similarity index 100% rename from backends/funkwhale/testdata/favorite-tracks.json rename to internal/backends/funkwhale/testdata/favorite-tracks.json diff --git a/backends/funkwhale/testdata/listenings.json b/internal/backends/funkwhale/testdata/listenings.json similarity index 100% rename from backends/funkwhale/testdata/listenings.json rename to internal/backends/funkwhale/testdata/listenings.json diff --git a/backends/jspf/jspf.go b/internal/backends/jspf/jspf.go similarity index 98% rename from backends/jspf/jspf.go rename to internal/backends/jspf/jspf.go index 797cf2c..619371b 100644 --- a/backends/jspf/jspf.go +++ b/internal/backends/jspf/jspf.go @@ -23,7 +23,7 @@ import ( "time" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) type JSPFBackend struct { diff --git a/backends/jspf/jspf_test.go b/internal/backends/jspf/jspf_test.go similarity index 94% rename from backends/jspf/jspf_test.go rename to internal/backends/jspf/jspf_test.go index 34410a6..08c5b2e 100644 --- a/backends/jspf/jspf_test.go +++ b/internal/backends/jspf/jspf_test.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "go.uploadedlobster.com/scotty/backends/scrobblerlog" + "go.uploadedlobster.com/scotty/internal/backends/scrobblerlog" ) func TestFromConfig(t *testing.T) { diff --git a/backends/jspf/models.go b/internal/backends/jspf/models.go similarity index 100% rename from backends/jspf/models.go rename to internal/backends/jspf/models.go diff --git a/backends/jspf/models_test.go b/internal/backends/jspf/models_test.go similarity index 98% rename from backends/jspf/models_test.go rename to internal/backends/jspf/models_test.go index 7f26c06..ddd7c01 100644 --- a/backends/jspf/models_test.go +++ b/internal/backends/jspf/models_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/jspf" + "go.uploadedlobster.com/scotty/internal/backends/jspf" ) func TestUnmarshalSimple(t *testing.T) { diff --git a/backends/jspf/testdata/comprehensive.jspf b/internal/backends/jspf/testdata/comprehensive.jspf similarity index 100% rename from backends/jspf/testdata/comprehensive.jspf rename to internal/backends/jspf/testdata/comprehensive.jspf diff --git a/backends/jspf/testdata/lb-playlist.jspf b/internal/backends/jspf/testdata/lb-playlist.jspf similarity index 100% rename from backends/jspf/testdata/lb-playlist.jspf rename to internal/backends/jspf/testdata/lb-playlist.jspf diff --git a/backends/jspf/testdata/simple.jspf b/internal/backends/jspf/testdata/simple.jspf similarity index 100% rename from backends/jspf/testdata/simple.jspf rename to internal/backends/jspf/testdata/simple.jspf diff --git a/backends/listenbrainz/client.go b/internal/backends/listenbrainz/client.go similarity index 100% rename from backends/listenbrainz/client.go rename to internal/backends/listenbrainz/client.go diff --git a/backends/listenbrainz/client_test.go b/internal/backends/listenbrainz/client_test.go similarity index 98% rename from backends/listenbrainz/client_test.go rename to internal/backends/listenbrainz/client_test.go index b151a81..faabbe1 100644 --- a/backends/listenbrainz/client_test.go +++ b/internal/backends/listenbrainz/client_test.go @@ -29,7 +29,7 @@ import ( "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/listenbrainz" + "go.uploadedlobster.com/scotty/internal/backends/listenbrainz" ) func TestNewClient(t *testing.T) { diff --git a/backends/listenbrainz/listenbrainz.go b/internal/backends/listenbrainz/listenbrainz.go similarity index 99% rename from backends/listenbrainz/listenbrainz.go rename to internal/backends/listenbrainz/listenbrainz.go index af2dea2..35cd37a 100644 --- a/backends/listenbrainz/listenbrainz.go +++ b/internal/backends/listenbrainz/listenbrainz.go @@ -22,7 +22,7 @@ import ( "time" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) type ListenBrainzApiBackend struct { diff --git a/backends/listenbrainz/listenbrainz_test.go b/internal/backends/listenbrainz/listenbrainz_test.go similarity index 97% rename from backends/listenbrainz/listenbrainz_test.go rename to internal/backends/listenbrainz/listenbrainz_test.go index 0fcaeea..03592a3 100644 --- a/backends/listenbrainz/listenbrainz_test.go +++ b/internal/backends/listenbrainz/listenbrainz_test.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/listenbrainz" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/backends/listenbrainz" + "go.uploadedlobster.com/scotty/internal/models" ) func TestFromConfig(t *testing.T) { diff --git a/backends/listenbrainz/models.go b/internal/backends/listenbrainz/models.go similarity index 100% rename from backends/listenbrainz/models.go rename to internal/backends/listenbrainz/models.go diff --git a/backends/listenbrainz/models_test.go b/internal/backends/listenbrainz/models_test.go similarity index 98% rename from backends/listenbrainz/models_test.go rename to internal/backends/listenbrainz/models_test.go index 1015b3b..845690d 100644 --- a/backends/listenbrainz/models_test.go +++ b/internal/backends/listenbrainz/models_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/listenbrainz" + "go.uploadedlobster.com/scotty/internal/backends/listenbrainz" ) func TestTrackDurationMillisecondsInt(t *testing.T) { diff --git a/backends/listenbrainz/testdata/feedback.json b/internal/backends/listenbrainz/testdata/feedback.json similarity index 100% rename from backends/listenbrainz/testdata/feedback.json rename to internal/backends/listenbrainz/testdata/feedback.json diff --git a/internal/backends/listenbrainz/testdata/listen.json b/internal/backends/listenbrainz/testdata/listen.json new file mode 100644 index 0000000..357aaaa --- /dev/null +++ b/internal/backends/listenbrainz/testdata/listen.json @@ -0,0 +1,53 @@ +{ + "inserted_at": 1700580352, + "listened_at": 1700580273, + "recording_msid": "0a3144ea-f85c-4238-b0e3-e3d7a422df9d", + "track_metadata": { + "additional_info": { + "artist_names": [ + "Dool" + ], + "discnumber": 1, + "duration_ms": 413826, + "isrc": "DES561620801", + "music_service": "spotify.com", + "origin_url": "https://open.spotify.com/track/2JKUgGuXK3dEvyuIJ4Yj2V", + "recording_msid": "0a3144ea-f85c-4238-b0e3-e3d7a422df9d", + "release_artist_name": "Dool", + "release_artist_names": [ + "Dool" + ], + "spotify_album_artist_ids": [ + "https://open.spotify.com/artist/101HSR6JTJqe3DBh6rb8kz" + ], + "spotify_album_id": "https://open.spotify.com/album/5U1umzRH4EONHWsFgPtRbA", + "spotify_artist_ids": [ + "https://open.spotify.com/artist/101HSR6JTJqe3DBh6rb8kz" + ], + "spotify_id": "https://open.spotify.com/track/2JKUgGuXK3dEvyuIJ4Yj2V", + "submission_client": "listenbrainz", + "tracknumber": 5 + }, + "artist_name": "Dool", + "mbid_mapping": { + "artist_mbids": [ + "24412926-c7bd-48e8-afad-8a285b42e131" + ], + "artists": [ + { + "artist_credit_name": "Dool", + "artist_mbid": "24412926-c7bd-48e8-afad-8a285b42e131", + "join_phrase": "" + } + ], + "caa_id": 15991300316, + "caa_release_mbid": "d7f22677-9803-4d21-ba42-081b633a6f68", + "recording_mbid": "c0a1fc94-5f04-4a5f-bc09-e5de0c49cd12", + "recording_name": "Oweynagat", + "release_mbid": "aa1ea1ac-7ec4-4542-a494-105afbfe547d" + }, + "release_name": "Here Now, There Then", + "track_name": "Oweynagat" + }, + "user_name": "outsidecontext" +} diff --git a/backends/listenbrainz/testdata/listens.json b/internal/backends/listenbrainz/testdata/listens.json similarity index 100% rename from backends/listenbrainz/testdata/listens.json rename to internal/backends/listenbrainz/testdata/listens.json diff --git a/backends/listenbrainz/testdata/lookup.json b/internal/backends/listenbrainz/testdata/lookup.json similarity index 100% rename from backends/listenbrainz/testdata/lookup.json rename to internal/backends/listenbrainz/testdata/lookup.json diff --git a/backends/maloja/client.go b/internal/backends/maloja/client.go similarity index 100% rename from backends/maloja/client.go rename to internal/backends/maloja/client.go diff --git a/backends/maloja/client_test.go b/internal/backends/maloja/client_test.go similarity index 98% rename from backends/maloja/client_test.go rename to internal/backends/maloja/client_test.go index b4caaf4..6a07adb 100644 --- a/backends/maloja/client_test.go +++ b/internal/backends/maloja/client_test.go @@ -28,7 +28,7 @@ import ( "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/maloja" + "go.uploadedlobster.com/scotty/internal/backends/maloja" ) func TestNewClient(t *testing.T) { diff --git a/backends/maloja/maloja.go b/internal/backends/maloja/maloja.go similarity index 98% rename from backends/maloja/maloja.go rename to internal/backends/maloja/maloja.go index 6bb3364..58a70b7 100644 --- a/backends/maloja/maloja.go +++ b/internal/backends/maloja/maloja.go @@ -23,7 +23,7 @@ import ( "time" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) type MalojaApiBackend struct { diff --git a/backends/maloja/maloja_test.go b/internal/backends/maloja/maloja_test.go similarity index 96% rename from backends/maloja/maloja_test.go rename to internal/backends/maloja/maloja_test.go index 79dccb0..bb0dc16 100644 --- a/backends/maloja/maloja_test.go +++ b/internal/backends/maloja/maloja_test.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "go.uploadedlobster.com/scotty/backends/maloja" + "go.uploadedlobster.com/scotty/internal/backends/maloja" ) func TestFromConfig(t *testing.T) { diff --git a/backends/maloja/models.go b/internal/backends/maloja/models.go similarity index 100% rename from backends/maloja/models.go rename to internal/backends/maloja/models.go diff --git a/backends/maloja/testdata/newscrobble-result.json b/internal/backends/maloja/testdata/newscrobble-result.json similarity index 100% rename from backends/maloja/testdata/newscrobble-result.json rename to internal/backends/maloja/testdata/newscrobble-result.json diff --git a/backends/maloja/testdata/scrobbles.json b/internal/backends/maloja/testdata/scrobbles.json similarity index 100% rename from backends/maloja/testdata/scrobbles.json rename to internal/backends/maloja/testdata/scrobbles.json diff --git a/backends/process.go b/internal/backends/process.go similarity index 98% rename from backends/process.go rename to internal/backends/process.go index e31f2dd..1143cc0 100644 --- a/backends/process.go +++ b/internal/backends/process.go @@ -17,7 +17,7 @@ Scotty. If not, see . package backends -import "go.uploadedlobster.com/scotty/models" +import "go.uploadedlobster.com/scotty/internal/models" func ProcessListensImports(importer models.ListensImport, results chan models.ListensResult, out chan models.ImportResult, progress chan models.Progress) { defer close(out) diff --git a/backends/scrobblerlog/parser.go b/internal/backends/scrobblerlog/parser.go similarity index 99% rename from backends/scrobblerlog/parser.go rename to internal/backends/scrobblerlog/parser.go index aeb0305..8687c6a 100644 --- a/backends/scrobblerlog/parser.go +++ b/internal/backends/scrobblerlog/parser.go @@ -31,7 +31,7 @@ import ( "strings" "time" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) type ScrobblerLog struct { diff --git a/backends/scrobblerlog/parser_test.go b/internal/backends/scrobblerlog/parser_test.go similarity index 97% rename from backends/scrobblerlog/parser_test.go rename to internal/backends/scrobblerlog/parser_test.go index 8b32724..76b6c87 100644 --- a/backends/scrobblerlog/parser_test.go +++ b/internal/backends/scrobblerlog/parser_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/scrobblerlog" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/backends/scrobblerlog" + "go.uploadedlobster.com/scotty/internal/models" ) var testScrobblerLog = `#AUDIOSCROBBLER/1.1 diff --git a/backends/scrobblerlog/scrobblerlog.go b/internal/backends/scrobblerlog/scrobblerlog.go similarity index 98% rename from backends/scrobblerlog/scrobblerlog.go rename to internal/backends/scrobblerlog/scrobblerlog.go index 2cae24d..1c4f652 100644 --- a/backends/scrobblerlog/scrobblerlog.go +++ b/internal/backends/scrobblerlog/scrobblerlog.go @@ -23,7 +23,7 @@ import ( "time" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) type ScrobblerLogBackend struct { diff --git a/backends/scrobblerlog/scrobblerlog_test.go b/internal/backends/scrobblerlog/scrobblerlog_test.go similarity index 94% rename from backends/scrobblerlog/scrobblerlog_test.go rename to internal/backends/scrobblerlog/scrobblerlog_test.go index 6ba40b8..4e6c600 100644 --- a/backends/scrobblerlog/scrobblerlog_test.go +++ b/internal/backends/scrobblerlog/scrobblerlog_test.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "go.uploadedlobster.com/scotty/backends/scrobblerlog" + "go.uploadedlobster.com/scotty/internal/backends/scrobblerlog" ) func TestFromConfig(t *testing.T) { diff --git a/backends/spotify/client.go b/internal/backends/spotify/client.go similarity index 100% rename from backends/spotify/client.go rename to internal/backends/spotify/client.go diff --git a/backends/spotify/client_test.go b/internal/backends/spotify/client_test.go similarity index 98% rename from backends/spotify/client_test.go rename to internal/backends/spotify/client_test.go index bdd1a6e..7d738bf 100644 --- a/backends/spotify/client_test.go +++ b/internal/backends/spotify/client_test.go @@ -29,7 +29,7 @@ import ( "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/spotify" + "go.uploadedlobster.com/scotty/internal/backends/spotify" "golang.org/x/oauth2" ) diff --git a/backends/spotify/models.go b/internal/backends/spotify/models.go similarity index 100% rename from backends/spotify/models.go rename to internal/backends/spotify/models.go diff --git a/backends/spotify/models_test.go b/internal/backends/spotify/models_test.go similarity index 96% rename from backends/spotify/models_test.go rename to internal/backends/spotify/models_test.go index 5c4d256..fcb4b6b 100644 --- a/backends/spotify/models_test.go +++ b/internal/backends/spotify/models_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/spotify" + "go.uploadedlobster.com/scotty/internal/backends/spotify" ) func TestRecentlyPlayedResult(t *testing.T) { diff --git a/backends/spotify/spotify.go b/internal/backends/spotify/spotify.go similarity index 99% rename from backends/spotify/spotify.go rename to internal/backends/spotify/spotify.go index cd01b4f..44db61c 100644 --- a/backends/spotify/spotify.go +++ b/internal/backends/spotify/spotify.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/viper" "go.uploadedlobster.com/scotty/internal/auth" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" "golang.org/x/oauth2" "golang.org/x/oauth2/spotify" ) diff --git a/backends/spotify/spotify_test.go b/internal/backends/spotify/spotify_test.go similarity index 98% rename from backends/spotify/spotify_test.go rename to internal/backends/spotify/spotify_test.go index 2cadd17..5f1d544 100644 --- a/backends/spotify/spotify_test.go +++ b/internal/backends/spotify/spotify_test.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/backends/spotify" + "go.uploadedlobster.com/scotty/internal/backends/spotify" ) func TestFromConfig(t *testing.T) { diff --git a/backends/spotify/testdata/listen.json b/internal/backends/spotify/testdata/listen.json similarity index 100% rename from backends/spotify/testdata/listen.json rename to internal/backends/spotify/testdata/listen.json diff --git a/backends/spotify/testdata/recently-played.json b/internal/backends/spotify/testdata/recently-played.json similarity index 100% rename from backends/spotify/testdata/recently-played.json rename to internal/backends/spotify/testdata/recently-played.json diff --git a/backends/spotify/testdata/track.json b/internal/backends/spotify/testdata/track.json similarity index 100% rename from backends/spotify/testdata/track.json rename to internal/backends/spotify/testdata/track.json diff --git a/backends/spotify/testdata/user-tracks.json b/internal/backends/spotify/testdata/user-tracks.json similarity index 100% rename from backends/spotify/testdata/user-tracks.json rename to internal/backends/spotify/testdata/user-tracks.json diff --git a/backends/subsonic/subsonic.go b/internal/backends/subsonic/subsonic.go similarity index 98% rename from backends/subsonic/subsonic.go rename to internal/backends/subsonic/subsonic.go index a2216f6..348a249 100644 --- a/backends/subsonic/subsonic.go +++ b/internal/backends/subsonic/subsonic.go @@ -23,7 +23,7 @@ import ( "github.com/delucks/go-subsonic" "github.com/spf13/viper" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) type SubsonicApiBackend struct { diff --git a/backends/subsonic/subsonic_test.go b/internal/backends/subsonic/subsonic_test.go similarity index 97% rename from backends/subsonic/subsonic_test.go rename to internal/backends/subsonic/subsonic_test.go index cdee248..d87c173 100644 --- a/backends/subsonic/subsonic_test.go +++ b/internal/backends/subsonic/subsonic_test.go @@ -23,7 +23,7 @@ import ( go_subsonic "github.com/delucks/go-subsonic" "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "go.uploadedlobster.com/scotty/backends/subsonic" + "go.uploadedlobster.com/scotty/internal/backends/subsonic" ) func TestFromConfig(t *testing.T) { diff --git a/backends/tokensource.go b/internal/backends/tokensource.go similarity index 97% rename from backends/tokensource.go rename to internal/backends/tokensource.go index a3e4970..6dfc184 100644 --- a/backends/tokensource.go +++ b/internal/backends/tokensource.go @@ -18,7 +18,7 @@ package backends import ( "context" - "go.uploadedlobster.com/scotty/storage" + "go.uploadedlobster.com/scotty/internal/storage" "golang.org/x/oauth2" ) diff --git a/models/interfaces.go b/internal/models/interfaces.go similarity index 100% rename from models/interfaces.go rename to internal/models/interfaces.go diff --git a/models/models.go b/internal/models/models.go similarity index 100% rename from models/models.go rename to internal/models/models.go diff --git a/models/models_test.go b/internal/models/models_test.go similarity index 99% rename from models/models_test.go rename to internal/models/models_test.go index 994cd68..da01c36 100644 --- a/models/models_test.go +++ b/internal/models/models_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/models" + "go.uploadedlobster.com/scotty/internal/models" ) func TestTrackArtistName(t *testing.T) { diff --git a/storage/database.go b/internal/storage/database.go similarity index 100% rename from storage/database.go rename to internal/storage/database.go diff --git a/storage/database_test.go b/internal/storage/database_test.go similarity index 97% rename from storage/database_test.go rename to internal/storage/database_test.go index 72dcd3e..cd95149 100644 --- a/storage/database_test.go +++ b/internal/storage/database_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uploadedlobster.com/scotty/storage" + "go.uploadedlobster.com/scotty/internal/storage" "golang.org/x/oauth2" ) diff --git a/storage/models.go b/internal/storage/models.go similarity index 100% rename from storage/models.go rename to internal/storage/models.go