🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
refactor: move agent files to adapters for consistency
Deluan7b9bc1c5ac13
diff --git a/core/agents/deezer/client.go b/adapters/deezer/client.gosimilarity index 100%rename from core/agents/deezer/client.gorename to adapters/deezer/client.godiff --git a/core/agents/deezer/client_auth.go b/adapters/deezer/client_auth.gosimilarity index 100%rename from core/agents/deezer/client_auth.gorename to adapters/deezer/client_auth.godiff --git a/core/agents/deezer/client_auth_test.go b/adapters/deezer/client_auth_test.gosimilarity index 100%rename from core/agents/deezer/client_auth_test.gorename to adapters/deezer/client_auth_test.godiff --git a/core/agents/deezer/client_test.go b/adapters/deezer/client_test.gosimilarity index 100%rename from core/agents/deezer/client_test.gorename to adapters/deezer/client_test.godiff --git a/core/agents/deezer/deezer.go b/adapters/deezer/deezer.gosimilarity index 100%rename from core/agents/deezer/deezer.gorename to adapters/deezer/deezer.godiff --git a/core/agents/deezer/deezer_suite_test.go b/adapters/deezer/deezer_suite_test.gosimilarity index 100%rename from core/agents/deezer/deezer_suite_test.gorename to adapters/deezer/deezer_suite_test.godiff --git a/core/agents/deezer/responses.go b/adapters/deezer/responses.gosimilarity index 100%rename from core/agents/deezer/responses.gorename to adapters/deezer/responses.godiff --git a/core/agents/deezer/responses_test.go b/adapters/deezer/responses_test.gosimilarity index 100%rename from core/agents/deezer/responses_test.gorename to adapters/deezer/responses_test.godiff --git a/core/agents/lastfm/agent.go b/adapters/lastfm/agent.gosimilarity index 100%rename from core/agents/lastfm/agent.gorename to adapters/lastfm/agent.godiff --git a/core/agents/lastfm/agent_test.go b/adapters/lastfm/agent_test.gosimilarity index 100%rename from core/agents/lastfm/agent_test.gorename to adapters/lastfm/agent_test.godiff --git a/core/agents/lastfm/auth_router.go b/adapters/lastfm/auth_router.gosimilarity index 100%rename from core/agents/lastfm/auth_router.gorename to adapters/lastfm/auth_router.godiff --git a/core/agents/lastfm/client.go b/adapters/lastfm/client.gosimilarity index 100%rename from core/agents/lastfm/client.gorename to adapters/lastfm/client.godiff --git a/core/agents/lastfm/client_test.go b/adapters/lastfm/client_test.gosimilarity index 100%rename from core/agents/lastfm/client_test.gorename to adapters/lastfm/client_test.godiff --git a/core/agents/lastfm/lastfm_suite_test.go b/adapters/lastfm/lastfm_suite_test.gosimilarity index 100%rename from core/agents/lastfm/lastfm_suite_test.gorename to adapters/lastfm/lastfm_suite_test.godiff --git a/core/agents/lastfm/responses.go b/adapters/lastfm/responses.gosimilarity index 100%rename from core/agents/lastfm/responses.gorename to adapters/lastfm/responses.godiff --git a/core/agents/lastfm/responses_test.go b/adapters/lastfm/responses_test.gosimilarity index 100%rename from core/agents/lastfm/responses_test.gorename to adapters/lastfm/responses_test.godiff --git a/core/agents/lastfm/token_received.html b/adapters/lastfm/token_received.htmlsimilarity index 100%rename from core/agents/lastfm/token_received.htmlrename to adapters/lastfm/token_received.htmldiff --git a/core/agents/listenbrainz/agent.go b/adapters/listenbrainz/agent.gosimilarity index 100%rename from core/agents/listenbrainz/agent.gorename to adapters/listenbrainz/agent.godiff --git a/core/agents/listenbrainz/agent_test.go b/adapters/listenbrainz/agent_test.gosimilarity index 100%rename from core/agents/listenbrainz/agent_test.gorename to adapters/listenbrainz/agent_test.godiff --git a/core/agents/listenbrainz/auth_router.go b/adapters/listenbrainz/auth_router.gosimilarity index 100%rename from core/agents/listenbrainz/auth_router.gorename to adapters/listenbrainz/auth_router.godiff --git a/core/agents/listenbrainz/auth_router_test.go b/adapters/listenbrainz/auth_router_test.gosimilarity index 100%rename from core/agents/listenbrainz/auth_router_test.gorename to adapters/listenbrainz/auth_router_test.godiff --git a/core/agents/listenbrainz/client.go b/adapters/listenbrainz/client.gosimilarity index 100%rename from core/agents/listenbrainz/client.gorename to adapters/listenbrainz/client.godiff --git a/core/agents/listenbrainz/client_test.go b/adapters/listenbrainz/client_test.gosimilarity index 100%rename from core/agents/listenbrainz/client_test.gorename to adapters/listenbrainz/client_test.godiff --git a/core/agents/listenbrainz/listenbrainz_suite_test.go b/adapters/listenbrainz/listenbrainz_suite_test.gosimilarity index 100%rename from core/agents/listenbrainz/listenbrainz_suite_test.gorename to adapters/listenbrainz/listenbrainz_suite_test.godiff --git a/core/agents/spotify/client.go b/adapters/spotify/client.gosimilarity index 100%rename from core/agents/spotify/client.gorename to adapters/spotify/client.godiff --git a/core/agents/spotify/client_test.go b/adapters/spotify/client_test.gosimilarity index 100%rename from core/agents/spotify/client_test.gorename to adapters/spotify/client_test.godiff --git a/core/agents/spotify/responses.go b/adapters/spotify/responses.gosimilarity index 100%rename from core/agents/spotify/responses.gorename to adapters/spotify/responses.godiff --git a/core/agents/spotify/responses_test.go b/adapters/spotify/responses_test.gosimilarity index 100%rename from core/agents/spotify/responses_test.gorename to adapters/spotify/responses_test.godiff --git a/core/agents/spotify/spotify.go b/adapters/spotify/spotify.gosimilarity index 100%rename from core/agents/spotify/spotify.gorename to adapters/spotify/spotify.godiff --git a/core/agents/spotify/spotify_suite_test.go b/adapters/spotify/spotify_suite_test.gosimilarity index 100%rename from core/agents/spotify/spotify_suite_test.gorename to adapters/spotify/spotify_suite_test.godiff --git a/cmd/root.go b/cmd/root.goindex 28bf5ef1d..f5f7ff0cc 100644--- a/cmd/root.go+++ b/cmd/root.go@@ -9,7 +9,6 @@ import ("time""github.com/go-chi/chi/v5/middleware"- _ "github.com/navidrome/navidrome/adapters/taglib""github.com/navidrome/navidrome/conf""github.com/navidrome/navidrome/consts""github.com/navidrome/navidrome/db"@@ -22,6 +21,13 @@ import ("github.com/spf13/cobra""github.com/spf13/viper""golang.org/x/sync/errgroup"++ // Import adapters to register them+ _ "github.com/navidrome/navidrome/adapters/deezer"+ _ "github.com/navidrome/navidrome/adapters/lastfm"+ _ "github.com/navidrome/navidrome/adapters/listenbrainz"+ _ "github.com/navidrome/navidrome/adapters/spotify"+ _ "github.com/navidrome/navidrome/adapters/taglib")var (diff --git a/cmd/wire_gen.go b/cmd/wire_gen.goindex 6f55f061b..a016d7bda 100644--- a/cmd/wire_gen.go+++ b/cmd/wire_gen.go@@ -9,10 +9,10 @@ package cmdimport ("context""github.com/google/wire"+ "github.com/navidrome/navidrome/adapters/lastfm"+ "github.com/navidrome/navidrome/adapters/listenbrainz""github.com/navidrome/navidrome/core""github.com/navidrome/navidrome/core/agents"- "github.com/navidrome/navidrome/core/agents/lastfm"- "github.com/navidrome/navidrome/core/agents/listenbrainz""github.com/navidrome/navidrome/core/artwork""github.com/navidrome/navidrome/core/external""github.com/navidrome/navidrome/core/ffmpeg"@@ -32,6 +32,10 @@ import ()import (+ _ "github.com/navidrome/navidrome/adapters/deezer"+ _ "github.com/navidrome/navidrome/adapters/lastfm"+ _ "github.com/navidrome/navidrome/adapters/listenbrainz"+ _ "github.com/navidrome/navidrome/adapters/spotify"_ "github.com/navidrome/navidrome/adapters/taglib")diff --git a/cmd/wire_injectors.go b/cmd/wire_injectors.goindex c6df60654..56206feb6 100644--- a/cmd/wire_injectors.go+++ b/cmd/wire_injectors.go@@ -6,10 +6,10 @@ import ("context""github.com/google/wire"+ "github.com/navidrome/navidrome/adapters/lastfm"+ "github.com/navidrome/navidrome/adapters/listenbrainz""github.com/navidrome/navidrome/core""github.com/navidrome/navidrome/core/agents"- "github.com/navidrome/navidrome/core/agents/lastfm"- "github.com/navidrome/navidrome/core/agents/listenbrainz""github.com/navidrome/navidrome/core/artwork""github.com/navidrome/navidrome/core/metrics""github.com/navidrome/navidrome/core/playback"diff --git a/core/external/provider.go b/core/external/provider.goindex 735c5ecf4..a6eb848a0 100644--- a/core/external/provider.go+++ b/core/external/provider.go@@ -12,10 +12,6 @@ import ("github.com/Masterminds/squirrel""github.com/navidrome/navidrome/conf""github.com/navidrome/navidrome/core/agents"- _ "github.com/navidrome/navidrome/core/agents/deezer"- _ "github.com/navidrome/navidrome/core/agents/lastfm"- _ "github.com/navidrome/navidrome/core/agents/listenbrainz"- _ "github.com/navidrome/navidrome/core/agents/spotify""github.com/navidrome/navidrome/log""github.com/navidrome/navidrome/model""github.com/navidrome/navidrome/utils"diff --git a/core/external/provider_topsongs_test.go b/core/external/provider_topsongs_test.goindex 5a98817e1..114a35f63 100644--- a/core/external/provider_topsongs_test.go+++ b/core/external/provider_topsongs_test.go@@ -4,10 +4,10 @@ import ("context""errors"+ _ "github.com/navidrome/navidrome/adapters/lastfm"+ _ "github.com/navidrome/navidrome/adapters/listenbrainz"+ _ "github.com/navidrome/navidrome/adapters/spotify""github.com/navidrome/navidrome/core/agents"- _ "github.com/navidrome/navidrome/core/agents/lastfm"- _ "github.com/navidrome/navidrome/core/agents/listenbrainz"- _ "github.com/navidrome/navidrome/core/agents/spotify". "github.com/navidrome/navidrome/core/external""github.com/navidrome/navidrome/model""github.com/navidrome/navidrome/tests"