mirrors
/
navidrome
mirror of https://github.com/navidrome/navidrome.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge errors

This commit is contained in:
Deluan 2023-12-27 17:07:49 -05:00
parent d7b673f841
commit 6cf825ec92
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scanner/metadata/metadata.go
View File

@ -146,7 +146,7 @@ func (t Tags) Lyrics() string {
lyrics = append(lyrics, *lyric)
}
for tag, value := range t.tags {
for tag, value := range t.Tags {
if strings.HasPrefix(tag, "lyrics-") {
language := strings.TrimSpace(strings.TrimPrefix(tag, "lyrics-"))

7
server/subsonic/media_retrieval.go
View File

@ -129,9 +129,12 @@ func (api *Router) GetLyrics(r *http.Request) (*responses.Subsonic, error) {
}
func (api *Router) GetLyricsBySongId(r *http.Request) (*responses.Subsonic, error) {
id := utils.ParamString(r, "id")
mediaFile, err := api.ds.MediaFile(r.Context()).Get(id)
id, err := req.Params(r).String("id")
if err != nil {
return nil, err
}
mediaFile, err := api.ds.MediaFile(r.Context()).Get(id)
if err != nil {
return nil, err
}