From 7b9bc1c5ac138fbee7d85edfcbd687bc54dd3c64 Mon Sep 17 00:00:00 2001 From: Deluan Date: Wed, 14 Jan 2026 19:33:54 -0500 Subject: [PATCH] refactor: move agent files to adapters for consistency Signed-off-by: Deluan --- {core/agents => adapters}/deezer/client.go | 0 {core/agents => adapters}/deezer/client_auth.go | 0 {core/agents => adapters}/deezer/client_auth_test.go | 0 {core/agents => adapters}/deezer/client_test.go | 0 {core/agents => adapters}/deezer/deezer.go | 0 {core/agents => adapters}/deezer/deezer_suite_test.go | 0 {core/agents => adapters}/deezer/responses.go | 0 {core/agents => adapters}/deezer/responses_test.go | 0 {core/agents => adapters}/lastfm/agent.go | 0 {core/agents => adapters}/lastfm/agent_test.go | 0 {core/agents => adapters}/lastfm/auth_router.go | 0 {core/agents => adapters}/lastfm/client.go | 0 {core/agents => adapters}/lastfm/client_test.go | 0 {core/agents => adapters}/lastfm/lastfm_suite_test.go | 0 {core/agents => adapters}/lastfm/responses.go | 0 {core/agents => adapters}/lastfm/responses_test.go | 0 {core/agents => adapters}/lastfm/token_received.html | 0 {core/agents => adapters}/listenbrainz/agent.go | 0 {core/agents => adapters}/listenbrainz/agent_test.go | 0 {core/agents => adapters}/listenbrainz/auth_router.go | 0 .../agents => adapters}/listenbrainz/auth_router_test.go | 0 {core/agents => adapters}/listenbrainz/client.go | 0 {core/agents => adapters}/listenbrainz/client_test.go | 0 .../listenbrainz/listenbrainz_suite_test.go | 0 {core/agents => adapters}/spotify/client.go | 0 {core/agents => adapters}/spotify/client_test.go | 0 {core/agents => adapters}/spotify/responses.go | 0 {core/agents => adapters}/spotify/responses_test.go | 0 {core/agents => adapters}/spotify/spotify.go | 0 {core/agents => adapters}/spotify/spotify_suite_test.go | 0 cmd/root.go | 8 +++++++- cmd/wire_gen.go | 8 ++++++-- cmd/wire_injectors.go | 4 ++-- core/external/provider.go | 4 ---- core/external/provider_topsongs_test.go | 6 +++--- 35 files changed, 18 insertions(+), 12 deletions(-) rename {core/agents => adapters}/deezer/client.go (100%) rename {core/agents => adapters}/deezer/client_auth.go (100%) rename {core/agents => adapters}/deezer/client_auth_test.go (100%) rename {core/agents => adapters}/deezer/client_test.go (100%) rename {core/agents => adapters}/deezer/deezer.go (100%) rename {core/agents => adapters}/deezer/deezer_suite_test.go (100%) rename {core/agents => adapters}/deezer/responses.go (100%) rename {core/agents => adapters}/deezer/responses_test.go (100%) rename {core/agents => adapters}/lastfm/agent.go (100%) rename {core/agents => adapters}/lastfm/agent_test.go (100%) rename {core/agents => adapters}/lastfm/auth_router.go (100%) rename {core/agents => adapters}/lastfm/client.go (100%) rename {core/agents => adapters}/lastfm/client_test.go (100%) rename {core/agents => adapters}/lastfm/lastfm_suite_test.go (100%) rename {core/agents => adapters}/lastfm/responses.go (100%) rename {core/agents => adapters}/lastfm/responses_test.go (100%) rename {core/agents => adapters}/lastfm/token_received.html (100%) rename {core/agents => adapters}/listenbrainz/agent.go (100%) rename {core/agents => adapters}/listenbrainz/agent_test.go (100%) rename {core/agents => adapters}/listenbrainz/auth_router.go (100%) rename {core/agents => adapters}/listenbrainz/auth_router_test.go (100%) rename {core/agents => adapters}/listenbrainz/client.go (100%) rename {core/agents => adapters}/listenbrainz/client_test.go (100%) rename {core/agents => adapters}/listenbrainz/listenbrainz_suite_test.go (100%) rename {core/agents => adapters}/spotify/client.go (100%) rename {core/agents => adapters}/spotify/client_test.go (100%) rename {core/agents => adapters}/spotify/responses.go (100%) rename {core/agents => adapters}/spotify/responses_test.go (100%) rename {core/agents => adapters}/spotify/spotify.go (100%) rename {core/agents => adapters}/spotify/spotify_suite_test.go (100%) diff --git a/core/agents/deezer/client.go b/adapters/deezer/client.go similarity index 100% rename from core/agents/deezer/client.go rename to adapters/deezer/client.go diff --git a/core/agents/deezer/client_auth.go b/adapters/deezer/client_auth.go similarity index 100% rename from core/agents/deezer/client_auth.go rename to adapters/deezer/client_auth.go diff --git a/core/agents/deezer/client_auth_test.go b/adapters/deezer/client_auth_test.go similarity index 100% rename from core/agents/deezer/client_auth_test.go rename to adapters/deezer/client_auth_test.go diff --git a/core/agents/deezer/client_test.go b/adapters/deezer/client_test.go similarity index 100% rename from core/agents/deezer/client_test.go rename to adapters/deezer/client_test.go diff --git a/core/agents/deezer/deezer.go b/adapters/deezer/deezer.go similarity index 100% rename from core/agents/deezer/deezer.go rename to adapters/deezer/deezer.go diff --git a/core/agents/deezer/deezer_suite_test.go b/adapters/deezer/deezer_suite_test.go similarity index 100% rename from core/agents/deezer/deezer_suite_test.go rename to adapters/deezer/deezer_suite_test.go diff --git a/core/agents/deezer/responses.go b/adapters/deezer/responses.go similarity index 100% rename from core/agents/deezer/responses.go rename to adapters/deezer/responses.go diff --git a/core/agents/deezer/responses_test.go b/adapters/deezer/responses_test.go similarity index 100% rename from core/agents/deezer/responses_test.go rename to adapters/deezer/responses_test.go diff --git a/core/agents/lastfm/agent.go b/adapters/lastfm/agent.go similarity index 100% rename from core/agents/lastfm/agent.go rename to adapters/lastfm/agent.go diff --git a/core/agents/lastfm/agent_test.go b/adapters/lastfm/agent_test.go similarity index 100% rename from core/agents/lastfm/agent_test.go rename to adapters/lastfm/agent_test.go diff --git a/core/agents/lastfm/auth_router.go b/adapters/lastfm/auth_router.go similarity index 100% rename from core/agents/lastfm/auth_router.go rename to adapters/lastfm/auth_router.go diff --git a/core/agents/lastfm/client.go b/adapters/lastfm/client.go similarity index 100% rename from core/agents/lastfm/client.go rename to adapters/lastfm/client.go diff --git a/core/agents/lastfm/client_test.go b/adapters/lastfm/client_test.go similarity index 100% rename from core/agents/lastfm/client_test.go rename to adapters/lastfm/client_test.go diff --git a/core/agents/lastfm/lastfm_suite_test.go b/adapters/lastfm/lastfm_suite_test.go similarity index 100% rename from core/agents/lastfm/lastfm_suite_test.go rename to adapters/lastfm/lastfm_suite_test.go diff --git a/core/agents/lastfm/responses.go b/adapters/lastfm/responses.go similarity index 100% rename from core/agents/lastfm/responses.go rename to adapters/lastfm/responses.go diff --git a/core/agents/lastfm/responses_test.go b/adapters/lastfm/responses_test.go similarity index 100% rename from core/agents/lastfm/responses_test.go rename to adapters/lastfm/responses_test.go diff --git a/core/agents/lastfm/token_received.html b/adapters/lastfm/token_received.html similarity index 100% rename from core/agents/lastfm/token_received.html rename to adapters/lastfm/token_received.html diff --git a/core/agents/listenbrainz/agent.go b/adapters/listenbrainz/agent.go similarity index 100% rename from core/agents/listenbrainz/agent.go rename to adapters/listenbrainz/agent.go diff --git a/core/agents/listenbrainz/agent_test.go b/adapters/listenbrainz/agent_test.go similarity index 100% rename from core/agents/listenbrainz/agent_test.go rename to adapters/listenbrainz/agent_test.go diff --git a/core/agents/listenbrainz/auth_router.go b/adapters/listenbrainz/auth_router.go similarity index 100% rename from core/agents/listenbrainz/auth_router.go rename to adapters/listenbrainz/auth_router.go diff --git a/core/agents/listenbrainz/auth_router_test.go b/adapters/listenbrainz/auth_router_test.go similarity index 100% rename from core/agents/listenbrainz/auth_router_test.go rename to adapters/listenbrainz/auth_router_test.go diff --git a/core/agents/listenbrainz/client.go b/adapters/listenbrainz/client.go similarity index 100% rename from core/agents/listenbrainz/client.go rename to adapters/listenbrainz/client.go diff --git a/core/agents/listenbrainz/client_test.go b/adapters/listenbrainz/client_test.go similarity index 100% rename from core/agents/listenbrainz/client_test.go rename to adapters/listenbrainz/client_test.go diff --git a/core/agents/listenbrainz/listenbrainz_suite_test.go b/adapters/listenbrainz/listenbrainz_suite_test.go similarity index 100% rename from core/agents/listenbrainz/listenbrainz_suite_test.go rename to adapters/listenbrainz/listenbrainz_suite_test.go diff --git a/core/agents/spotify/client.go b/adapters/spotify/client.go similarity index 100% rename from core/agents/spotify/client.go rename to adapters/spotify/client.go diff --git a/core/agents/spotify/client_test.go b/adapters/spotify/client_test.go similarity index 100% rename from core/agents/spotify/client_test.go rename to adapters/spotify/client_test.go diff --git a/core/agents/spotify/responses.go b/adapters/spotify/responses.go similarity index 100% rename from core/agents/spotify/responses.go rename to adapters/spotify/responses.go diff --git a/core/agents/spotify/responses_test.go b/adapters/spotify/responses_test.go similarity index 100% rename from core/agents/spotify/responses_test.go rename to adapters/spotify/responses_test.go diff --git a/core/agents/spotify/spotify.go b/adapters/spotify/spotify.go similarity index 100% rename from core/agents/spotify/spotify.go rename to adapters/spotify/spotify.go diff --git a/core/agents/spotify/spotify_suite_test.go b/adapters/spotify/spotify_suite_test.go similarity index 100% rename from core/agents/spotify/spotify_suite_test.go rename to adapters/spotify/spotify_suite_test.go diff --git a/cmd/root.go b/cmd/root.go index 28bf5ef1..f5f7ff0c 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.go index 6f55f061..a016d7bd 100644 --- a/cmd/wire_gen.go +++ b/cmd/wire_gen.go @@ -9,10 +9,10 @@ package cmd 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/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.go index c6df6065..56206feb 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.go index 735c5ecf..a6eb848a 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.go index 5a98817e..114a35f6 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"