From d921bb6a95aa597ad72fbb6fb573307e8d05092e Mon Sep 17 00:00:00 2001 From: Deluan Date: Sun, 5 Jul 2026 15:42:20 -0400 Subject: [PATCH] refactor(server): extract shared query filter builders to server/filter Moves server/subsonic/filter to server/filter so server/jellyfin can use the shared query-option builders without importing server/subsonic, enforcing the rule that no API package imports another API's package. --- server/{subsonic => }/filter/filters.go | 0 server/jellyfin/items.go | 2 +- server/subsonic/album_lists.go | 2 +- server/subsonic/browsing.go | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename server/{subsonic => }/filter/filters.go (100%) diff --git a/server/subsonic/filter/filters.go b/server/filter/filters.go similarity index 100% rename from server/subsonic/filter/filters.go rename to server/filter/filters.go diff --git a/server/jellyfin/items.go b/server/jellyfin/items.go index 7995d1eb2..68f0c95ce 100644 --- a/server/jellyfin/items.go +++ b/server/jellyfin/items.go @@ -8,8 +8,8 @@ import ( "github.com/Masterminds/squirrel" "github.com/go-chi/chi/v5" "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/server/filter" "github.com/navidrome/navidrome/server/jellyfin/dto" - "github.com/navidrome/navidrome/server/subsonic/filter" "github.com/navidrome/navidrome/utils/req" "github.com/navidrome/navidrome/utils/slice" ) diff --git a/server/subsonic/album_lists.go b/server/subsonic/album_lists.go index 24bbca960..041a3b8f2 100644 --- a/server/subsonic/album_lists.go +++ b/server/subsonic/album_lists.go @@ -9,7 +9,7 @@ import ( "github.com/navidrome/navidrome/core/scrobbler" "github.com/navidrome/navidrome/log" "github.com/navidrome/navidrome/model" - "github.com/navidrome/navidrome/server/subsonic/filter" + "github.com/navidrome/navidrome/server/filter" "github.com/navidrome/navidrome/server/subsonic/responses" "github.com/navidrome/navidrome/utils/req" "github.com/navidrome/navidrome/utils/run" diff --git a/server/subsonic/browsing.go b/server/subsonic/browsing.go index 817238aaf..f6a7047c4 100644 --- a/server/subsonic/browsing.go +++ b/server/subsonic/browsing.go @@ -11,7 +11,7 @@ import ( "github.com/navidrome/navidrome/core/publicurl" "github.com/navidrome/navidrome/log" "github.com/navidrome/navidrome/model" - "github.com/navidrome/navidrome/server/subsonic/filter" + "github.com/navidrome/navidrome/server/filter" "github.com/navidrome/navidrome/server/subsonic/responses" "github.com/navidrome/navidrome/utils/req" "github.com/navidrome/navidrome/utils/slice"