remote/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-09 02:47:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add fallback artist/title to structured lyrics

Browse source
This commit is contained in:
Deluan 2023-12-27 18:30:58 -05:00
commit 5cd2985e6b
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/subsonic/helpers.go
View file

@ -324,7 +324,7 @@ func buildAlbumID3(ctx context.Context, album model.Album) responses.AlbumID3 {
return dir
}
func buildStructuredLyric(lyric model.Lyric) responses.StructuredLyric {
func buildStructuredLyric(mf *model.MediaFile, lyric model.Lyric) responses.StructuredLyric {
lines := make([]responses.Line, len(lyric.Line))
for i, line := range lyric.Line {
@ -343,14 +343,21 @@ func buildStructuredLyric(lyric model.Lyric) responses.StructuredLyric {
Synced: lyric.Synced,
}
if structured.DisplayArtist == "" {
structured.DisplayArtist = mf.Artist
}
if structured.DisplayTitle == "" {
structured.DisplayTitle = mf.Title
}
return structured
}
func buildStructuredLyrics(lyrics model.Lyrics) *responses.LyricsList {
func buildStructuredLyrics(mf *model.MediaFile, lyrics model.Lyrics) *responses.LyricsList {
lyricList := make(responses.StructuredLyrics, len(lyrics))
for i, lyric := range lyrics {
lyricList[i] = buildStructuredLyric(lyric)
lyricList[i] = buildStructuredLyric(mf, lyric)
}
res := &responses.LyricsList{

2
server/subsonic/media_retrieval.go
View file

@ -145,7 +145,7 @@ func (api *Router) GetLyricsBySongId(r *http.Request) (*responses.Subsonic, erro
}
response := newResponse()
response.LyricsList = buildStructuredLyrics(lyrics)
response.LyricsList = buildStructuredLyrics(mediaFile, lyrics)
return response, nil
}