From f6129cc450aad858df0eab60bd3a2fc318abdcf3 Mon Sep 17 00:00:00 2001 From: wilywyrm Date: Sun, 15 Jun 2025 09:40:40 -0700 Subject: [PATCH] fix(subsonic): getLyrics does not try to retrieve lyrics from external files (#4232) --- server/subsonic/filter/filters.go | 3 +-- server/subsonic/media_retrieval.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/subsonic/filter/filters.go b/server/subsonic/filter/filters.go index 4ab4f9642..ab507fb4f 100644 --- a/server/subsonic/filter/filters.go +++ b/server/subsonic/filter/filters.go @@ -108,14 +108,13 @@ func SongsByRandom(genre string, fromYear, toYear int) Options { return addDefaultFilters(options) } -func SongWithLyrics(artist, title string) Options { +func SongWithArtistTitle(artist, title string) Options { return addDefaultFilters(Options{ Sort: "updated_at", Order: "desc", Max: 1, Filters: And{ Eq{"title": title}, - NotEq{"lyrics": "[]"}, Or{ persistence.Exists("json_tree(participants, '$.albumartist')", Eq{"value": artist}), persistence.Exists("json_tree(participants, '$.artist')", Eq{"value": artist}), diff --git a/server/subsonic/media_retrieval.go b/server/subsonic/media_retrieval.go index 5cca74c30..35a3fd3d3 100644 --- a/server/subsonic/media_retrieval.go +++ b/server/subsonic/media_retrieval.go @@ -98,7 +98,7 @@ func (api *Router) GetLyrics(r *http.Request) (*responses.Subsonic, error) { response := newResponse() lyricsResponse := responses.Lyrics{} response.Lyrics = &lyricsResponse - mediaFiles, err := api.ds.MediaFile(r.Context()).GetAll(filter.SongWithLyrics(artist, title)) + mediaFiles, err := api.ds.MediaFile(r.Context()).GetAll(filter.SongWithArtistTitle(artist, title)) if err != nil { return nil, err