From b455546fdfde9b778ee9d43c922d62941ce71c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Sat, 24 Jan 2026 12:47:43 -0500 Subject: [PATCH 01/82] fix(playlists): better M3U paths matching across different UTF representations (#4890) * fix: improve playlist path normalization for cross-platform compatibility Signed-off-by: Deluan * fix: log normalized path when playlist path is not found Signed-off-by: Deluan * test: enhance Unicode normalization tests for playlist paths Signed-off-by: Deluan * fix: enhance playlist path normalization for cross-platform compatibility See https://github.com/navidrome/navidrome/pull/4789#issuecomment-3645724780 Signed-off-by: Deluan * fix: improve playlist path normalization to handle fullwidth characters and enhance cross-platform compatibility Signed-off-by: Deluan * formatting Signed-off-by: Deluan * fix: adjust chunk size for M3U parsing to optimize SQLite expression tree depth Signed-off-by: Deluan --------- Signed-off-by: Deluan --- core/playlists.go | 74 ++++++++++-- core/playlists_test.go | 147 +++++++++++++++++++---- persistence/mediafile_repository_test.go | 88 ++++++++++++++ 3 files changed, 275 insertions(+), 34 deletions(-) diff --git a/core/playlists.go b/core/playlists.go index 1f98bf508..8ec5991cf 100644 --- a/core/playlists.go +++ b/core/playlists.go @@ -179,7 +179,9 @@ func (s *playlists) parseNSP(_ context.Context, pls *model.Playlist, reader io.R func (s *playlists) parseM3U(ctx context.Context, pls *model.Playlist, folder *model.Folder, reader io.Reader) error { mediaFileRepository := s.ds.MediaFile(ctx) var mfs model.MediaFiles - for lines := range slice.CollectChunks(slice.LinesFrom(reader), 400) { + // Chunk size of 100 lines, as each line can generate up to 4 lookup candidates + // (NFC/NFD × raw/lowercase), and SQLite has a max expression tree depth of 1000. + for lines := range slice.CollectChunks(slice.LinesFrom(reader), 100) { filteredLines := make([]string, 0, len(lines)) for _, line := range lines { line := strings.TrimSpace(line) @@ -206,33 +208,66 @@ func (s *playlists) parseM3U(ctx context.Context, pls *model.Playlist, folder *m continue } - // Normalize to NFD for filesystem compatibility (macOS). Database stores paths in NFD. - // See https://github.com/navidrome/navidrome/issues/4663 - resolvedPaths = slice.Map(resolvedPaths, func(path string) string { - return strings.ToLower(norm.NFD.String(path)) - }) + // SQLite comparisons do not perform Unicode normalization, and filesystem normalization + // differs across platforms (macOS often yields NFD, while Linux/Windows typically use NFC). + // Generate lookup candidates for both forms so playlist entries match DB paths regardless + // of the original normalization. See https://github.com/navidrome/navidrome/issues/4884 + // + // We also include the original (non-lowercased) paths because SQLite's COLLATE NOCASE + // only handles ASCII case-insensitivity. Non-ASCII characters like fullwidth letters + // (e.g., ＡＢＣＤ vs ａｂｃｄ) are not matched case-insensitively by NOCASE. + lookupCandidates := make([]string, 0, len(resolvedPaths)*4) + seen := make(map[string]struct{}, len(resolvedPaths)*4) + for _, path := range resolvedPaths { + // Add original paths first (for exact matching of non-ASCII characters) + nfcRaw := norm.NFC.String(path) + if _, ok := seen[nfcRaw]; !ok { + seen[nfcRaw] = struct{}{} + lookupCandidates = append(lookupCandidates, nfcRaw) + } + nfdRaw := norm.NFD.String(path) + if _, ok := seen[nfdRaw]; !ok { + seen[nfdRaw] = struct{}{} + lookupCandidates = append(lookupCandidates, nfdRaw) + } - found, err := mediaFileRepository.FindByPaths(resolvedPaths) + // Add lowercased paths (for ASCII case-insensitive matching via NOCASE) + nfc := strings.ToLower(nfcRaw) + if _, ok := seen[nfc]; !ok { + seen[nfc] = struct{}{} + lookupCandidates = append(lookupCandidates, nfc) + } + nfd := strings.ToLower(nfdRaw) + if _, ok := seen[nfd]; !ok { + seen[nfd] = struct{}{} + lookupCandidates = append(lookupCandidates, nfd) + } + } + + found, err := mediaFileRepository.FindByPaths(lookupCandidates) if err != nil { log.Warn(ctx, "Error reading files from DB", "playlist", pls.Name, err) continue } - // Build lookup map with library-qualified keys, normalized for comparison + + // Build lookup map with library-qualified keys, normalized for comparison. + // Canonicalize to NFC so NFD/NFC become comparable. existing := make(map[string]int, len(found)) for idx := range found { - // Normalize to lowercase for case-insensitive comparison - // Key format: "libraryID:path" - key := fmt.Sprintf("%d:%s", found[idx].LibraryID, strings.ToLower(found[idx].Path)) + key := fmt.Sprintf("%d:%s", found[idx].LibraryID, strings.ToLower(norm.NFC.String(found[idx].Path))) existing[key] = idx } // Find media files in the order of the resolved paths, to keep playlist order for _, path := range resolvedPaths { - idx, ok := existing[path] + key := strings.ToLower(norm.NFC.String(path)) + idx, ok := existing[key] if ok { mfs = append(mfs, found[idx]) } else { - log.Warn(ctx, "Path in playlist not found", "playlist", pls.Name, "path", path) + // Prefer logging a composed representation when possible to avoid confusing output + // with decomposed combining marks. + log.Warn(ctx, "Path in playlist not found", "playlist", pls.Name, "path", norm.NFC.String(path)) } } } @@ -394,7 +429,20 @@ func (s *playlists) resolvePaths(ctx context.Context, folder *model.Folder, line func (s *playlists) updatePlaylist(ctx context.Context, newPls *model.Playlist) error { owner, _ := request.UserFrom(ctx) + // Try to find existing playlist by path. Since filesystem normalization differs across + // platforms (macOS uses NFD, Linux/Windows use NFC), we try both forms to match + // playlists that may have been imported on a different platform. pls, err := s.ds.Playlist(ctx).FindByPath(newPls.Path) + if errors.Is(err, model.ErrNotFound) { + // Try alternate normalization form + altPath := norm.NFD.String(newPls.Path) + if altPath == newPls.Path { + altPath = norm.NFC.String(newPls.Path) + } + if altPath != newPls.Path { + pls, err = s.ds.Playlist(ctx).FindByPath(altPath) + } + } if err != nil && !errors.Is(err, model.ErrNotFound) { return err } diff --git a/core/playlists_test.go b/core/playlists_test.go index f3347ae77..7712a268e 100644 --- a/core/playlists_test.go +++ b/core/playlists_test.go @@ -135,6 +135,55 @@ var _ = Describe("Playlists", func() { }) }) + DescribeTable("Playlist filename Unicode normalization (regression fix-playlist-filename-normalization)", + func(storedForm, filesystemForm string) { + // Use Polish characters that decompose: ó (U+00F3) -> o + combining acute (U+006F + U+0301) + plsNameNFC := "Piosenki_Polskie_zółć" // NFC form (composed) + plsNameNFD := norm.NFD.String(plsNameNFC) + Expect(plsNameNFD).ToNot(Equal(plsNameNFC)) // Verify they differ + + nameByForm := map[string]string{"NFC": plsNameNFC, "NFD": plsNameNFD} + storedName := nameByForm[storedForm] + filesystemName := nameByForm[filesystemForm] + + tmpDir := GinkgoT().TempDir() + mockLibRepo.SetData([]model.Library{{ID: 1, Path: tmpDir}}) + ds.MockedMediaFile = &mockedMediaFileFromListRepo{data: []string{}} + ps = core.NewPlaylists(ds) + + // Create the playlist file on disk with the filesystem's normalization form + plsFile := tmpDir + "/" + filesystemName + ".m3u" + Expect(os.WriteFile(plsFile, []byte("#PLAYLIST:Test\n"), 0600)).To(Succeed()) + + // Pre-populate mock repo with the stored normalization form + storedPath := tmpDir + "/" + storedName + ".m3u" + existingPls := &model.Playlist{ + ID: "existing-id", + Name: "Existing Playlist", + Path: storedPath, + Sync: true, + } + mockPlsRepo.data = map[string]*model.Playlist{storedPath: existingPls} + + // Import using the filesystem's normalization form + plsFolder := &model.Folder{ + ID: "1", + LibraryID: 1, + LibraryPath: tmpDir, + Path: "", + Name: "", + } + pls, err := ps.ImportFile(ctx, plsFolder, filesystemName+".m3u") + Expect(err).ToNot(HaveOccurred()) + + // Should update existing playlist, not create new one + Expect(pls.ID).To(Equal("existing-id")) + Expect(pls.Name).To(Equal("Existing Playlist")) + }, + Entry("finds NFD-stored playlist when filesystem provides NFC path", "NFD", "NFC"), + Entry("finds NFC-stored playlist when filesystem provides NFD path", "NFC", "NFD"), + ) + Describe("Cross-library relative paths", func() { var tmpDir, plsDir, songsDir string @@ -446,23 +495,79 @@ var _ = Describe("Playlists", func() { Expect(pls.Tracks[0].Path).To(Equal("abc/tEsT1.Mp3")) }) - It("handles Unicode normalization when comparing paths (NFD vs NFC)", func() { - // Simulate macOS filesystem: stores paths in NFD (decomposed) form - // "è" (U+00E8) in NFC becomes "e" + "◌̀" (U+0065 + U+0300) in NFD - nfdPath := "artist/Mich" + string([]rune{'e', '\u0300'}) + "le/song.mp3" // NFD: e + combining grave - repo.data = []string{nfdPath} - - // Simulate Apple Music M3U: uses NFC (composed) form - nfcPath := "/music/artist/Mich\u00E8le/song.mp3" // NFC: single è character - m3u := nfcPath + "\n" + // Fullwidth characters (e.g., ＡＢＣＤ) are not handled by SQLite's NOCASE collation, + // so we need exact matching for non-ASCII characters. + It("matches fullwidth characters exactly (SQLite NOCASE limitation)", func() { + // Fullwidth uppercase ＡＣＲＯＳＳ (U+FF21, U+FF23, U+FF32, U+FF2F, U+FF33, U+FF33) + repo.data = []string{ + "plex/02 - ＡＣＲＯＳＳ.flac", + } + m3u := "/music/plex/02 - ＡＣＲＯＳＳ.flac\n" f := strings.NewReader(m3u) pls, err := ps.ImportM3U(ctx, f) Expect(err).ToNot(HaveOccurred()) Expect(pls.Tracks).To(HaveLen(1)) - // Should match despite different Unicode normalization forms - Expect(pls.Tracks[0].Path).To(Equal(nfdPath)) + Expect(pls.Tracks[0].Path).To(Equal("plex/02 - ＡＣＲＯＳＳ.flac")) }) + // Unicode normalization tests: NFC (composed) vs NFD (decomposed) forms + // macOS stores paths in NFD, Linux/Windows use NFC. Playlists may use either form. + DescribeTable("matches paths across Unicode NFC/NFD normalization", + func(description, pathNFC string, dbForm, playlistForm norm.Form) { + pathNFD := norm.NFD.String(pathNFC) + Expect(pathNFD).ToNot(Equal(pathNFC), "test path should have decomposable characters") + + // Set up DB with specified normalization form + var dbPath string + if dbForm == norm.NFC { + dbPath = pathNFC + } else { + dbPath = pathNFD + } + repo.data = []string{dbPath} + + // Set up playlist with specified normalization form + var playlistPath string + if playlistForm == norm.NFC { + playlistPath = pathNFC + } else { + playlistPath = pathNFD + } + m3u := "/music/" + playlistPath + "\n" + f := strings.NewReader(m3u) + + pls, err := ps.ImportM3U(ctx, f) + Expect(err).ToNot(HaveOccurred()) + Expect(pls.Tracks).To(HaveLen(1)) + Expect(pls.Tracks[0].Path).To(Equal(dbPath)) + }, + // French: è (U+00E8) decomposes to e + combining grave (U+0065 + U+0300) + Entry("French diacritics - DB:NFD, playlist:NFC", + "macOS DB with Apple Music playlist", + "artist/Michèle/song.mp3", norm.NFD, norm.NFC), + + // Japanese Katakana: ド (U+30C9) decomposes to ト (U+30C8) + combining dakuten (U+3099) + Entry("Japanese Katakana with dakuten - DB:NFC, playlist:NFC (#4884)", + "Linux/Windows DB with NFC playlist", + "artist/\u30a2\u30a4\u30c9\u30eb/\u30c9\u30ea\u30fc\u30e0\u30bd\u30f3\u30b0.mp3", norm.NFC, norm.NFC), + Entry("Japanese Katakana with dakuten - DB:NFD, playlist:NFC (#4884)", + "macOS DB with NFC playlist", + "artist/\u30a2\u30a4\u30c9\u30eb/\u30c9\u30ea\u30fc\u30e0\u30bd\u30f3\u30b0.mp3", norm.NFD, norm.NFC), + + // Cyrillic: й (U+0439) decomposes to и (U+0438) + combining breve (U+0306) + Entry("Cyrillic characters - DB:NFD, playlist:NFC (#4791)", + "macOS DB with NFC playlist", + "Жуки/Батарейка/01 - Разлюбила.mp3", norm.NFD, norm.NFC), + + // Polish: ó (U+00F3) decomposes to o + combining acute (U+0301) + Entry("Polish diacritics - DB:NFD, playlist:NFC (#4663)", + "macOS DB with NFC playlist", + "Zespół/Człowiek/Piosenka o miłości.mp3", norm.NFD, norm.NFC), + Entry("Polish diacritics - DB:NFC, playlist:NFD", + "Linux/Windows DB with macOS-exported playlist", + "Zespół/Człowiek/Piosenka o miłości.mp3", norm.NFC, norm.NFD), + ) + }) Describe("InPlaylistsPath", func() { @@ -563,9 +668,6 @@ func (r *mockedMediaFileFromListRepo) FindByPaths(paths []string) (model.MediaFi var mfs model.MediaFiles for idx, dataPath := range r.data { - // Normalize the data path to NFD (simulates macOS filesystem storage) - normalizedDataPath := norm.NFD.String(dataPath) - for _, requestPath := range paths { // Strip library qualifier if present (format: "libraryID:path") actualPath := requestPath @@ -577,12 +679,9 @@ func (r *mockedMediaFileFromListRepo) FindByPaths(paths []string) (model.MediaFi } } - // The request path should already be normalized to NFD by production code - // before calling FindByPaths (to match DB storage) - normalizedRequestPath := norm.NFD.String(actualPath) - - // Case-insensitive comparison (like SQL's "collate nocase") - if strings.EqualFold(normalizedRequestPath, normalizedDataPath) { + // Case-insensitive comparison (like SQL's "collate nocase"), but with no + // implicit Unicode normalization (SQLite does not normalize NFC/NFD). + if strings.EqualFold(actualPath, dataPath) { mfs = append(mfs, model.MediaFile{ ID: strconv.Itoa(idx), Path: dataPath, // Return original path from DB @@ -597,10 +696,16 @@ func (r *mockedMediaFileFromListRepo) FindByPaths(paths []string) (model.MediaFi type mockedPlaylistRepo struct { last *model.Playlist + data map[string]*model.Playlist // keyed by path model.PlaylistRepository } -func (r *mockedPlaylistRepo) FindByPath(string) (*model.Playlist, error) { +func (r *mockedPlaylistRepo) FindByPath(path string) (*model.Playlist, error) { + if r.data != nil { + if pls, ok := r.data[path]; ok { + return pls, nil + } + } return nil, model.ErrNotFound } diff --git a/persistence/mediafile_repository_test.go b/persistence/mediafile_repository_test.go index 9f62a6a7c..6b646819d 100644 --- a/persistence/mediafile_repository_test.go +++ b/persistence/mediafile_repository_test.go @@ -561,4 +561,92 @@ var _ = Describe("MediaRepository", func() { }) }) }) + + Describe("FindByPaths", func() { + // Test fixtures for Unicode and case-sensitivity tests + var testFiles []model.MediaFile + + BeforeEach(func() { + testFiles = []model.MediaFile{ + {ID: "findpath-1", LibraryID: 1, Path: "artist/Album/track.mp3", Title: "Track"}, + {ID: "findpath-2", LibraryID: 1, Path: "artist/Album/UPPER.mp3", Title: "Upper"}, + // Fullwidth uppercase: ＡＣＲＯＳＳ (U+FF21 U+FF23 U+FF32 U+FF2F U+FF33 U+FF33) + {ID: "findpath-3", LibraryID: 1, Path: "plex/02 - ＡＣＲＯＳＳ.flac", Title: "Fullwidth"}, + // French diacritic: è (U+00E8, can decompose to e + combining grave) + {ID: "findpath-4", LibraryID: 1, Path: "artist/Michèle/song.mp3", Title: "French"}, + } + for _, mf := range testFiles { + Expect(mr.Put(&mf)).To(Succeed()) + } + }) + + AfterEach(func() { + for _, mf := range testFiles { + _ = mr.Delete(mf.ID) + } + }) + + It("finds files by exact path", func() { + results, err := mr.FindByPaths([]string{"1:artist/Album/track.mp3"}) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(HaveLen(1)) + Expect(results[0].ID).To(Equal("findpath-1")) + }) + + It("finds files case-insensitively for ASCII characters (NOCASE)", func() { + // SQLite's COLLATE NOCASE handles ASCII case-insensitivity + results, err := mr.FindByPaths([]string{"1:ARTIST/ALBUM/TRACK.MP3"}) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(HaveLen(1)) + Expect(results[0].ID).To(Equal("findpath-1")) + }) + + It("finds fullwidth characters only with exact case match (SQLite NOCASE limitation)", func() { + // SQLite's NOCASE does NOT handle fullwidth uppercase/lowercase equivalence + // The DB has fullwidth uppercase ＡＣＲＯＳＳ, searching with exact match should work + results, err := mr.FindByPaths([]string{"1:plex/02 - ＡＣＲＯＳＳ.flac"}) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(HaveLen(1)) + Expect(results[0].ID).To(Equal("findpath-3")) + + // Searching with fullwidth lowercase ａｃｒｏｓｓ should NOT match + // (this is the SQLite limitation that requires exact matching for non-ASCII) + results, err = mr.FindByPaths([]string{"1:plex/02 - ａｃｒｏｓｓ.flac"}) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(BeEmpty()) + }) + + It("returns multiple files when querying multiple paths", func() { + results, err := mr.FindByPaths([]string{ + "1:artist/Album/track.mp3", + "1:artist/Album/UPPER.mp3", + }) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(HaveLen(2)) + }) + + It("returns empty slice for non-existent paths", func() { + results, err := mr.FindByPaths([]string{"1:nonexistent/path.mp3"}) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(BeEmpty()) + }) + + It("returns empty slice for empty input", func() { + results, err := mr.FindByPaths([]string{}) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(BeEmpty()) + }) + + It("handles library-qualified paths correctly", func() { + // Library 1 should find the file + results, err := mr.FindByPaths([]string{"1:artist/Album/track.mp3"}) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(HaveLen(1)) + + // Library 2 should NOT find it (file is in library 1) + results, err = mr.FindByPaths([]string{"2:artist/Album/track.mp3"}) + Expect(err).ToNot(HaveOccurred()) + Expect(results).To(BeEmpty()) + }) + }) }) From 772d1f359bb35bbe12bf79ca9b55c635c144a402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Sun, 25 Jan 2026 16:16:43 -0500 Subject: [PATCH 02/82] feat: add similar songs functionality in agents, and Instant Mix (song-based) to UI (#4919) * refactor: rename ArtistRadio to SimilarSongs for clarity and consistency Signed-off-by: Deluan * feat: implement GetSimilarSongsByTrack and related functionality for song similarity retrieval Signed-off-by: Deluan * feat: enhance GetSimilarSongsByTrack to include artist and album details and update tests Signed-off-by: Deluan * feat: enhance song matching by implementing title and artist filtering in loadTracksByTitleAndArtist Signed-off-by: Deluan * test: add unit tests for song matching functionality in provider Signed-off-by: Deluan * refactor: extract song matching functionality into its own file Signed-off-by: Deluan * docs: clarify similarSongsFallback function description in provider.go Signed-off-by: Deluan * refactor: initialize result slice for songs with capacity based on response length Signed-off-by: Deluan * refactor: simplify agent method calls for retrieving images and similar songs Signed-off-by: Deluan * refactor: simplify agent method calls for retrieving images and similar songs Signed-off-by: Deluan * refactor: remove outdated comments in GetSimilarSongs methods Signed-off-by: Deluan * fix: use composite key for song matches to handle duplicates by title and artist Signed-off-by: Deluan * refactor: consolidate expectations setup for similar songs tests Signed-off-by: Deluan * feat: add instant mix action to song context menu and update translations Signed-off-by: Deluan * fix(provider): handle unknown entity types in GetSimilarSongs Signed-off-by: Deluan * refactor: move playSimilar action to playbackActions and streamline song processing Signed-off-by: Deluan * format Signed-off-by: Deluan * feat: enhance instant mix functionality with loading notification and shuffle option Signed-off-by: Deluan * feat: implement fuzzy matching for similar songs based on configurable threshold Signed-off-by: Deluan * refactor: implement track matching with multiple specificity levels Signed-off-by: Deluan * refactor: enhance track matching by implementing unified scoring with specificity levels Signed-off-by: Deluan * feat: enhance deezer top tracks result with album Signed-off-by: Deluan * feat: enhance track matching with fuzzy album similarity for improved scoring Signed-off-by: Deluan * docs: document multi-phase song matching algorithm with detailed scoring and prioritization Signed-off-by: Deluan --------- Signed-off-by: Deluan --- adapters/deezer/client_test.go | 22 + adapters/deezer/deezer.go | 3 +- adapters/lastfm/agent.go | 29 ++ adapters/lastfm/agent_test.go | 48 ++ adapters/lastfm/client.go | 13 + adapters/lastfm/client_test.go | 24 + adapters/lastfm/responses.go | 23 + conf/configuration.go | 2 + core/agents/agents.go | 232 ++++----- core/agents/agents_test.go | 99 ++++ core/agents/interfaces.go | 45 +- core/external/extdata_helper_test.go | 24 + core/external/provider.go | 205 ++------ core/external/provider_artistradio_test.go | 205 -------- core/external/provider_matching.go | 388 +++++++++++++++ .../provider_matching_internal_test.go | 57 +++ core/external/provider_matching_test.go | 460 ++++++++++++++++++ core/external/provider_similarsongs_test.go | 443 +++++++++++++++++ core/external/provider_topsongs_test.go | 6 + resources/i18n/pt-br.json | 4 +- server/subsonic/browsing.go | 2 +- tests/fixtures/lastfm.track.getsimilar.json | 1 + .../lastfm.track.getsimilar.unknown.json | 1 + ui/src/artist/ArtistActions.jsx | 3 +- ui/src/artist/actions.js | 47 +- ui/src/common/SongContextMenu.jsx | 19 + ui/src/common/SongContextMenu.test.jsx | 122 ++++- ui/src/common/playbackActions.js | 76 +++ ui/src/i18n/en.json | 4 +- 29 files changed, 2082 insertions(+), 525 deletions(-) delete mode 100644 core/external/provider_artistradio_test.go create mode 100644 core/external/provider_matching.go create mode 100644 core/external/provider_matching_internal_test.go create mode 100644 core/external/provider_matching_test.go create mode 100644 core/external/provider_similarsongs_test.go create mode 100644 tests/fixtures/lastfm.track.getsimilar.json create mode 100644 tests/fixtures/lastfm.track.getsimilar.unknown.json create mode 100644 ui/src/common/playbackActions.js diff --git a/adapters/deezer/client_test.go b/adapters/deezer/client_test.go index 7e4f7a49f..a0e0a5cb1 100644 --- a/adapters/deezer/client_test.go +++ b/adapters/deezer/client_test.go @@ -45,6 +45,28 @@ var _ = Describe("client", func() { }) }) + Describe("TopTracks", func() { + It("returns top tracks with artist and album info from a successful request", func() { + f, err := os.Open("tests/fixtures/deezer.artist.top.json") + Expect(err).To(BeNil()) + httpClient.mock("https://api.deezer.com/artist/27/top", http.Response{Body: f, StatusCode: 200}) + + tracks, err := client.getTopTracks(GinkgoT().Context(), 27, 5) + Expect(err).To(BeNil()) + Expect(tracks).To(HaveLen(5)) + + // Verify first track has all expected fields + Expect(tracks[0].Title).To(Equal("Instant Crush (feat. Julian Casablancas)")) + Expect(tracks[0].Artist.Name).To(Equal("Daft Punk")) + Expect(tracks[0].Album.Title).To(Equal("Random Access Memories")) + + // Verify second track + Expect(tracks[1].Title).To(Equal("One More Time")) + Expect(tracks[1].Artist.Name).To(Equal("Daft Punk")) + Expect(tracks[1].Album.Title).To(Equal("Discovery")) + }) + }) + Describe("ArtistBio", func() { BeforeEach(func() { // Mock the JWT token endpoint with a valid JWT that expires in 5 minutes diff --git a/adapters/deezer/deezer.go b/adapters/deezer/deezer.go index 7ec48b38d..7272bf9ae 100644 --- a/adapters/deezer/deezer.go +++ b/adapters/deezer/deezer.go @@ -135,7 +135,8 @@ func (s *deezerAgent) GetArtistTopSongs(ctx context.Context, _, artistName, _ st res := slice.Map(tracks, func(r Track) agents.Song { return agents.Song{ - Name: r.Title, + Name: r.Title, + Album: r.Album.Title, } }) return res, nil diff --git a/adapters/lastfm/agent.go b/adapters/lastfm/agent.go index e3e53b234..3677be6e0 100644 --- a/adapters/lastfm/agent.go +++ b/adapters/lastfm/agent.go @@ -192,6 +192,26 @@ func (l *lastfmAgent) GetArtistTopSongs(ctx context.Context, id, artistName, mbi return res, nil } +func (l *lastfmAgent) GetSimilarSongsByTrack(ctx context.Context, id, name, artist, mbid string, count int) ([]agents.Song, error) { + resp, err := l.callTrackGetSimilar(ctx, name, artist, count) + if err != nil { + return nil, err + } + if len(resp) == 0 { + return nil, agents.ErrNotFound + } + res := make([]agents.Song, 0, len(resp)) + for _, t := range resp { + res = append(res, agents.Song{ + Name: t.Name, + MBID: t.MBID, + Artist: t.Artist.Name, + ArtistMBID: t.Artist.MBID, + }) + } + return res, nil +} + var ( artistOpenGraphQuery = cascadia.MustCompile(`html > head > meta[property="og:image"]`) artistIgnoredImage = "2a96cbd8b46e442fc41c2b86b821562f" // Last.fm artist placeholder image name @@ -290,6 +310,15 @@ func (l *lastfmAgent) callArtistGetTopTracks(ctx context.Context, artistName str return t.Track, nil } +func (l *lastfmAgent) callTrackGetSimilar(ctx context.Context, name, artist string, count int) ([]SimilarTrack, error) { + s, err := l.client.trackGetSimilar(ctx, name, artist, count) + if err != nil { + log.Error(ctx, "Error calling LastFM/track.getSimilar", "track", name, "artist", artist, err) + return nil, err + } + return s.Track, nil +} + func (l *lastfmAgent) getArtistForScrobble(track *model.MediaFile, role model.Role, displayName string) string { if conf.Server.LastFM.ScrobbleFirstArtistOnly && len(track.Participants[role]) > 0 { return track.Participants[role][0].Name diff --git a/adapters/lastfm/agent_test.go b/adapters/lastfm/agent_test.go index fc6238408..f2db44fa4 100644 --- a/adapters/lastfm/agent_test.go +++ b/adapters/lastfm/agent_test.go @@ -177,6 +177,54 @@ var _ = Describe("lastfmAgent", func() { }) }) + Describe("GetSimilarSongsByTrack", func() { + var agent *lastfmAgent + var httpClient *tests.FakeHttpClient + BeforeEach(func() { + httpClient = &tests.FakeHttpClient{} + client := newClient("API_KEY", "SECRET", "pt", httpClient) + agent = lastFMConstructor(ds) + agent.client = client + }) + + It("returns similar songs", func() { + f, _ := os.Open("tests/fixtures/lastfm.track.getsimilar.json") + httpClient.Res = http.Response{Body: f, StatusCode: 200} + Expect(agent.GetSimilarSongsByTrack(ctx, "123", "Just Can't Get Enough", "Depeche Mode", "", 5)).To(Equal([]agents.Song{ + {Name: "Dreaming of Me", MBID: "027b553e-7c74-3ed4-a95e-1d4fea51f174", Artist: "Depeche Mode", ArtistMBID: "8538e728-ca0b-4321-b7e5-cff6565dd4c0"}, + {Name: "Everything Counts", MBID: "5a5a3ca4-bdb8-4641-a674-9b54b9b319a6", Artist: "Depeche Mode", ArtistMBID: "8538e728-ca0b-4321-b7e5-cff6565dd4c0"}, + {Name: "Don't You Want Me", MBID: "", Artist: "The Human League", ArtistMBID: "7adaabfb-acfb-47bc-8c7c-59471c2f0db8"}, + {Name: "Tainted Love", MBID: "", Artist: "Soft Cell", ArtistMBID: "7fb50287-029d-47cc-825a-235ca28024b2"}, + {Name: "Blue Monday", MBID: "727e84c6-1b56-31dd-a958-a5f46305cec0", Artist: "New Order", ArtistMBID: "f1106b17-dcbb-45f6-b938-199ccfab50cc"}, + })) + Expect(httpClient.RequestCount).To(Equal(1)) + Expect(httpClient.SavedRequest.URL.Query().Get("track")).To(Equal("Just Can't Get Enough")) + Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("Depeche Mode")) + }) + + It("returns ErrNotFound when no similar songs found", func() { + f, _ := os.Open("tests/fixtures/lastfm.track.getsimilar.unknown.json") + httpClient.Res = http.Response{Body: f, StatusCode: 200} + _, err := agent.GetSimilarSongsByTrack(ctx, "123", "UnknownTrack", "UnknownArtist", "", 3) + Expect(err).To(MatchError(agents.ErrNotFound)) + Expect(httpClient.RequestCount).To(Equal(1)) + }) + + It("returns an error if Last.fm call fails", func() { + httpClient.Err = errors.New("error") + _, err := agent.GetSimilarSongsByTrack(ctx, "123", "Believe", "Cher", "", 3) + Expect(err).To(HaveOccurred()) + Expect(httpClient.RequestCount).To(Equal(1)) + }) + + It("returns an error if Last.fm call returns an error", func() { + httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError3)), StatusCode: 200} + _, err := agent.GetSimilarSongsByTrack(ctx, "123", "Believe", "Cher", "", 3) + Expect(err).To(HaveOccurred()) + Expect(httpClient.RequestCount).To(Equal(1)) + }) + }) + Describe("Scrobbling", func() { var agent *lastfmAgent var httpClient *tests.FakeHttpClient diff --git a/adapters/lastfm/client.go b/adapters/lastfm/client.go index 6a24ac80a..f15613a1d 100644 --- a/adapters/lastfm/client.go +++ b/adapters/lastfm/client.go @@ -95,6 +95,19 @@ func (c *client) artistGetTopTracks(ctx context.Context, name string, limit int) return &response.TopTracks, nil } +func (c *client) trackGetSimilar(ctx context.Context, name, artist string, limit int) (*SimilarTracks, error) { + params := url.Values{} + params.Add("method", "track.getSimilar") + params.Add("track", name) + params.Add("artist", artist) + params.Add("limit", strconv.Itoa(limit)) + response, err := c.makeRequest(ctx, http.MethodGet, params, false) + if err != nil { + return nil, err + } + return &response.SimilarTracks, nil +} + func (c *client) GetToken(ctx context.Context) (string, error) { params := url.Values{} params.Add("method", "auth.getToken") diff --git a/adapters/lastfm/client_test.go b/adapters/lastfm/client_test.go index 85ec11506..bd3197474 100644 --- a/adapters/lastfm/client_test.go +++ b/adapters/lastfm/client_test.go @@ -121,6 +121,30 @@ var _ = Describe("client", func() { }) }) + Describe("trackGetSimilar", func() { + It("returns similar tracks for a successful response", func() { + f, _ := os.Open("tests/fixtures/lastfm.track.getsimilar.json") + httpClient.Res = http.Response{Body: f, StatusCode: 200} + + similar, err := client.trackGetSimilar(context.Background(), "Just Can't Get Enough", "Depeche Mode", 5) + Expect(err).To(BeNil()) + Expect(len(similar.Track)).To(Equal(5)) + Expect(similar.Track[0].Name).To(Equal("Dreaming of Me")) + Expect(similar.Track[0].Artist.Name).To(Equal("Depeche Mode")) + Expect(similar.Track[0].Match).To(Equal(1.0)) + Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?api_key=API_KEY&artist=Depeche+Mode&format=json&limit=5&method=track.getSimilar&track=Just+Can%27t+Get+Enough")) + }) + + It("returns empty list when no similar tracks found", func() { + f, _ := os.Open("tests/fixtures/lastfm.track.getsimilar.unknown.json") + httpClient.Res = http.Response{Body: f, StatusCode: 200} + + similar, err := client.trackGetSimilar(context.Background(), "UnknownTrack", "UnknownArtist", 3) + Expect(err).To(BeNil()) + Expect(similar.Track).To(BeEmpty()) + }) + }) + Describe("GetToken", func() { It("returns a token when the request is successful", func() { httpClient.Res = http.Response{ diff --git a/adapters/lastfm/responses.go b/adapters/lastfm/responses.go index 1ceebe767..026741672 100644 --- a/adapters/lastfm/responses.go +++ b/adapters/lastfm/responses.go @@ -5,6 +5,7 @@ type Response struct { SimilarArtists SimilarArtists `json:"similarartists"` TopTracks TopTracks `json:"toptracks"` Album Album `json:"album"` + SimilarTracks SimilarTracks `json:"similartracks"` Error int `json:"error"` Message string `json:"message"` Token string `json:"token"` @@ -59,6 +60,28 @@ type TopTracks struct { Attr Attr `json:"@attr"` } +type SimilarTracks struct { + Track []SimilarTrack `json:"track"` + Attr SimilarAttr `json:"@attr"` +} + +type SimilarTrack struct { + Name string `json:"name"` + MBID string `json:"mbid"` + Match float64 `json:"match"` + Artist SimilarTrackArtist `json:"artist"` +} + +type SimilarTrackArtist struct { + Name string `json:"name"` + MBID string `json:"mbid"` +} + +type SimilarAttr struct { + Artist string `json:"artist"` + Track string `json:"track"` +} + type Session struct { Name string `json:"name"` Key string `json:"key"` diff --git a/conf/configuration.go b/conf/configuration.go index 5d3660397..6b735caf1 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -57,6 +57,7 @@ type configOptions struct { AutoTranscodeDownload bool DefaultDownsamplingFormat string SearchFullString bool + SimilarSongsMatchThreshold int RecentlyAddedByModTime bool PreferSortTags bool IgnoredArticles string @@ -555,6 +556,7 @@ func setViperDefaults() { viper.SetDefault("autotranscodedownload", false) viper.SetDefault("defaultdownsamplingformat", consts.DefaultDownsamplingFormat) viper.SetDefault("searchfullstring", false) + viper.SetDefault("similarsongsmatchthreshold", 85) viper.SetDefault("recentlyaddedbymodtime", false) viper.SetDefault("prefersorttags", false) viper.SetDefault("ignoredarticles", "The El La Los Las Le Les Os As O A") diff --git a/core/agents/agents.go b/core/agents/agents.go index c82d77b14..ead6dacd0 100644 --- a/core/agents/agents.go +++ b/core/agents/agents.go @@ -22,6 +22,8 @@ type PluginLoader interface { LoadMediaAgent(name string) (Interface, bool) } +// Agents is a meta-agent that aggregates multiple built-in and plugin agents. It tries each enabled agent in order +// until one returns valid data. type Agents struct { ds model.DataStore pluginLoader PluginLoader @@ -129,26 +131,14 @@ func (a *Agents) GetArtistMBID(ctx context.Context, id string, name string) (str case consts.VariousArtistsID: return "", nil } - start := time.Now() - for _, enabledAgent := range a.getEnabledAgentNames() { - ag := a.getAgent(enabledAgent) - if ag == nil { - continue - } - if utils.IsCtxDone(ctx) { - break - } + + return callAgentMethod(ctx, a, "GetArtistMBID", func(ag Interface) (string, error) { retriever, ok := ag.(ArtistMBIDRetriever) if !ok { - continue + return "", ErrNotFound } - mbid, err := retriever.GetArtistMBID(ctx, id, name) - if mbid != "" && err == nil { - log.Debug(ctx, "Got MBID", "agent", ag.AgentName(), "artist", name, "mbid", mbid, "elapsed", time.Since(start)) - return mbid, nil - } - } - return "", ErrNotFound + return retriever.GetArtistMBID(ctx, id, name) + }) } func (a *Agents) GetArtistURL(ctx context.Context, id, name, mbid string) (string, error) { @@ -158,26 +148,14 @@ func (a *Agents) GetArtistURL(ctx context.Context, id, name, mbid string) (strin case consts.VariousArtistsID: return "", nil } - start := time.Now() - for _, enabledAgent := range a.getEnabledAgentNames() { - ag := a.getAgent(enabledAgent) - if ag == nil { - continue - } - if utils.IsCtxDone(ctx) { - break - } + + return callAgentMethod(ctx, a, "GetArtistURL", func(ag Interface) (string, error) { retriever, ok := ag.(ArtistURLRetriever) if !ok { - continue + return "", ErrNotFound } - url, err := retriever.GetArtistURL(ctx, id, name, mbid) - if url != "" && err == nil { - log.Debug(ctx, "Got External Url", "agent", ag.AgentName(), "artist", name, "url", url, "elapsed", time.Since(start)) - return url, nil - } - } - return "", ErrNotFound + return retriever.GetArtistURL(ctx, id, name, mbid) + }) } func (a *Agents) GetArtistBiography(ctx context.Context, id, name, mbid string) (string, error) { @@ -187,26 +165,14 @@ func (a *Agents) GetArtistBiography(ctx context.Context, id, name, mbid string) case consts.VariousArtistsID: return "", nil } - start := time.Now() - for _, enabledAgent := range a.getEnabledAgentNames() { - ag := a.getAgent(enabledAgent) - if ag == nil { - continue - } - if utils.IsCtxDone(ctx) { - break - } + + return callAgentMethod(ctx, a, "GetArtistBiography", func(ag Interface) (string, error) { retriever, ok := ag.(ArtistBiographyRetriever) if !ok { - continue + return "", ErrNotFound } - bio, err := retriever.GetArtistBiography(ctx, id, name, mbid) - if err == nil { - log.Debug(ctx, "Got Biography", "agent", ag.AgentName(), "artist", name, "len", len(bio), "elapsed", time.Since(start)) - return bio, nil - } - } - return "", ErrNotFound + return retriever.GetArtistBiography(ctx, id, name, mbid) + }) } // GetSimilarArtists returns similar artists by id, name, and/or mbid. Because some artists returned from an enabled @@ -254,26 +220,14 @@ func (a *Agents) GetArtistImages(ctx context.Context, id, name, mbid string) ([] case consts.VariousArtistsID: return nil, nil } - start := time.Now() - for _, enabledAgent := range a.getEnabledAgentNames() { - ag := a.getAgent(enabledAgent) - if ag == nil { - continue - } - if utils.IsCtxDone(ctx) { - break - } + + return callAgentSliceMethod(ctx, a, "GetArtistImages", func(ag Interface) ([]ExternalImage, error) { retriever, ok := ag.(ArtistImageRetriever) if !ok { - continue + return nil, ErrNotFound } - images, err := retriever.GetArtistImages(ctx, id, name, mbid) - if len(images) > 0 && err == nil { - log.Debug(ctx, "Got Images", "agent", ag.AgentName(), "artist", name, "images", images, "elapsed", time.Since(start)) - return images, nil - } - } - return nil, ErrNotFound + return retriever.GetArtistImages(ctx, id, name, mbid) + }) } // GetArtistTopSongs returns top songs by id, name, and/or mbid. Because some songs returned from an enabled @@ -288,80 +242,127 @@ func (a *Agents) GetArtistTopSongs(ctx context.Context, id, artistName, mbid str overLimit := int(float64(count) * conf.Server.DevExternalArtistFetchMultiplier) - start := time.Now() - for _, enabledAgent := range a.getEnabledAgentNames() { - ag := a.getAgent(enabledAgent) - if ag == nil { - continue - } - if utils.IsCtxDone(ctx) { - break - } + return callAgentSliceMethod(ctx, a, "GetArtistTopSongs", func(ag Interface) ([]Song, error) { retriever, ok := ag.(ArtistTopSongsRetriever) if !ok { - continue + return nil, ErrNotFound } - songs, err := retriever.GetArtistTopSongs(ctx, id, artistName, mbid, overLimit) - if len(songs) > 0 && err == nil { - log.Debug(ctx, "Got Top Songs", "agent", ag.AgentName(), "artist", artistName, "songs", songs, "elapsed", time.Since(start)) - return songs, nil - } - } - return nil, ErrNotFound + return retriever.GetArtistTopSongs(ctx, id, artistName, mbid, overLimit) + }) } func (a *Agents) GetAlbumInfo(ctx context.Context, name, artist, mbid string) (*AlbumInfo, error) { if name == consts.UnknownAlbum { return nil, ErrNotFound } - start := time.Now() - for _, enabledAgent := range a.getEnabledAgentNames() { - ag := a.getAgent(enabledAgent) - if ag == nil { - continue - } - if utils.IsCtxDone(ctx) { - break - } + + return callAgentMethod(ctx, a, "GetAlbumInfo", func(ag Interface) (*AlbumInfo, error) { retriever, ok := ag.(AlbumInfoRetriever) if !ok { - continue + return nil, ErrNotFound } - album, err := retriever.GetAlbumInfo(ctx, name, artist, mbid) - if err == nil { - log.Debug(ctx, "Got Album Info", "agent", ag.AgentName(), "album", name, "artist", artist, - "mbid", mbid, "elapsed", time.Since(start)) - return album, nil - } - } - return nil, ErrNotFound + return retriever.GetAlbumInfo(ctx, name, artist, mbid) + }) } func (a *Agents) GetAlbumImages(ctx context.Context, name, artist, mbid string) ([]ExternalImage, error) { if name == consts.UnknownAlbum { return nil, ErrNotFound } + + return callAgentSliceMethod(ctx, a, "GetAlbumImages", func(ag Interface) ([]ExternalImage, error) { + retriever, ok := ag.(AlbumImageRetriever) + if !ok { + return nil, ErrNotFound + } + return retriever.GetAlbumImages(ctx, name, artist, mbid) + }) +} + +// GetSimilarSongsByTrack returns similar songs for a given track. +func (a *Agents) GetSimilarSongsByTrack(ctx context.Context, id, name, artist, mbid string, count int) ([]Song, error) { + return callAgentSliceMethod(ctx, a, "GetSimilarSongsByTrack", func(ag Interface) ([]Song, error) { + retriever, ok := ag.(SimilarSongsByTrackRetriever) + if !ok { + return nil, ErrNotFound + } + return retriever.GetSimilarSongsByTrack(ctx, id, name, artist, mbid, count) + }) +} + +// GetSimilarSongsByAlbum returns similar songs for a given album. +func (a *Agents) GetSimilarSongsByAlbum(ctx context.Context, id, name, artist, mbid string, count int) ([]Song, error) { + return callAgentSliceMethod(ctx, a, "GetSimilarSongsByAlbum", func(ag Interface) ([]Song, error) { + retriever, ok := ag.(SimilarSongsByAlbumRetriever) + if !ok { + return nil, ErrNotFound + } + return retriever.GetSimilarSongsByAlbum(ctx, id, name, artist, mbid, count) + }) +} + +// GetSimilarSongsByArtist returns similar songs for a given artist. +func (a *Agents) GetSimilarSongsByArtist(ctx context.Context, id, name, mbid string, count int) ([]Song, error) { + switch id { + case consts.UnknownArtistID: + return nil, ErrNotFound + case consts.VariousArtistsID: + return nil, nil + } + + return callAgentSliceMethod(ctx, a, "GetSimilarSongsByArtist", func(ag Interface) ([]Song, error) { + retriever, ok := ag.(SimilarSongsByArtistRetriever) + if !ok { + return nil, ErrNotFound + } + return retriever.GetSimilarSongsByArtist(ctx, id, name, mbid, count) + }) +} + +func callAgentMethod[T comparable](ctx context.Context, agents *Agents, methodName string, fn func(Interface) (T, error)) (T, error) { + var zero T start := time.Now() - for _, enabledAgent := range a.getEnabledAgentNames() { - ag := a.getAgent(enabledAgent) + for _, enabledAgent := range agents.getEnabledAgentNames() { + ag := agents.getAgent(enabledAgent) if ag == nil { continue } if utils.IsCtxDone(ctx) { break } - retriever, ok := ag.(AlbumImageRetriever) - if !ok { + result, err := fn(ag) + if err != nil { + log.Trace(ctx, "Agent method call error", "method", methodName, "agent", ag.AgentName(), "error", err) continue } - images, err := retriever.GetAlbumImages(ctx, name, artist, mbid) - if err != nil { - log.Trace(ctx, "Agent GetAlbumImages failed", "agent", ag.AgentName(), "album", name, "artist", artist, "mbid", mbid, err) + + if result != zero { + log.Debug(ctx, "Got result", "method", methodName, "agent", ag.AgentName(), "elapsed", time.Since(start)) + return result, nil } - if len(images) > 0 && err == nil { - log.Debug(ctx, "Got Album Images", "agent", ag.AgentName(), "album", name, "artist", artist, - "mbid", mbid, "elapsed", time.Since(start)) - return images, nil + } + return zero, ErrNotFound +} + +func callAgentSliceMethod[T any](ctx context.Context, agents *Agents, methodName string, fn func(Interface) ([]T, error)) ([]T, error) { + start := time.Now() + for _, enabledAgent := range agents.getEnabledAgentNames() { + ag := agents.getAgent(enabledAgent) + if ag == nil { + continue + } + if utils.IsCtxDone(ctx) { + break + } + results, err := fn(ag) + if err != nil { + log.Trace(ctx, "Agent method call error", "method", methodName, "agent", ag.AgentName(), "error", err) + continue + } + + if len(results) > 0 { + log.Debug(ctx, "Got results", "method", methodName, "agent", ag.AgentName(), "count", len(results), "elapsed", time.Since(start)) + return results, nil } } return nil, ErrNotFound @@ -376,3 +377,6 @@ var _ ArtistImageRetriever = (*Agents)(nil) var _ ArtistTopSongsRetriever = (*Agents)(nil) var _ AlbumInfoRetriever = (*Agents)(nil) var _ AlbumImageRetriever = (*Agents)(nil) +var _ SimilarSongsByTrackRetriever = (*Agents)(nil) +var _ SimilarSongsByAlbumRetriever = (*Agents)(nil) +var _ SimilarSongsByArtistRetriever = (*Agents)(nil) diff --git a/core/agents/agents_test.go b/core/agents/agents_test.go index 0b7eec282..1d5ae464b 100644 --- a/core/agents/agents_test.go +++ b/core/agents/agents_test.go @@ -295,6 +295,72 @@ var _ = Describe("Agents", func() { Expect(mock.Args).To(BeEmpty()) }) }) + + Describe("GetSimilarSongsByTrack", func() { + It("returns on first match", func() { + Expect(ag.GetSimilarSongsByTrack(ctx, "123", "test song", "test artist", "mb123", 2)).To(Equal([]Song{{ + Name: "Similar Song", + MBID: "mbid555", + }})) + Expect(mock.Args).To(HaveExactElements("123", "test song", "test artist", "mb123", 2)) + }) + It("skips the agent if it returns an error", func() { + mock.Err = errors.New("error") + _, err := ag.GetSimilarSongsByTrack(ctx, "123", "test song", "test artist", "mb123", 2) + Expect(err).To(MatchError(ErrNotFound)) + Expect(mock.Args).To(HaveExactElements("123", "test song", "test artist", "mb123", 2)) + }) + It("interrupts if the context is canceled", func() { + cancel() + _, err := ag.GetSimilarSongsByTrack(ctx, "123", "test song", "test artist", "mb123", 2) + Expect(err).To(MatchError(ErrNotFound)) + Expect(mock.Args).To(BeEmpty()) + }) + }) + + Describe("GetSimilarSongsByAlbum", func() { + It("returns on first match", func() { + Expect(ag.GetSimilarSongsByAlbum(ctx, "123", "test album", "test artist", "mb123", 2)).To(Equal([]Song{{ + Name: "Album Similar Song", + MBID: "mbid666", + }})) + Expect(mock.Args).To(HaveExactElements("123", "test album", "test artist", "mb123", 2)) + }) + It("skips the agent if it returns an error", func() { + mock.Err = errors.New("error") + _, err := ag.GetSimilarSongsByAlbum(ctx, "123", "test album", "test artist", "mb123", 2) + Expect(err).To(MatchError(ErrNotFound)) + Expect(mock.Args).To(HaveExactElements("123", "test album", "test artist", "mb123", 2)) + }) + It("interrupts if the context is canceled", func() { + cancel() + _, err := ag.GetSimilarSongsByAlbum(ctx, "123", "test album", "test artist", "mb123", 2) + Expect(err).To(MatchError(ErrNotFound)) + Expect(mock.Args).To(BeEmpty()) + }) + }) + + Describe("GetSimilarSongsByArtist", func() { + It("returns on first match", func() { + Expect(ag.GetSimilarSongsByArtist(ctx, "123", "test artist", "mb123", 2)).To(Equal([]Song{{ + Name: "Artist Similar Song", + MBID: "mbid777", + }})) + Expect(mock.Args).To(HaveExactElements("123", "test artist", "mb123", 2)) + }) + It("skips the agent if it returns an error", func() { + mock.Err = errors.New("error") + _, err := ag.GetSimilarSongsByArtist(ctx, "123", "test artist", "mb123", 2) + Expect(err).To(MatchError(ErrNotFound)) + Expect(mock.Args).To(HaveExactElements("123", "test artist", "mb123", 2)) + }) + It("interrupts if the context is canceled", func() { + cancel() + _, err := ag.GetSimilarSongsByArtist(ctx, "123", "test artist", "mb123", 2) + Expect(err).To(MatchError(ErrNotFound)) + Expect(mock.Args).To(BeEmpty()) + }) + }) }) }) @@ -377,6 +443,39 @@ func (a *mockAgent) GetAlbumInfo(ctx context.Context, name, artist, mbid string) }, nil } +func (a *mockAgent) GetSimilarSongsByTrack(_ context.Context, id, name, artist, mbid string, count int) ([]Song, error) { + a.Args = []interface{}{id, name, artist, mbid, count} + if a.Err != nil { + return nil, a.Err + } + return []Song{{ + Name: "Similar Song", + MBID: "mbid555", + }}, nil +} + +func (a *mockAgent) GetSimilarSongsByAlbum(_ context.Context, id, name, artist, mbid string, count int) ([]Song, error) { + a.Args = []interface{}{id, name, artist, mbid, count} + if a.Err != nil { + return nil, a.Err + } + return []Song{{ + Name: "Album Similar Song", + MBID: "mbid666", + }}, nil +} + +func (a *mockAgent) GetSimilarSongsByArtist(_ context.Context, id, name, mbid string, count int) ([]Song, error) { + a.Args = []interface{}{id, name, mbid, count} + if a.Err != nil { + return nil, a.Err + } + return []Song{{ + Name: "Artist Similar Song", + MBID: "mbid777", + }}, nil +} + type emptyAgent struct { Interface } diff --git a/core/agents/interfaces.go b/core/agents/interfaces.go index 054a14c51..d0805818e 100644 --- a/core/agents/interfaces.go +++ b/core/agents/interfaces.go @@ -33,9 +33,13 @@ type ExternalImage struct { } type Song struct { - ID string - Name string - MBID string + ID string + Name string + MBID string + Artist string + ArtistMBID string + Album string + AlbumMBID string } var ( @@ -76,6 +80,41 @@ type ArtistTopSongsRetriever interface { GetArtistTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]Song, error) } +// SimilarSongsByTrackRetriever provides similar songs based on a specific track +type SimilarSongsByTrackRetriever interface { + // GetSimilarSongsByTrack returns songs similar to the given track. + // Parameters: + // - id: local mediafile ID + // - name: track title + // - artist: artist name + // - mbid: MusicBrainz recording ID (may be empty) + // - count: maximum number of results + GetSimilarSongsByTrack(ctx context.Context, id, name, artist, mbid string, count int) ([]Song, error) +} + +// SimilarSongsByAlbumRetriever provides similar songs based on an album +type SimilarSongsByAlbumRetriever interface { + // GetSimilarSongsByAlbum returns songs similar to tracks on the given album. + // Parameters: + // - id: local album ID + // - name: album name + // - artist: album artist name + // - mbid: MusicBrainz release ID (may be empty) + // - count: maximum number of results + GetSimilarSongsByAlbum(ctx context.Context, id, name, artist, mbid string, count int) ([]Song, error) +} + +// SimilarSongsByArtistRetriever provides similar songs based on an artist +type SimilarSongsByArtistRetriever interface { + // GetSimilarSongsByArtist returns songs similar to the artist's catalog. + // Parameters: + // - id: local artist ID + // - name: artist name + // - mbid: MusicBrainz artist ID (may be empty) + // - count: maximum number of results + GetSimilarSongsByArtist(ctx context.Context, id, name, mbid string, count int) ([]Song, error) +} + var Map map[string]Constructor func Register(name string, init Constructor) { diff --git a/core/external/extdata_helper_test.go b/core/external/extdata_helper_test.go index 29975e5c5..f1d92be15 100644 --- a/core/external/extdata_helper_test.go +++ b/core/external/extdata_helper_test.go @@ -282,3 +282,27 @@ func (m *mockAgents) GetAlbumImages(ctx context.Context, name, artist, mbid stri } return nil, args.Error(1) } + +func (m *mockAgents) GetSimilarSongsByTrack(ctx context.Context, id, name, artist, mbid string, count int) ([]agents.Song, error) { + args := m.Called(ctx, id, name, artist, mbid, count) + if args.Get(0) != nil { + return args.Get(0).([]agents.Song), args.Error(1) + } + return nil, args.Error(1) +} + +func (m *mockAgents) GetSimilarSongsByAlbum(ctx context.Context, id, name, artist, mbid string, count int) ([]agents.Song, error) { + args := m.Called(ctx, id, name, artist, mbid, count) + if args.Get(0) != nil { + return args.Get(0).([]agents.Song), args.Error(1) + } + return nil, args.Error(1) +} + +func (m *mockAgents) GetSimilarSongsByArtist(ctx context.Context, id, name, mbid string, count int) ([]agents.Song, error) { + args := m.Called(ctx, id, name, mbid, count) + if args.Get(0) != nil { + return args.Get(0).([]agents.Song), args.Error(1) + } + return nil, args.Error(1) +} diff --git a/core/external/provider.go b/core/external/provider.go index a6eb848a0..13a4caf1f 100644 --- a/core/external/provider.go +++ b/core/external/provider.go @@ -32,7 +32,7 @@ const ( type Provider interface { UpdateAlbumInfo(ctx context.Context, id string) (*model.Album, error) UpdateArtistInfo(ctx context.Context, id string, count int, includeNotPresent bool) (*model.Artist, error) - ArtistRadio(ctx context.Context, id string, count int) (model.MediaFiles, error) + SimilarSongs(ctx context.Context, id string, count int) (model.MediaFiles, error) TopSongs(ctx context.Context, artist string, count int) (model.MediaFiles, error) ArtistImage(ctx context.Context, id string) (*url.URL, error) AlbumImage(ctx context.Context, id string) (*url.URL, error) @@ -80,6 +80,9 @@ type Agents interface { agents.ArtistSimilarRetriever agents.ArtistTopSongsRetriever agents.ArtistURLRetriever + agents.SimilarSongsByTrackRetriever + agents.SimilarSongsByAlbumRetriever + agents.SimilarSongsByArtistRetriever } func NewProvider(ds model.DataStore, agents Agents) Provider { @@ -256,7 +259,7 @@ func (e *provider) populateArtistInfo(ctx context.Context, artist auxArtist) (au g.Go(func() error { e.callGetImage(ctx, e.ag, &artist); return nil }) g.Go(func() error { e.callGetBiography(ctx, e.ag, &artist); return nil }) g.Go(func() error { e.callGetURL(ctx, e.ag, &artist); return nil }) - g.Go(func() error { e.callGetSimilar(ctx, e.ag, &artist, maxSimilarArtists, true); return nil }) + g.Go(func() error { e.callGetSimilarArtists(ctx, e.ag, &artist, maxSimilarArtists, true); return nil }) _ = g.Wait() if utils.IsCtxDone(ctx) { @@ -275,22 +278,54 @@ func (e *provider) populateArtistInfo(ctx context.Context, artist auxArtist) (au return artist, nil } -func (e *provider) ArtistRadio(ctx context.Context, id string, count int) (model.MediaFiles, error) { +func (e *provider) SimilarSongs(ctx context.Context, id string, count int) (model.MediaFiles, error) { + entity, err := model.GetEntityByID(ctx, e.ds, id) + if err != nil { + return nil, err + } + + var songs []agents.Song + + // Try entity-specific similarity first + switch v := entity.(type) { + case *model.MediaFile: + songs, err = e.ag.GetSimilarSongsByTrack(ctx, v.ID, v.Title, v.Artist, v.MbzRecordingID, count) + case *model.Album: + songs, err = e.ag.GetSimilarSongsByAlbum(ctx, v.ID, v.Name, v.AlbumArtist, v.MbzAlbumID, count) + case *model.Artist: + songs, err = e.ag.GetSimilarSongsByArtist(ctx, v.ID, v.Name, v.MbzArtistID, count) + default: + log.Warn(ctx, "Unknown entity type", "id", id, "type", fmt.Sprintf("%T", entity)) + return nil, model.ErrNotFound + } + + if err == nil && len(songs) > 0 { + return e.matchSongsToLibrary(ctx, songs, count) + } + + // Fallback to existing similar artists + top songs algorithm + return e.similarSongsFallback(ctx, id, count) +} + +// similarSongsFallback uses the original similar artists + top songs algorithm. The idea is to +// get the artist of the given entity, retrieve similar artists, get their top songs, and pick +// a weighted random selection of songs to return as similar songs. +func (e *provider) similarSongsFallback(ctx context.Context, id string, count int) (model.MediaFiles, error) { artist, err := e.getArtist(ctx, id) if err != nil { return nil, err } - e.callGetSimilar(ctx, e.ag, &artist, 15, false) + e.callGetSimilarArtists(ctx, e.ag, &artist, 15, false) if utils.IsCtxDone(ctx) { - log.Warn(ctx, "ArtistRadio call canceled", ctx.Err()) + log.Warn(ctx, "SimilarSongs call canceled", ctx.Err()) return nil, ctx.Err() } weightedSongs := random.NewWeightedChooser[model.MediaFile]() addArtist := func(a model.Artist, weightedSongs *random.WeightedChooser[model.MediaFile], count, artistWeight int) error { if utils.IsCtxDone(ctx) { - log.Warn(ctx, "ArtistRadio call canceled", ctx.Err()) + log.Warn(ctx, "SimilarSongs call canceled", ctx.Err()) return ctx.Err() } @@ -422,21 +457,20 @@ func (e *provider) getMatchingTopSongs(ctx context.Context, agent agents.ArtistT return nil, fmt.Errorf("failed to get top songs for artist %s: %w", artistName, err) } - idMatches, err := e.loadTracksByID(ctx, songs) - if err != nil { - return nil, fmt.Errorf("failed to load tracks by ID: %w", err) - } - mbidMatches, err := e.loadTracksByMBID(ctx, songs) - if err != nil { - return nil, fmt.Errorf("failed to load tracks by MBID: %w", err) - } - titleMatches, err := e.loadTracksByTitle(ctx, songs, artist, idMatches, mbidMatches) - if err != nil { - return nil, fmt.Errorf("failed to load tracks by title: %w", err) + // Enrich songs with artist info if not already present (for top songs, we know the artist) + for i := range songs { + if songs[i].Artist == "" { + songs[i].Artist = artistName + } + if songs[i].ArtistMBID == "" { + songs[i].ArtistMBID = artist.MbzArtistID + } } - log.Trace(ctx, "Top Songs loaded", "name", artistName, "numSongs", len(songs), "numIDMatches", len(idMatches), "numMBIDMatches", len(mbidMatches), "numTitleMatches", len(titleMatches)) - mfs := e.selectTopSongs(songs, idMatches, mbidMatches, titleMatches, count) + mfs, err := e.matchSongsToLibrary(ctx, songs, count) + if err != nil { + return nil, err + } if len(mfs) == 0 { log.Debug(ctx, "No matching top songs found", "name", artistName) @@ -447,137 +481,6 @@ func (e *provider) getMatchingTopSongs(ctx context.Context, agent agents.ArtistT return mfs, nil } -func (e *provider) loadTracksByMBID(ctx context.Context, songs []agents.Song) (map[string]model.MediaFile, error) { - var mbids []string - for _, s := range songs { - if s.MBID != "" { - mbids = append(mbids, s.MBID) - } - } - matches := map[string]model.MediaFile{} - if len(mbids) == 0 { - return matches, nil - } - res, err := e.ds.MediaFile(ctx).GetAll(model.QueryOptions{ - Filters: squirrel.And{ - squirrel.Eq{"mbz_recording_id": mbids}, - squirrel.Eq{"missing": false}, - }, - }) - if err != nil { - return matches, err - } - for _, mf := range res { - if id := mf.MbzRecordingID; id != "" { - if _, ok := matches[id]; !ok { - matches[id] = mf - } - } - } - return matches, nil -} - -func (e *provider) loadTracksByID(ctx context.Context, songs []agents.Song) (map[string]model.MediaFile, error) { - var ids []string - for _, s := range songs { - if s.ID != "" { - ids = append(ids, s.ID) - } - } - matches := map[string]model.MediaFile{} - if len(ids) == 0 { - return matches, nil - } - res, err := e.ds.MediaFile(ctx).GetAll(model.QueryOptions{ - Filters: squirrel.And{ - squirrel.Eq{"media_file.id": ids}, - squirrel.Eq{"missing": false}, - }, - }) - if err != nil { - return matches, err - } - for _, mf := range res { - if _, ok := matches[mf.ID]; !ok { - matches[mf.ID] = mf - } - } - return matches, nil -} - -func (e *provider) loadTracksByTitle(ctx context.Context, songs []agents.Song, artist *auxArtist, idMatches, mbidMatches map[string]model.MediaFile) (map[string]model.MediaFile, error) { - titleMap := map[string]string{} - for _, s := range songs { - // Skip if already matched by ID or MBID - if s.ID != "" && idMatches[s.ID].ID != "" { - continue - } - if s.MBID != "" && mbidMatches[s.MBID].ID != "" { - continue - } - sanitized := str.SanitizeFieldForSorting(s.Name) - titleMap[sanitized] = s.Name - } - matches := map[string]model.MediaFile{} - if len(titleMap) == 0 { - return matches, nil - } - titleFilters := squirrel.Or{} - for sanitized := range titleMap { - titleFilters = append(titleFilters, squirrel.Like{"order_title": sanitized}) - } - - res, err := e.ds.MediaFile(ctx).GetAll(model.QueryOptions{ - Filters: squirrel.And{ - squirrel.Or{ - squirrel.Eq{"artist_id": artist.ID}, - squirrel.Eq{"album_artist_id": artist.ID}, - }, - titleFilters, - squirrel.Eq{"missing": false}, - }, - Sort: "starred desc, rating desc, year asc, compilation asc ", - }) - if err != nil { - return matches, err - } - for _, mf := range res { - sanitized := str.SanitizeFieldForSorting(mf.Title) - if _, ok := matches[sanitized]; !ok { - matches[sanitized] = mf - } - } - return matches, nil -} - -func (e *provider) selectTopSongs(songs []agents.Song, byID, byMBID, byTitle map[string]model.MediaFile, count int) model.MediaFiles { - var mfs model.MediaFiles - for _, t := range songs { - if len(mfs) == count { - break - } - // Try ID match first - if t.ID != "" { - if mf, ok := byID[t.ID]; ok { - mfs = append(mfs, mf) - continue - } - } - // Try MBID match second - if t.MBID != "" { - if mf, ok := byMBID[t.MBID]; ok { - mfs = append(mfs, mf) - continue - } - } - // Fall back to title match - if mf, ok := byTitle[str.SanitizeFieldForSorting(t.Name)]; ok { - mfs = append(mfs, mf) - } - } - return mfs -} - func (e *provider) callGetURL(ctx context.Context, agent agents.ArtistURLRetriever, artist *auxArtist) { artisURL, err := agent.GetArtistURL(ctx, artist.ID, artist.Name(), artist.MbzArtistID) if err != nil { @@ -614,7 +517,7 @@ func (e *provider) callGetImage(ctx context.Context, agent agents.ArtistImageRet } } -func (e *provider) callGetSimilar(ctx context.Context, agent agents.ArtistSimilarRetriever, artist *auxArtist, +func (e *provider) callGetSimilarArtists(ctx context.Context, agent agents.ArtistSimilarRetriever, artist *auxArtist, limit int, includeNotPresent bool) { artistName := artist.Name() similar, err := agent.GetSimilarArtists(ctx, artist.ID, artistName, artist.MbzArtistID, limit) diff --git a/core/external/provider_artistradio_test.go b/core/external/provider_artistradio_test.go deleted file mode 100644 index 18afede6b..000000000 --- a/core/external/provider_artistradio_test.go +++ /dev/null @@ -1,205 +0,0 @@ -package external_test - -import ( - "context" - "errors" - - "github.com/Masterminds/squirrel" - "github.com/navidrome/navidrome/core/agents" - . "github.com/navidrome/navidrome/core/external" - "github.com/navidrome/navidrome/model" - "github.com/navidrome/navidrome/tests" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/stretchr/testify/mock" -) - -var _ = Describe("Provider - ArtistRadio", func() { - var ds model.DataStore - var provider Provider - var mockAgent *mockSimilarArtistAgent - var mockTopAgent agents.ArtistTopSongsRetriever - var mockSimilarAgent agents.ArtistSimilarRetriever - var agentsCombined Agents - var artistRepo *mockArtistRepo - var mediaFileRepo *mockMediaFileRepo - var ctx context.Context - - BeforeEach(func() { - ctx = GinkgoT().Context() - - artistRepo = newMockArtistRepo() - mediaFileRepo = newMockMediaFileRepo() - - ds = &tests.MockDataStore{ - MockedArtist: artistRepo, - MockedMediaFile: mediaFileRepo, - } - - mockAgent = &mockSimilarArtistAgent{} - mockTopAgent = mockAgent - mockSimilarAgent = mockAgent - - agentsCombined = &mockAgents{ - topSongsAgent: mockTopAgent, - similarAgent: mockSimilarAgent, - } - - provider = NewProvider(ds, agentsCombined) - }) - - It("returns similar songs from main artist and similar artists", func() { - artist1 := model.Artist{ID: "artist-1", Name: "Artist One"} - similarArtist := model.Artist{ID: "artist-3", Name: "Similar Artist"} - song1 := model.MediaFile{ID: "song-1", Title: "Song One", ArtistID: "artist-1", MbzRecordingID: "mbid-1"} - song2 := model.MediaFile{ID: "song-2", Title: "Song Two", ArtistID: "artist-1", MbzRecordingID: "mbid-2"} - song3 := model.MediaFile{ID: "song-3", Title: "Song Three", ArtistID: "artist-3", MbzRecordingID: "mbid-3"} - - artistRepo.On("Get", "artist-1").Return(&artist1, nil).Maybe() - artistRepo.On("Get", "artist-3").Return(&similarArtist, nil).Maybe() - - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - return opt.Max == 1 && opt.Filters != nil - })).Return(model.Artists{artist1}, nil).Once() - - similarAgentsResp := []agents.Artist{ - {Name: "Similar Artist", MBID: "similar-mbid"}, - } - mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist One", "", 15). - Return(similarAgentsResp, nil).Once() - - // Mock the three-phase artist lookup: ID (skipped - no IDs), MBID, then Name - // MBID lookup returns empty (no match) - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - _, ok := opt.Filters.(squirrel.Eq) - return opt.Max == 0 && ok - })).Return(model.Artists{}, nil).Once() - // Name lookup returns the similar artist - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - _, ok := opt.Filters.(squirrel.Or) - return opt.Max == 0 && ok - })).Return(model.Artists{similarArtist}, nil).Once() - - mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist One", "", mock.Anything). - Return([]agents.Song{ - {Name: "Song One", MBID: "mbid-1"}, - {Name: "Song Two", MBID: "mbid-2"}, - }, nil).Once() - - mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-3", "Similar Artist", "", mock.Anything). - Return([]agents.Song{ - {Name: "Song Three", MBID: "mbid-3"}, - }, nil).Once() - - mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song1, song2}, nil).Once() - mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song3}, nil).Once() - - songs, err := provider.ArtistRadio(ctx, "artist-1", 3) - - Expect(err).ToNot(HaveOccurred()) - Expect(songs).To(HaveLen(3)) - for _, song := range songs { - Expect(song.ID).To(BeElementOf("song-1", "song-2", "song-3")) - } - }) - - It("returns ErrNotFound when artist is not found", func() { - artistRepo.On("Get", "artist-unknown-artist").Return(nil, model.ErrNotFound) - mediaFileRepo.On("Get", "artist-unknown-artist").Return(nil, model.ErrNotFound) - - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - return opt.Max == 1 && opt.Filters != nil - })).Return(model.Artists{}, nil).Maybe() - - songs, err := provider.ArtistRadio(ctx, "artist-unknown-artist", 5) - - Expect(err).To(Equal(model.ErrNotFound)) - Expect(songs).To(BeNil()) - }) - - It("returns songs from main artist when GetSimilarArtists returns error", func() { - artist1 := model.Artist{ID: "artist-1", Name: "Artist One"} - song1 := model.MediaFile{ID: "song-1", Title: "Song One", ArtistID: "artist-1", MbzRecordingID: "mbid-1"} - - artistRepo.On("Get", "artist-1").Return(&artist1, nil).Maybe() - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - return opt.Max == 1 && opt.Filters != nil - })).Return(model.Artists{artist1}, nil).Maybe() - - mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist One", "", 15). - Return(nil, errors.New("error getting similar artists")).Once() - - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - return opt.Max == 0 && opt.Filters != nil - })).Return(model.Artists{}, nil).Once() - - mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist One", "", mock.Anything). - Return([]agents.Song{ - {Name: "Song One", MBID: "mbid-1"}, - }, nil).Once() - - mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song1}, nil).Once() - - songs, err := provider.ArtistRadio(ctx, "artist-1", 5) - - Expect(err).ToNot(HaveOccurred()) - Expect(songs).To(HaveLen(1)) - Expect(songs[0].ID).To(Equal("song-1")) - }) - - It("returns empty list when GetArtistTopSongs returns error", func() { - artist1 := model.Artist{ID: "artist-1", Name: "Artist One"} - - artistRepo.On("Get", "artist-1").Return(&artist1, nil).Maybe() - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - return opt.Max == 1 && opt.Filters != nil - })).Return(model.Artists{artist1}, nil).Maybe() - - mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist One", "", 15). - Return([]agents.Artist{}, nil).Once() - - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - return opt.Max == 0 && opt.Filters != nil - })).Return(model.Artists{}, nil).Once() - - mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist One", "", mock.Anything). - Return(nil, errors.New("error getting top songs")).Once() - - songs, err := provider.ArtistRadio(ctx, "artist-1", 5) - - Expect(err).ToNot(HaveOccurred()) - Expect(songs).To(BeEmpty()) - }) - - It("respects count parameter", func() { - artist1 := model.Artist{ID: "artist-1", Name: "Artist One"} - song1 := model.MediaFile{ID: "song-1", Title: "Song One", ArtistID: "artist-1", MbzRecordingID: "mbid-1"} - song2 := model.MediaFile{ID: "song-2", Title: "Song Two", ArtistID: "artist-1", MbzRecordingID: "mbid-2"} - - artistRepo.On("Get", "artist-1").Return(&artist1, nil).Maybe() - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - return opt.Max == 1 && opt.Filters != nil - })).Return(model.Artists{artist1}, nil).Maybe() - - mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist One", "", 15). - Return([]agents.Artist{}, nil).Once() - - artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - return opt.Max == 0 && opt.Filters != nil - })).Return(model.Artists{}, nil).Once() - - mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist One", "", mock.Anything). - Return([]agents.Song{ - {Name: "Song One", MBID: "mbid-1"}, - {Name: "Song Two", MBID: "mbid-2"}, - }, nil).Once() - - mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song1, song2}, nil).Once() - - songs, err := provider.ArtistRadio(ctx, "artist-1", 1) - - Expect(err).ToNot(HaveOccurred()) - Expect(songs).To(HaveLen(1)) - Expect(songs[0].ID).To(BeElementOf("song-1", "song-2")) - }) -}) diff --git a/core/external/provider_matching.go b/core/external/provider_matching.go new file mode 100644 index 000000000..6bf393f77 --- /dev/null +++ b/core/external/provider_matching.go @@ -0,0 +1,388 @@ +package external + +import ( + "context" + "fmt" + + "github.com/Masterminds/squirrel" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/core/agents" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/utils/str" + "github.com/xrash/smetrics" +) + +// matchSongsToLibrary matches agent song results to local library tracks using a multi-phase +// matching algorithm that prioritizes accuracy over recall. +// +// # Algorithm Overview +// +// The algorithm matches songs from external agents (Last.fm, Deezer, etc.) to tracks in the +// local music library using three matching strategies in priority order: +// +// 1. Direct ID match: Songs with an ID field are matched directly to MediaFiles by ID +// 2. MusicBrainz Recording ID (MBID) match: Songs with MBID are matched to tracks with +// matching mbz_recording_id +// 3. Title+Artist fuzzy match: Remaining songs are matched using fuzzy string comparison +// with metadata specificity scoring +// +// # Matching Priority +// +// When selecting the final result, matches are prioritized in order: ID > MBID > Title+Artist. +// This ensures that more reliable identifiers take precedence over fuzzy text matching. +// +// # Fuzzy Matching Details +// +// For title+artist matching, the algorithm uses Jaro-Winkler similarity (threshold configurable +// via SimilarSongsMatchThreshold, default 85%). Matches are ranked by: +// +// 1. Title similarity (Jaro-Winkler score, 0.0-1.0) +// 2. Specificity level (0-5, based on metadata precision): +// - Level 5: Title + Artist MBID + Album MBID (most specific) +// - Level 4: Title + Artist MBID + Album name (fuzzy) +// - Level 3: Title + Artist name + Album name (fuzzy) +// - Level 2: Title + Artist MBID +// - Level 1: Title + Artist name +// - Level 0: Title only +// 3. Album similarity (Jaro-Winkler, as final tiebreaker) +// +// # Examples +// +// Example 1 - MBID Priority: +// +// Agent returns: {Name: "Paranoid Android", MBID: "abc-123", Artist: "Radiohead"} +// Library has: [ +// {ID: "t1", Title: "Paranoid Android", MbzRecordingID: "abc-123"}, +// {ID: "t2", Title: "Paranoid Android", Artist: "Radiohead"}, +// ] +// Result: t1 (MBID match takes priority over title+artist) +// +// Example 2 - Specificity Ranking: +// +// Agent returns: {Name: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator"} +// Library has: [ +// {ID: "t1", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "101"}, // Level 1 +// {ID: "t2", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator"}, // Level 3 +// ] +// Result: t2 (Level 3 beats Level 1 due to album match) +// +// Example 3 - Fuzzy Title Matching: +// +// Agent returns: {Name: "Bohemian Rhapsody", Artist: "Queen"} +// Library has: {ID: "t1", Title: "Bohemian Rhapsody - Remastered", Artist: "Queen"} +// With threshold=85%: Match succeeds (similarity ~0.87) +// With threshold=100%: No match (not exact) +// +// # Parameters +// +// - ctx: Context for database operations +// - songs: Slice of agent.Song results from external providers +// - count: Maximum number of matches to return +// +// # Returns +// +// Returns up to 'count' MediaFiles from the library that best match the input songs, +// preserving the original order from the agent. Songs that cannot be matched are skipped. +func (e *provider) matchSongsToLibrary(ctx context.Context, songs []agents.Song, count int) (model.MediaFiles, error) { + idMatches, err := e.loadTracksByID(ctx, songs) + if err != nil { + return nil, fmt.Errorf("failed to load tracks by ID: %w", err) + } + mbidMatches, err := e.loadTracksByMBID(ctx, songs) + if err != nil { + return nil, fmt.Errorf("failed to load tracks by MBID: %w", err) + } + titleMatches, err := e.loadTracksByTitleAndArtist(ctx, songs, idMatches, mbidMatches) + if err != nil { + return nil, fmt.Errorf("failed to load tracks by title: %w", err) + } + + return e.selectBestMatchingSongs(songs, idMatches, mbidMatches, titleMatches, count), nil +} + +// loadTracksByID fetches MediaFiles from the library using direct ID matching. +// It extracts all non-empty ID fields from the input songs and performs a single +// batch query to the database. Returns a map keyed by MediaFile ID for O(1) lookup. +// Only non-missing files are returned. +func (e *provider) loadTracksByID(ctx context.Context, songs []agents.Song) (map[string]model.MediaFile, error) { + var ids []string + for _, s := range songs { + if s.ID != "" { + ids = append(ids, s.ID) + } + } + matches := map[string]model.MediaFile{} + if len(ids) == 0 { + return matches, nil + } + res, err := e.ds.MediaFile(ctx).GetAll(model.QueryOptions{ + Filters: squirrel.And{ + squirrel.Eq{"media_file.id": ids}, + squirrel.Eq{"missing": false}, + }, + }) + if err != nil { + return matches, err + } + for _, mf := range res { + if _, ok := matches[mf.ID]; !ok { + matches[mf.ID] = mf + } + } + return matches, nil +} + +// loadTracksByMBID fetches MediaFiles from the library using MusicBrainz Recording IDs. +// It extracts all non-empty MBID fields from the input songs and performs a single +// batch query against the mbz_recording_id column. Returns a map keyed by MBID for +// O(1) lookup. Only non-missing files are returned. +func (e *provider) loadTracksByMBID(ctx context.Context, songs []agents.Song) (map[string]model.MediaFile, error) { + var mbids []string + for _, s := range songs { + if s.MBID != "" { + mbids = append(mbids, s.MBID) + } + } + matches := map[string]model.MediaFile{} + if len(mbids) == 0 { + return matches, nil + } + res, err := e.ds.MediaFile(ctx).GetAll(model.QueryOptions{ + Filters: squirrel.And{ + squirrel.Eq{"mbz_recording_id": mbids}, + squirrel.Eq{"missing": false}, + }, + }) + if err != nil { + return matches, err + } + for _, mf := range res { + if id := mf.MbzRecordingID; id != "" { + if _, ok := matches[id]; !ok { + matches[id] = mf + } + } + } + return matches, nil +} + +// songQuery represents a normalized query for matching a song to library tracks. +// All string fields are sanitized (lowercased, diacritics removed) for comparison. +// This struct is used internally by loadTracksByTitleAndArtist to group queries by artist. +type songQuery struct { + title string // Sanitized song title + artist string // Sanitized artist name (without articles like "The") + artistMBID string // MusicBrainz Artist ID (optional, for higher specificity matching) + album string // Sanitized album name (optional, for specificity scoring) + albumMBID string // MusicBrainz Album ID (optional, for highest specificity matching) +} + +// matchScore combines title/album similarity with metadata specificity for ranking matches +type matchScore struct { + titleSimilarity float64 // 0.0-1.0 (Jaro-Winkler) + albumSimilarity float64 // 0.0-1.0 (Jaro-Winkler), used as tiebreaker + specificityLevel int // 0-5 (higher = more specific metadata match) +} + +// betterThan returns true if this score beats another. +// Comparison order: title similarity > specificity level > album similarity +func (s matchScore) betterThan(other matchScore) bool { + if s.titleSimilarity != other.titleSimilarity { + return s.titleSimilarity > other.titleSimilarity + } + if s.specificityLevel != other.specificityLevel { + return s.specificityLevel > other.specificityLevel + } + return s.albumSimilarity > other.albumSimilarity +} + +// computeSpecificityLevel determines how well query metadata matches a track (0-5). +// Higher values indicate more specific matches (MBIDs > names > title only). +// Uses fuzzy matching for album names with the same threshold as title matching. +func computeSpecificityLevel(q songQuery, mf model.MediaFile, albumThreshold float64) int { + title := str.SanitizeFieldForSorting(mf.Title) + artist := str.SanitizeFieldForSortingNoArticle(mf.Artist) + album := str.SanitizeFieldForSorting(mf.Album) + + // Level 5: Title + Artist MBID + Album MBID (most specific) + if q.artistMBID != "" && q.albumMBID != "" && + mf.MbzArtistID == q.artistMBID && mf.MbzAlbumID == q.albumMBID { + return 5 + } + // Level 4: Title + Artist MBID + Album name (fuzzy) + if q.artistMBID != "" && q.album != "" && + mf.MbzArtistID == q.artistMBID && similarityRatio(album, q.album) >= albumThreshold { + return 4 + } + // Level 3: Title + Artist name + Album name (fuzzy) + if q.artist != "" && q.album != "" && + artist == q.artist && similarityRatio(album, q.album) >= albumThreshold { + return 3 + } + // Level 2: Title + Artist MBID + if q.artistMBID != "" && mf.MbzArtistID == q.artistMBID { + return 2 + } + // Level 1: Title + Artist name + if q.artist != "" && artist == q.artist { + return 1 + } + // Level 0: Title only match (but for fuzzy, title matched via similarity) + // Check if at least the title matches exactly + if title == q.title { + return 0 + } + return -1 // No exact title match, but could still be a fuzzy match +} + +// loadTracksByTitleAndArtist loads tracks matching by title with optional artist/album filtering. +// Uses a unified scoring approach that combines title similarity (Jaro-Winkler) with +// metadata specificity (MBIDs, album names) for both exact and fuzzy matches. +// Returns a map keyed by "title|artist" for compatibility with selectBestMatchingSongs. +func (e *provider) loadTracksByTitleAndArtist(ctx context.Context, songs []agents.Song, idMatches, mbidMatches map[string]model.MediaFile) (map[string]model.MediaFile, error) { + queries := e.buildTitleQueries(songs, idMatches, mbidMatches) + if len(queries) == 0 { + return map[string]model.MediaFile{}, nil + } + + threshold := float64(conf.Server.SimilarSongsMatchThreshold) / 100.0 + + // Group queries by artist for efficient DB access + byArtist := map[string][]songQuery{} + for _, q := range queries { + if q.artist != "" { + byArtist[q.artist] = append(byArtist[q.artist], q) + } + } + + matches := map[string]model.MediaFile{} + for artist, artistQueries := range byArtist { + // Single DB query per artist - get all their tracks + tracks, err := e.ds.MediaFile(ctx).GetAll(model.QueryOptions{ + Filters: squirrel.And{ + squirrel.Eq{"order_artist_name": artist}, + squirrel.Eq{"missing": false}, + }, + Sort: "starred desc, rating desc, year asc, compilation asc", + }) + if err != nil { + continue + } + + // Find best match for each query using unified scoring + for _, q := range artistQueries { + if mf, found := e.findBestMatch(q, tracks, threshold); found { + key := q.title + "|" + q.artist + if _, exists := matches[key]; !exists { + matches[key] = mf + } + } + } + } + return matches, nil +} + +// findBestMatch finds the best matching track using combined title/album similarity and specificity scoring. +// A track must meet the threshold for title similarity, then the best match is chosen by: +// 1. Highest title similarity +// 2. Highest specificity level +// 3. Highest album similarity (as final tiebreaker) +func (e *provider) findBestMatch(q songQuery, tracks model.MediaFiles, threshold float64) (model.MediaFile, bool) { + var bestMatch model.MediaFile + bestScore := matchScore{titleSimilarity: -1} + found := false + + for _, mf := range tracks { + trackTitle := str.SanitizeFieldForSorting(mf.Title) + titleSim := similarityRatio(q.title, trackTitle) + + if titleSim < threshold { + continue + } + + // Compute album similarity for tiebreaking (0.0 if no album in query) + var albumSim float64 + if q.album != "" { + trackAlbum := str.SanitizeFieldForSorting(mf.Album) + albumSim = similarityRatio(q.album, trackAlbum) + } + + score := matchScore{ + titleSimilarity: titleSim, + albumSimilarity: albumSim, + specificityLevel: computeSpecificityLevel(q, mf, threshold), + } + + if score.betterThan(bestScore) { + bestScore = score + bestMatch = mf + found = true + } + } + return bestMatch, found +} + +func (e *provider) buildTitleQueries(songs []agents.Song, idMatches, mbidMatches map[string]model.MediaFile) []songQuery { + var queries []songQuery + for _, s := range songs { + // Skip if already matched by ID or MBID + if s.ID != "" && idMatches[s.ID].ID != "" { + continue + } + if s.MBID != "" && mbidMatches[s.MBID].ID != "" { + continue + } + queries = append(queries, songQuery{ + title: str.SanitizeFieldForSorting(s.Name), + artist: str.SanitizeFieldForSortingNoArticle(s.Artist), + artistMBID: s.ArtistMBID, + album: str.SanitizeFieldForSorting(s.Album), + albumMBID: s.AlbumMBID, + }) + } + return queries +} + +func (e *provider) selectBestMatchingSongs(songs []agents.Song, byID, byMBID, byTitleArtist map[string]model.MediaFile, count int) model.MediaFiles { + var mfs model.MediaFiles + for _, t := range songs { + if len(mfs) == count { + break + } + // Try ID match first + if t.ID != "" { + if mf, ok := byID[t.ID]; ok { + mfs = append(mfs, mf) + continue + } + } + // Try MBID match second + if t.MBID != "" { + if mf, ok := byMBID[t.MBID]; ok { + mfs = append(mfs, mf) + continue + } + } + // Fall back to title+artist match (composite key preserves duplicate titles) + key := str.SanitizeFieldForSorting(t.Name) + "|" + str.SanitizeFieldForSortingNoArticle(t.Artist) + if mf, ok := byTitleArtist[key]; ok { + mfs = append(mfs, mf) + } + } + return mfs +} + +// similarityRatio calculates the similarity between two strings using Jaro-Winkler algorithm. +// Returns a value between 0.0 (completely different) and 1.0 (identical). +// Jaro-Winkler is well-suited for matching song titles because it gives higher scores +// when strings share a common prefix (e.g., "Song Title" vs "Song Title - Remastered"). +func similarityRatio(a, b string) float64 { + if a == b { + return 1.0 + } + if len(a) == 0 || len(b) == 0 { + return 0.0 + } + // JaroWinkler params: boostThreshold=0.7, prefixSize=4 + return smetrics.JaroWinkler(a, b, 0.7, 4) +} diff --git a/core/external/provider_matching_internal_test.go b/core/external/provider_matching_internal_test.go new file mode 100644 index 000000000..5b9ccea3b --- /dev/null +++ b/core/external/provider_matching_internal_test.go @@ -0,0 +1,57 @@ +package external + +import ( + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("similarityRatio", func() { + It("returns 1.0 for identical strings", func() { + Expect(similarityRatio("hello", "hello")).To(BeNumerically("==", 1.0)) + }) + + It("returns 0.0 for empty strings", func() { + Expect(similarityRatio("", "test")).To(BeNumerically("==", 0.0)) + Expect(similarityRatio("test", "")).To(BeNumerically("==", 0.0)) + }) + + It("returns high similarity for remastered suffix", func() { + // Jaro-Winkler gives ~0.92 for this case + ratio := similarityRatio("paranoid android", "paranoid android remastered") + Expect(ratio).To(BeNumerically(">=", 0.85)) + }) + + It("returns high similarity for suffix additions like (Live)", func() { + // Jaro-Winkler gives ~0.96 for this case + ratio := similarityRatio("bohemian rhapsody", "bohemian rhapsody live") + Expect(ratio).To(BeNumerically(">=", 0.90)) + }) + + It("returns high similarity for 'yesterday' variants (common prefix)", func() { + // Jaro-Winkler gives ~0.90 because of common prefix + ratio := similarityRatio("yesterday", "yesterday once more") + Expect(ratio).To(BeNumerically(">=", 0.85)) + }) + + It("returns low similarity for same suffix", func() { + // Jaro-Winkler gives ~0.70 for this case + ratio := similarityRatio("postman (live)", "taxman (live)") + Expect(ratio).To(BeNumerically("<", 0.85)) + }) + + It("handles unicode characters", func() { + ratio := similarityRatio("dont stop believin", "don't stop believin'") + Expect(ratio).To(BeNumerically(">=", 0.85)) + }) + + It("returns low similarity for completely different strings", func() { + ratio := similarityRatio("abc", "xyz") + Expect(ratio).To(BeNumerically("<", 0.5)) + }) + + It("is symmetric", func() { + ratio1 := similarityRatio("hello world", "hello") + ratio2 := similarityRatio("hello", "hello world") + Expect(ratio1).To(Equal(ratio2)) + }) +}) diff --git a/core/external/provider_matching_test.go b/core/external/provider_matching_test.go new file mode 100644 index 000000000..cb6b33e65 --- /dev/null +++ b/core/external/provider_matching_test.go @@ -0,0 +1,460 @@ +package external_test + +import ( + "context" + + "github.com/Masterminds/squirrel" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/conf/configtest" + "github.com/navidrome/navidrome/core/agents" + . "github.com/navidrome/navidrome/core/external" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/tests" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/stretchr/testify/mock" +) + +var _ = Describe("Provider - Song Matching", func() { + var ds model.DataStore + var provider Provider + var agentsCombined *mockAgents + var artistRepo *mockArtistRepo + var mediaFileRepo *mockMediaFileRepo + var albumRepo *mockAlbumRepo + var ctx context.Context + + BeforeEach(func() { + ctx = GinkgoT().Context() + + artistRepo = newMockArtistRepo() + mediaFileRepo = newMockMediaFileRepo() + albumRepo = newMockAlbumRepo() + + ds = &tests.MockDataStore{ + MockedArtist: artistRepo, + MockedMediaFile: mediaFileRepo, + MockedAlbum: albumRepo, + } + + agentsCombined = &mockAgents{} + provider = NewProvider(ds, agentsCombined) + }) + + Describe("matchSongsToLibrary priority matching", func() { + var track model.MediaFile + + BeforeEach(func() { + DeferCleanup(configtest.SetupConfig()) + // Disable fuzzy matching for these tests to avoid unexpected GetAll calls + conf.Server.SimilarSongsMatchThreshold = 100 + + track = model.MediaFile{ID: "track-1", Title: "Test Track", Artist: "Test Artist", MbzRecordingID: ""} + + // Setup for GetEntityByID to return the track + artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once() + }) + + setupExpectations := func(returnedSongs []agents.Song, idMatches, mbidMatches, artistTracks model.MediaFiles) { + agentsCombined.On("GetSimilarSongsByTrack", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything). + Return(returnedSongs, nil).Once() + + // loadTracksByID + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + _, ok := opt.Filters.(squirrel.Eq) + return ok + })).Return(idMatches, nil).Once() + + // loadTracksByMBID + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + and, ok := opt.Filters.(squirrel.And) + if !ok || len(and) < 1 { + return false + } + eq, hasEq := and[0].(squirrel.Eq) + if !hasEq { + return false + } + _, hasMBID := eq["mbz_recording_id"] + return hasMBID + })).Return(mbidMatches, nil).Once() + + // loadTracksByTitleAndArtist - now queries by artist name + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + and, ok := opt.Filters.(squirrel.And) + if !ok || len(and) < 2 { + return false + } + eq, hasEq := and[0].(squirrel.Eq) + if !hasEq { + return false + } + _, hasArtist := eq["order_artist_name"] + return hasArtist + })).Return(artistTracks, nil).Maybe() + } + + Context("when agent returns artist and album metadata", func() { + It("matches by title + artist MBID + album MBID (highest priority)", func() { + // Song in library with all MBIDs + correctMatch := model.MediaFile{ + ID: "correct-match", Title: "Similar Song", Artist: "Depeche Mode", Album: "Violator", + MbzArtistID: "artist-mbid-123", MbzAlbumID: "album-mbid-456", + } + // Another song with same title but different MBIDs (should NOT match) + wrongMatch := model.MediaFile{ + ID: "wrong-match", Title: "Similar Song", Artist: "Depeche Mode", Album: "Some Other Album", + MbzArtistID: "artist-mbid-123", MbzAlbumID: "different-album-mbid", + } + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Depeche Mode", ArtistMBID: "artist-mbid-123", Album: "Violator", AlbumMBID: "album-mbid-456"}, + } + + setupExpectations(returnedSongs, model.MediaFiles{}, model.MediaFiles{}, model.MediaFiles{wrongMatch, correctMatch}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("correct-match")) + }) + + It("matches by title + artist name + album name when MBIDs unavailable", func() { + // Song in library without MBIDs but with matching artist/album names + correctMatch := model.MediaFile{ + ID: "correct-match", Title: "Similar Song", Artist: "depeche mode", Album: "violator", + } + // Another song with same title but different artist (should NOT match) + wrongMatch := model.MediaFile{ + ID: "wrong-match", Title: "Similar Song", Artist: "Other Artist", Album: "Other Album", + } + + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Depeche Mode", Album: "Violator"}, // No MBIDs + } + + setupExpectations(returnedSongs, model.MediaFiles{}, model.MediaFiles{}, model.MediaFiles{wrongMatch, correctMatch}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("correct-match")) + }) + + It("matches by title + artist only when album info unavailable", func() { + // Song in library with matching artist + correctMatch := model.MediaFile{ + ID: "correct-match", Title: "Similar Song", Artist: "depeche mode", Album: "Some Album", + } + // Another song with same title but different artist + wrongMatch := model.MediaFile{ + ID: "wrong-match", Title: "Similar Song", Artist: "Other Artist", Album: "Other Album", + } + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Depeche Mode"}, // No album info + } + + setupExpectations(returnedSongs, model.MediaFiles{}, model.MediaFiles{}, model.MediaFiles{wrongMatch, correctMatch}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("correct-match")) + }) + + It("does not match songs without artist info", func() { + // Songs without artist info cannot be matched since we query by artist + returnedSongs := []agents.Song{ + {Name: "Similar Song"}, // No artist/album info at all + } + + // No artist to query, so no GetAll calls for title matching + setupExpectations(returnedSongs, model.MediaFiles{}, model.MediaFiles{}, model.MediaFiles{}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(BeEmpty()) + }) + }) + + Context("when matching multiple songs with the same title but different artists", func() { + It("returns distinct matches for each artist's version (covers scenario)", func() { + // Multiple covers of the same song by different artists + cover1 := model.MediaFile{ + ID: "cover-1", Title: "Yesterday", Artist: "The Beatles", Album: "Help!", + } + cover2 := model.MediaFile{ + ID: "cover-2", Title: "Yesterday", Artist: "Ray Charles", Album: "Greatest Hits", + } + cover3 := model.MediaFile{ + ID: "cover-3", Title: "Yesterday", Artist: "Frank Sinatra", Album: "My Way", + } + + returnedSongs := []agents.Song{ + {Name: "Yesterday", Artist: "The Beatles", Album: "Help!"}, + {Name: "Yesterday", Artist: "Ray Charles", Album: "Greatest Hits"}, + {Name: "Yesterday", Artist: "Frank Sinatra", Album: "My Way"}, + } + + setupExpectations(returnedSongs, model.MediaFiles{}, model.MediaFiles{}, model.MediaFiles{cover1, cover2, cover3}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + // All three covers should be returned, not just the first one + Expect(songs).To(HaveLen(3)) + // Verify all three different versions are included + ids := []string{songs[0].ID, songs[1].ID, songs[2].ID} + Expect(ids).To(ContainElements("cover-1", "cover-2", "cover-3")) + }) + }) + + Context("when matching multiple songs with different precision levels", func() { + It("prefers more precise matches for each song", func() { + // Library has multiple versions of same song + preciseMatch := model.MediaFile{ + ID: "precise", Title: "Song A", Artist: "Artist One", Album: "Album One", + MbzArtistID: "mbid-1", MbzAlbumID: "album-mbid-1", + } + lessAccurateMatch := model.MediaFile{ + ID: "less-accurate", Title: "Song A", Artist: "Artist One", Album: "Compilation", + MbzArtistID: "mbid-1", + } + artistTwoMatch := model.MediaFile{ + ID: "artist-two", Title: "Song B", Artist: "Artist Two", + } + + returnedSongs := []agents.Song{ + {Name: "Song A", Artist: "Artist One", ArtistMBID: "mbid-1", Album: "Album One", AlbumMBID: "album-mbid-1"}, + {Name: "Song B", Artist: "Artist Two"}, // Different artist + } + + setupExpectations(returnedSongs, model.MediaFiles{}, model.MediaFiles{}, model.MediaFiles{lessAccurateMatch, preciseMatch, artistTwoMatch}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(2)) + // First song should be the precise match (has all MBIDs) + Expect(songs[0].ID).To(Equal("precise")) + // Second song matches by title + artist + Expect(songs[1].ID).To(Equal("artist-two")) + }) + }) + }) + + Describe("Fuzzy matching fallback", func() { + var track model.MediaFile + + BeforeEach(func() { + DeferCleanup(configtest.SetupConfig()) + track = model.MediaFile{ID: "track-1", Title: "Test Track", Artist: "Test Artist"} + + // Setup for GetEntityByID to return the track + artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once() + }) + + setupFuzzyExpectations := func(returnedSongs []agents.Song, artistTracks model.MediaFiles) { + agentsCombined.On("GetSimilarSongsByTrack", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything). + Return(returnedSongs, nil).Once() + + // loadTracksByTitleAndArtist now queries by artist in a single pass + // Note: loadTracksByID and loadTracksByMBID return early when no IDs/MBIDs + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + and, ok := opt.Filters.(squirrel.And) + if !ok || len(and) < 2 { + return false + } + eq, hasEq := and[0].(squirrel.Eq) + if !hasEq { + return false + } + _, hasArtist := eq["order_artist_name"] + return hasArtist + })).Return(artistTracks, nil).Maybe() + } + + Context("with default threshold (85%)", func() { + It("matches songs with remastered suffix", func() { + conf.Server.SimilarSongsMatchThreshold = 85 + + // Agent returns "Paranoid Android" but library has "Paranoid Android - Remastered" + returnedSongs := []agents.Song{ + {Name: "Paranoid Android", Artist: "Radiohead"}, + } + // Artist catalog has the remastered version (fuzzy match will find it) + artistTracks := model.MediaFiles{ + {ID: "remastered", Title: "Paranoid Android - Remastered", Artist: "Radiohead"}, + } + + setupFuzzyExpectations(returnedSongs, artistTracks) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("remastered")) + }) + + It("matches songs with live suffix", func() { + conf.Server.SimilarSongsMatchThreshold = 85 + + returnedSongs := []agents.Song{ + {Name: "Bohemian Rhapsody", Artist: "Queen"}, + } + artistTracks := model.MediaFiles{ + {ID: "live", Title: "Bohemian Rhapsody (Live)", Artist: "Queen"}, + } + + setupFuzzyExpectations(returnedSongs, artistTracks) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("live")) + }) + + It("does not match completely different songs", func() { + conf.Server.SimilarSongsMatchThreshold = 85 + + returnedSongs := []agents.Song{ + {Name: "Yesterday", Artist: "The Beatles"}, + } + // Artist catalog has completely different songs + artistTracks := model.MediaFiles{ + {ID: "different", Title: "Tomorrow Never Knows", Artist: "The Beatles"}, + {ID: "different2", Title: "Here Comes The Sun", Artist: "The Beatles"}, + } + + setupFuzzyExpectations(returnedSongs, artistTracks) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(BeEmpty()) + }) + }) + + Context("with threshold set to 100 (exact match only)", func() { + It("only matches exact titles", func() { + conf.Server.SimilarSongsMatchThreshold = 100 + + returnedSongs := []agents.Song{ + {Name: "Paranoid Android", Artist: "Radiohead"}, + } + // Artist catalog has only remastered version - no exact match + artistTracks := model.MediaFiles{ + {ID: "remastered", Title: "Paranoid Android - Remastered", Artist: "Radiohead"}, + } + + setupFuzzyExpectations(returnedSongs, artistTracks) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(BeEmpty()) + }) + }) + + Context("with lower threshold (75%)", func() { + It("matches more aggressively", func() { + conf.Server.SimilarSongsMatchThreshold = 75 + + returnedSongs := []agents.Song{ + {Name: "Song", Artist: "Artist"}, + } + artistTracks := model.MediaFiles{ + {ID: "extended", Title: "Song (Extended Mix)", Artist: "Artist"}, + } + + setupFuzzyExpectations(returnedSongs, artistTracks) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("extended")) + }) + }) + + Context("with fuzzy album matching", func() { + It("matches album with (Remaster) suffix", func() { + conf.Server.SimilarSongsMatchThreshold = 85 + + // Agent returns "A Night at the Opera" but library has remastered version + returnedSongs := []agents.Song{ + {Name: "Bohemian Rhapsody", Artist: "Queen", Album: "A Night at the Opera"}, + } + // Library has same album with remaster suffix + correctMatch := model.MediaFile{ + ID: "correct", Title: "Bohemian Rhapsody", Artist: "Queen", Album: "A Night at the Opera (2011 Remaster)", + } + wrongMatch := model.MediaFile{ + ID: "wrong", Title: "Bohemian Rhapsody", Artist: "Queen", Album: "Greatest Hits", + } + + setupFuzzyExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + // Should prefer the fuzzy album match (Level 3) over title+artist only (Level 1) + Expect(songs[0].ID).To(Equal("correct")) + }) + + It("matches album with (Deluxe Edition) suffix", func() { + conf.Server.SimilarSongsMatchThreshold = 85 + + returnedSongs := []agents.Song{ + {Name: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator"}, + } + correctMatch := model.MediaFile{ + ID: "correct", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator (Deluxe Edition)", + } + wrongMatch := model.MediaFile{ + ID: "wrong", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "101", + } + + setupFuzzyExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("correct")) + }) + + It("prefers exact album match over fuzzy album match", func() { + conf.Server.SimilarSongsMatchThreshold = 85 + + returnedSongs := []agents.Song{ + {Name: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator"}, + } + exactMatch := model.MediaFile{ + ID: "exact", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator", + } + fuzzyMatch := model.MediaFile{ + ID: "fuzzy", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator (Deluxe Edition)", + } + + setupFuzzyExpectations(returnedSongs, model.MediaFiles{fuzzyMatch, exactMatch}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + // Both have same title similarity (1.0), so should prefer exact album match (higher specificity via higher album similarity) + Expect(songs[0].ID).To(Equal("exact")) + }) + }) + }) +}) diff --git a/core/external/provider_similarsongs_test.go b/core/external/provider_similarsongs_test.go new file mode 100644 index 000000000..1491d394e --- /dev/null +++ b/core/external/provider_similarsongs_test.go @@ -0,0 +1,443 @@ +package external_test + +import ( + "context" + "errors" + + "github.com/Masterminds/squirrel" + "github.com/navidrome/navidrome/core/agents" + . "github.com/navidrome/navidrome/core/external" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/tests" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/stretchr/testify/mock" +) + +var _ = Describe("Provider - SimilarSongs", func() { + var ds model.DataStore + var provider Provider + var mockAgent *mockSimilarArtistAgent + var mockTopAgent agents.ArtistTopSongsRetriever + var mockSimilarAgent agents.ArtistSimilarRetriever + var agentsCombined *mockAgents + var artistRepo *mockArtistRepo + var mediaFileRepo *mockMediaFileRepo + var albumRepo *mockAlbumRepo + var ctx context.Context + + BeforeEach(func() { + ctx = GinkgoT().Context() + + artistRepo = newMockArtistRepo() + mediaFileRepo = newMockMediaFileRepo() + albumRepo = newMockAlbumRepo() + + ds = &tests.MockDataStore{ + MockedArtist: artistRepo, + MockedMediaFile: mediaFileRepo, + MockedAlbum: albumRepo, + } + + mockAgent = &mockSimilarArtistAgent{} + mockTopAgent = mockAgent + mockSimilarAgent = mockAgent + + agentsCombined = &mockAgents{ + topSongsAgent: mockTopAgent, + similarAgent: mockSimilarAgent, + } + + provider = NewProvider(ds, agentsCombined) + }) + + Describe("dispatch by entity type", func() { + Context("when ID is a MediaFile (track)", func() { + It("calls GetSimilarSongsByTrack and returns matched songs", func() { + track := model.MediaFile{ID: "track-1", Title: "Just Can't Get Enough", Artist: "Depeche Mode", MbzRecordingID: "track-mbid"} + matchedSong := model.MediaFile{ID: "matched-1", Title: "Dreaming of Me", Artist: "Depeche Mode"} + + // GetEntityByID tries Artist, Album, Playlist, then MediaFile + artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once() + + agentsCombined.On("GetSimilarSongsByTrack", mock.Anything, "track-1", "Just Can't Get Enough", "Depeche Mode", "track-mbid", 5). + Return([]agents.Song{ + {Name: "Dreaming of Me", MBID: "", Artist: "Depeche Mode", ArtistMBID: "artist-mbid"}, + }, nil).Once() + + // Mock loadTracksByID - no ID matches + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + _, ok := opt.Filters.(squirrel.Eq) + return ok + })).Return(model.MediaFiles{}, nil).Once() + + // Mock loadTracksByMBID - no MBID matches (empty MBID means this won't be called) + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + and, ok := opt.Filters.(squirrel.And) + if !ok || len(and) < 1 { + return false + } + eq, hasEq := and[0].(squirrel.Eq) + if !hasEq { + return false + } + _, hasMBID := eq["mbz_recording_id"] + return hasMBID + })).Return(model.MediaFiles{}, nil).Maybe() + + // Mock loadTracksByTitleAndArtist - queries by artist name + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + and, ok := opt.Filters.(squirrel.And) + if !ok || len(and) < 2 { + return false + } + eq, hasEq := and[0].(squirrel.Eq) + if !hasEq { + return false + } + _, hasArtist := eq["order_artist_name"] + return hasArtist + })).Return(model.MediaFiles{matchedSong}, nil).Maybe() + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("matched-1")) + }) + + It("falls back to artist-based algorithm when GetSimilarSongsByTrack returns empty", func() { + track := model.MediaFile{ID: "track-1", Title: "Track", Artist: "Artist", ArtistID: "artist-1"} + artist := model.Artist{ID: "artist-1", Name: "Artist"} + song := model.MediaFile{ID: "song-1", Title: "Song One", ArtistID: "artist-1", MbzRecordingID: "mbid-1"} + + // GetEntityByID for the initial call tries Artist, Album, Playlist, then MediaFile + artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once() + + agentsCombined.On("GetSimilarSongsByTrack", mock.Anything, "track-1", "Track", "Artist", "", mock.Anything). + Return([]agents.Song{}, nil).Once() + + // Fallback calls getArtist(id) which calls GetEntityByID again - this time it finds the mediafile + // and recursively calls getArtist(v.ArtistID) + artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once() + + // Then it recurses with the artist-1 ID + artistRepo.On("Get", "artist-1").Return(&artist, nil).Maybe() + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 1 && opt.Filters != nil + })).Return(model.Artists{artist}, nil).Maybe() + + mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist", "", 15). + Return([]agents.Artist{}, nil).Once() + + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 0 && opt.Filters != nil + })).Return(model.Artists{}, nil).Once() + + mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist", "", mock.Anything). + Return([]agents.Song{{Name: "Song One", MBID: "mbid-1"}}, nil).Once() + + mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song}, nil).Once() + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("song-1")) + }) + }) + + Context("when ID is an Album", func() { + It("calls GetSimilarSongsByAlbum and returns matched songs", func() { + album := model.Album{ID: "album-1", Name: "Speak & Spell", AlbumArtist: "Depeche Mode", MbzAlbumID: "album-mbid"} + matchedSong := model.MediaFile{ID: "matched-1", Title: "New Life", Artist: "Depeche Mode", MbzRecordingID: "song-mbid"} + + // GetEntityByID tries Artist, Album, Playlist, then MediaFile + artistRepo.On("Get", "album-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "album-1").Return(&album, nil).Once() + + agentsCombined.On("GetSimilarSongsByAlbum", mock.Anything, "album-1", "Speak & Spell", "Depeche Mode", "album-mbid", 5). + Return([]agents.Song{ + {Name: "New Life", MBID: "song-mbid", Artist: "Depeche Mode"}, + }, nil).Once() + + // Mock loadTracksByID - no ID matches + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + _, ok := opt.Filters.(squirrel.Eq) + return ok + })).Return(model.MediaFiles{}, nil).Once() + + // Mock loadTracksByMBID - MBID match + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + and, ok := opt.Filters.(squirrel.And) + if !ok || len(and) < 1 { + return false + } + _, hasEq := and[0].(squirrel.Eq) + return hasEq + })).Return(model.MediaFiles{matchedSong}, nil).Once() + + songs, err := provider.SimilarSongs(ctx, "album-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("matched-1")) + }) + + It("falls back when GetSimilarSongsByAlbum returns ErrNotFound", func() { + album := model.Album{ID: "album-1", Name: "Album", AlbumArtist: "Artist", AlbumArtistID: "artist-1"} + artist := model.Artist{ID: "artist-1", Name: "Artist"} + song := model.MediaFile{ID: "song-1", Title: "Song One", ArtistID: "artist-1", MbzRecordingID: "mbid-1"} + + // GetEntityByID for the initial call tries Artist, Album, Playlist, then MediaFile + artistRepo.On("Get", "album-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "album-1").Return(&album, nil).Once() + + agentsCombined.On("GetSimilarSongsByAlbum", mock.Anything, "album-1", "Album", "Artist", "", mock.Anything). + Return(nil, agents.ErrNotFound).Once() + + // Fallback calls getArtist(id) which calls GetEntityByID again - this time it finds the album + // and recursively calls getArtist(v.AlbumArtistID) + artistRepo.On("Get", "album-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "album-1").Return(&album, nil).Once() + + // Then it recurses with the artist-1 ID + artistRepo.On("Get", "artist-1").Return(&artist, nil).Maybe() + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 1 && opt.Filters != nil + })).Return(model.Artists{artist}, nil).Maybe() + + mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist", "", 15). + Return([]agents.Artist{}, nil).Once() + + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 0 && opt.Filters != nil + })).Return(model.Artists{}, nil).Once() + + mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist", "", mock.Anything). + Return([]agents.Song{{Name: "Song One", MBID: "mbid-1"}}, nil).Once() + + mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song}, nil).Once() + + songs, err := provider.SimilarSongs(ctx, "album-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("song-1")) + }) + }) + + Context("when ID is an Artist", func() { + It("calls GetSimilarSongsByArtist and returns matched songs", func() { + artist := model.Artist{ID: "artist-1", Name: "Depeche Mode", MbzArtistID: "artist-mbid"} + matchedSong := model.MediaFile{ID: "matched-1", Title: "Enjoy the Silence", Artist: "Depeche Mode", MbzRecordingID: "song-mbid"} + + artistRepo.On("Get", "artist-1").Return(&artist, nil).Once() + agentsCombined.On("GetSimilarSongsByArtist", mock.Anything, "artist-1", "Depeche Mode", "artist-mbid", 5). + Return([]agents.Song{ + {Name: "Enjoy the Silence", MBID: "song-mbid", Artist: "Depeche Mode"}, + }, nil).Once() + + // Mock loadTracksByID - no ID matches + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + _, ok := opt.Filters.(squirrel.Eq) + return ok + })).Return(model.MediaFiles{}, nil).Once() + + // Mock loadTracksByMBID - MBID match + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + and, ok := opt.Filters.(squirrel.And) + if !ok || len(and) < 1 { + return false + } + _, hasEq := and[0].(squirrel.Eq) + return hasEq + })).Return(model.MediaFiles{matchedSong}, nil).Once() + + songs, err := provider.SimilarSongs(ctx, "artist-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("matched-1")) + }) + }) + }) + + It("returns similar songs from main artist and similar artists", func() { + artist1 := model.Artist{ID: "artist-1", Name: "Artist One"} + similarArtist := model.Artist{ID: "artist-3", Name: "Similar Artist"} + song1 := model.MediaFile{ID: "song-1", Title: "Song One", ArtistID: "artist-1", MbzRecordingID: "mbid-1"} + song2 := model.MediaFile{ID: "song-2", Title: "Song Two", ArtistID: "artist-1", MbzRecordingID: "mbid-2"} + song3 := model.MediaFile{ID: "song-3", Title: "Song Three", ArtistID: "artist-3", MbzRecordingID: "mbid-3"} + + artistRepo.On("Get", "artist-1").Return(&artist1, nil).Maybe() + artistRepo.On("Get", "artist-3").Return(&similarArtist, nil).Maybe() + + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 1 && opt.Filters != nil + })).Return(model.Artists{artist1}, nil).Once() + + // New similar songs by artist returns ErrNotFound to trigger fallback + agentsCombined.On("GetSimilarSongsByArtist", mock.Anything, "artist-1", "Artist One", "", mock.Anything). + Return(nil, agents.ErrNotFound).Once() + + similarAgentsResp := []agents.Artist{ + {Name: "Similar Artist", MBID: "similar-mbid"}, + } + mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist One", "", 15). + Return(similarAgentsResp, nil).Once() + + // Mock the three-phase artist lookup: ID (skipped - no IDs), MBID, then Name + // MBID lookup returns empty (no match) + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + _, ok := opt.Filters.(squirrel.Eq) + return opt.Max == 0 && ok + })).Return(model.Artists{}, nil).Once() + // Name lookup returns the similar artist + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + _, ok := opt.Filters.(squirrel.Or) + return opt.Max == 0 && ok + })).Return(model.Artists{similarArtist}, nil).Once() + + mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist One", "", mock.Anything). + Return([]agents.Song{ + {Name: "Song One", MBID: "mbid-1"}, + {Name: "Song Two", MBID: "mbid-2"}, + }, nil).Once() + + mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-3", "Similar Artist", "", mock.Anything). + Return([]agents.Song{ + {Name: "Song Three", MBID: "mbid-3"}, + }, nil).Once() + + mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song1, song2}, nil).Once() + mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song3}, nil).Once() + + songs, err := provider.SimilarSongs(ctx, "artist-1", 3) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(3)) + for _, song := range songs { + Expect(song.ID).To(BeElementOf("song-1", "song-2", "song-3")) + } + }) + + It("returns ErrNotFound when artist is not found", func() { + artistRepo.On("Get", "artist-unknown-artist").Return(nil, model.ErrNotFound) + mediaFileRepo.On("Get", "artist-unknown-artist").Return(nil, model.ErrNotFound) + albumRepo.On("Get", "artist-unknown-artist").Return(nil, model.ErrNotFound) + + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 1 && opt.Filters != nil + })).Return(model.Artists{}, nil).Maybe() + + songs, err := provider.SimilarSongs(ctx, "artist-unknown-artist", 5) + + Expect(err).To(Equal(model.ErrNotFound)) + Expect(songs).To(BeNil()) + }) + + It("returns songs from main artist when GetSimilarArtists returns error", func() { + artist1 := model.Artist{ID: "artist-1", Name: "Artist One"} + song1 := model.MediaFile{ID: "song-1", Title: "Song One", ArtistID: "artist-1", MbzRecordingID: "mbid-1"} + + artistRepo.On("Get", "artist-1").Return(&artist1, nil).Maybe() + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 1 && opt.Filters != nil + })).Return(model.Artists{artist1}, nil).Maybe() + + // New similar songs by artist returns ErrNotFound to trigger fallback + agentsCombined.On("GetSimilarSongsByArtist", mock.Anything, "artist-1", "Artist One", "", mock.Anything). + Return(nil, agents.ErrNotFound).Once() + + mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist One", "", 15). + Return(nil, errors.New("error getting similar artists")).Once() + + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 0 && opt.Filters != nil + })).Return(model.Artists{}, nil).Once() + + mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist One", "", mock.Anything). + Return([]agents.Song{ + {Name: "Song One", MBID: "mbid-1"}, + }, nil).Once() + + mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song1}, nil).Once() + + songs, err := provider.SimilarSongs(ctx, "artist-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("song-1")) + }) + + It("returns empty list when GetArtistTopSongs returns error", func() { + artist1 := model.Artist{ID: "artist-1", Name: "Artist One"} + + artistRepo.On("Get", "artist-1").Return(&artist1, nil).Maybe() + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 1 && opt.Filters != nil + })).Return(model.Artists{artist1}, nil).Maybe() + + // New similar songs by artist returns ErrNotFound to trigger fallback + agentsCombined.On("GetSimilarSongsByArtist", mock.Anything, "artist-1", "Artist One", "", mock.Anything). + Return(nil, agents.ErrNotFound).Once() + + mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist One", "", 15). + Return([]agents.Artist{}, nil).Once() + + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 0 && opt.Filters != nil + })).Return(model.Artists{}, nil).Once() + + mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist One", "", mock.Anything). + Return(nil, errors.New("error getting top songs")).Once() + + songs, err := provider.SimilarSongs(ctx, "artist-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(BeEmpty()) + }) + + It("respects count parameter", func() { + artist1 := model.Artist{ID: "artist-1", Name: "Artist One"} + song1 := model.MediaFile{ID: "song-1", Title: "Song One", ArtistID: "artist-1", MbzRecordingID: "mbid-1"} + song2 := model.MediaFile{ID: "song-2", Title: "Song Two", ArtistID: "artist-1", MbzRecordingID: "mbid-2"} + + artistRepo.On("Get", "artist-1").Return(&artist1, nil).Maybe() + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 1 && opt.Filters != nil + })).Return(model.Artists{artist1}, nil).Maybe() + + // New similar songs by artist returns ErrNotFound to trigger fallback + agentsCombined.On("GetSimilarSongsByArtist", mock.Anything, "artist-1", "Artist One", "", mock.Anything). + Return(nil, agents.ErrNotFound).Once() + + mockAgent.On("GetSimilarArtists", mock.Anything, "artist-1", "Artist One", "", 15). + Return([]agents.Artist{}, nil).Once() + + artistRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + return opt.Max == 0 && opt.Filters != nil + })).Return(model.Artists{}, nil).Once() + + mockAgent.On("GetArtistTopSongs", mock.Anything, "artist-1", "Artist One", "", mock.Anything). + Return([]agents.Song{ + {Name: "Song One", MBID: "mbid-1"}, + {Name: "Song Two", MBID: "mbid-2"}, + }, nil).Once() + + mediaFileRepo.On("GetAll", mock.AnythingOfType("model.QueryOptions")).Return(model.MediaFiles{song1, song2}, nil).Once() + + songs, err := provider.SimilarSongs(ctx, "artist-1", 1) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(BeElementOf("song-1", "song-2")) + }) +}) diff --git a/core/external/provider_topsongs_test.go b/core/external/provider_topsongs_test.go index 114a35f63..0e513aa37 100644 --- a/core/external/provider_topsongs_test.go +++ b/core/external/provider_topsongs_test.go @@ -7,6 +7,8 @@ import ( _ "github.com/navidrome/navidrome/adapters/lastfm" _ "github.com/navidrome/navidrome/adapters/listenbrainz" _ "github.com/navidrome/navidrome/adapters/spotify" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/conf/configtest" "github.com/navidrome/navidrome/core/agents" . "github.com/navidrome/navidrome/core/external" "github.com/navidrome/navidrome/model" @@ -26,6 +28,10 @@ var _ = Describe("Provider - TopSongs", func() { ) BeforeEach(func() { + DeferCleanup(configtest.SetupConfig()) + // Disable fuzzy matching for these tests to avoid unexpected GetAll calls + conf.Server.SimilarSongsMatchThreshold = 100 + ctx = GinkgoT().Context() artistRepo = newMockArtistRepo() // Use helper mock diff --git a/resources/i18n/pt-br.json b/resources/i18n/pt-br.json index c9917c7be..2697de622 100644 --- a/resources/i18n/pt-br.json +++ b/resources/i18n/pt-br.json @@ -46,7 +46,8 @@ "download": "Baixar", "playNext": "Toca a seguir", "info": "Detalhes", - "showInPlaylist": "Ir para playlist" + "showInPlaylist": "Ir para playlist", + "instantMix": "Mix Instantâneo" } }, "album": { @@ -557,6 +558,7 @@ "transcodingEnabled": "Navidrome está sendo executado com a opção %{config}. Isto permite que potencialmente se execute comandos do sistema pela interface Web. É recomendado que vc mantenha esta opção desabilitada, e só a habilite quando precisar configurar opções de Conversão", "songsAddedToPlaylist": "Música adicionada à playlist |||| %{smart_count} músicas adicionadas à playlist", "noSimilarSongsFound": "Nenhuma música semelhante encontrada", + "startingInstantMix": "Carregando Mix Instantâneo...", "noTopSongsFound": "Nenhuma música mais tocada encontrada", "noPlaylistsAvailable": "Nenhuma playlist", "delete_user_title": "Excluir usuário '%{name}'", diff --git a/server/subsonic/browsing.go b/server/subsonic/browsing.go index 30779e420..63939f6f4 100644 --- a/server/subsonic/browsing.go +++ b/server/subsonic/browsing.go @@ -354,7 +354,7 @@ func (api *Router) GetSimilarSongs(r *http.Request) (*responses.Subsonic, error) } count := p.IntOr("count", 50) - songs, err := api.provider.ArtistRadio(ctx, id, count) + songs, err := api.provider.SimilarSongs(ctx, id, count) if err != nil { return nil, err } diff --git a/tests/fixtures/lastfm.track.getsimilar.json b/tests/fixtures/lastfm.track.getsimilar.json new file mode 100644 index 000000000..45041b289 --- /dev/null +++ b/tests/fixtures/lastfm.track.getsimilar.json @@ -0,0 +1 @@ +{"similartracks":{"track":[{"name":"Dreaming of Me","mbid":"027b553e-7c74-3ed4-a95e-1d4fea51f174","match":1.0,"url":"https://www.last.fm/music/Depeche+Mode/_/Dreaming+of+Me","artist":{"name":"Depeche Mode","mbid":"8538e728-ca0b-4321-b7e5-cff6565dd4c0","url":"https://www.last.fm/music/Depeche+Mode"}},{"name":"Everything Counts","mbid":"5a5a3ca4-bdb8-4641-a674-9b54b9b319a6","match":0.892602,"url":"https://www.last.fm/music/Depeche+Mode/_/Everything+Counts","artist":{"name":"Depeche Mode","mbid":"8538e728-ca0b-4321-b7e5-cff6565dd4c0","url":"https://www.last.fm/music/Depeche+Mode"}},{"name":"Don't You Want Me","mbid":"","match":0.491341,"url":"https://www.last.fm/music/The+Human+League/_/Don%27t+You+Want+Me","artist":{"name":"The Human League","mbid":"7adaabfb-acfb-47bc-8c7c-59471c2f0db8","url":"https://www.last.fm/music/The+Human+League"}},{"name":"Tainted Love","mbid":"","match":0.454811,"url":"https://www.last.fm/music/Soft+Cell/_/Tainted+Love","artist":{"name":"Soft Cell","mbid":"7fb50287-029d-47cc-825a-235ca28024b2","url":"https://www.last.fm/music/Soft+Cell"}},{"name":"Blue Monday","mbid":"727e84c6-1b56-31dd-a958-a5f46305cec0","match":0.381057,"url":"https://www.last.fm/music/New+Order/_/Blue+Monday","artist":{"name":"New Order","mbid":"f1106b17-dcbb-45f6-b938-199ccfab50cc","url":"https://www.last.fm/music/New+Order"}}],"@attr":{"artist":"Depeche Mode","track":"Just Can't Get Enough"}}} diff --git a/tests/fixtures/lastfm.track.getsimilar.unknown.json b/tests/fixtures/lastfm.track.getsimilar.unknown.json new file mode 100644 index 000000000..9b879fa05 --- /dev/null +++ b/tests/fixtures/lastfm.track.getsimilar.unknown.json @@ -0,0 +1 @@ +{"similartracks":{"track":[],"@attr":{"track":"UnknownTrack","artist":"UnknownArtist"}}} diff --git a/ui/src/artist/ArtistActions.jsx b/ui/src/artist/ArtistActions.jsx index 8eebe6499..0b48f232d 100644 --- a/ui/src/artist/ArtistActions.jsx +++ b/ui/src/artist/ArtistActions.jsx @@ -14,7 +14,8 @@ import { import ShuffleIcon from '@material-ui/icons/Shuffle' import PlayArrowIcon from '@material-ui/icons/PlayArrow' import { IoIosRadio } from 'react-icons/io' -import { playShuffle, playSimilar, playTopSongs } from './actions.js' +import { playShuffle, playTopSongs } from './actions.js' +import { playSimilar } from '../common/playbackActions.js' const useStyles = makeStyles((theme) => ({ toolbar: { diff --git a/ui/src/artist/actions.js b/ui/src/artist/actions.js index 6a8fbd9c6..94b3adf42 100644 --- a/ui/src/artist/actions.js +++ b/ui/src/artist/actions.js @@ -1,31 +1,6 @@ import subsonic from '../subsonic/index.js' import { playTracks } from '../actions/index.js' - -const mapReplayGain = (song) => { - const { replayGain: rg } = song - if (!rg) { - return song - } - - return { - ...song, - ...(rg.albumGain !== undefined && { rgAlbumGain: rg.albumGain }), - ...(rg.albumPeak !== undefined && { rgAlbumPeak: rg.albumPeak }), - ...(rg.trackGain !== undefined && { rgTrackGain: rg.trackGain }), - ...(rg.trackPeak !== undefined && { rgTrackPeak: rg.trackPeak }), - } -} - -const processSongsForPlayback = (songs) => { - const songData = {} - const ids = [] - songs.forEach((s) => { - const song = mapReplayGain(s) - songData[song.id] = song - ids.push(song.id) - }) - return { songData, ids } -} +import { processSongsForPlayback } from '../common/playbackActions.js' export const playTopSongs = async (dispatch, notify, artistName) => { const res = await subsonic.getTopSongs(artistName, 100) @@ -47,26 +22,6 @@ export const playTopSongs = async (dispatch, notify, artistName) => { dispatch(playTracks(songData, ids)) } -export const playSimilar = async (dispatch, notify, id) => { - const res = await subsonic.getSimilarSongs2(id, 100) - const data = res.json['subsonic-response'] - - if (data.status !== 'ok') { - throw new Error( - `Error fetching similar songs: ${data.error?.message || 'Unknown error'} (Code: ${data.error?.code || 'unknown'})`, - ) - } - - const songs = data.similarSongs2?.song || [] - if (!songs.length) { - notify('message.noSimilarSongsFound', 'warning') - return - } - - const { songData, ids } = processSongsForPlayback(songs) - dispatch(playTracks(songData, ids)) -} - export const playShuffle = async (dataProvider, dispatch, id) => { const res = await dataProvider.getList('song', { pagination: { page: 1, perPage: 500 }, diff --git a/ui/src/common/SongContextMenu.jsx b/ui/src/common/SongContextMenu.jsx index f8b0bba5e..ce6604f63 100644 --- a/ui/src/common/SongContextMenu.jsx +++ b/ui/src/common/SongContextMenu.jsx @@ -24,6 +24,7 @@ import { } from '../actions' import { LoveButton } from './LoveButton' import config from '../config' +import { playSimilar } from './playbackActions.js' import { formatBytes } from '../utils' import { useRedirect } from 'react-admin' @@ -86,6 +87,24 @@ export const SongContextMenu = ({ label: translate('resources.song.actions.addToQueue'), action: (record) => dispatch(addTracks({ [record.id]: record })), }, + instantMix: { + enabled: config.enableExternalServices, + label: translate('resources.song.actions.instantMix'), + action: async (record) => { + notify('message.startingInstantMix', { type: 'info' }) + try { + const id = record.mediaFileId || record.id + await playSimilar(dispatch, notify, id, { + seedRecord: record, + shuffle: true, + }) + } catch (e) { + // eslint-disable-next-line no-console + console.error('Error starting instant mix:', e) + notify('ra.page.error', { type: 'warning' }) + } + }, + }, addToPlaylist: { enabled: true, label: translate('resources.song.actions.addToPlaylist'), diff --git a/ui/src/common/SongContextMenu.test.jsx b/ui/src/common/SongContextMenu.test.jsx index a30da859f..7172742d3 100644 --- a/ui/src/common/SongContextMenu.test.jsx +++ b/ui/src/common/SongContextMenu.test.jsx @@ -3,19 +3,36 @@ import { render, fireEvent, screen, waitFor } from '@testing-library/react' import { TestContext } from 'ra-test' import { describe, it, expect, vi, beforeEach } from 'vitest' import { SongContextMenu } from './SongContextMenu' +import subsonic from '../subsonic' vi.mock('../dataProvider', () => ({ httpClient: vi.fn(), })) -vi.mock('react-redux', () => ({ useDispatch: () => vi.fn() })) +vi.mock('../subsonic', () => ({ + default: { getSimilarSongs2: vi.fn() }, +})) + +vi.mock('../config', () => ({ + default: { + enableDownloads: true, + enableFavourites: true, + enableSharing: true, + enableExternalServices: true, + }, +})) + +const mockDispatch = vi.fn() +vi.mock('react-redux', () => ({ useDispatch: () => mockDispatch })) const getPlaylistsMock = vi.fn() +const mockNotify = vi.fn() vi.mock('react-admin', async (importOriginal) => { const actual = await importOriginal() return { ...actual, + useNotify: () => mockNotify, useRedirect: () => (url) => { window.location.hash = `#${url}` }, @@ -35,6 +52,14 @@ describe('SongContextMenu', () => { getPlaylistsMock.mockResolvedValue({ data: [{ id: 'pl1', name: 'Pl 1' }], }) + subsonic.getSimilarSongs2.mockResolvedValue({ + json: { + 'subsonic-response': { + status: 'ok', + similarSongs2: { song: [{ id: 's1' }] }, + }, + }, + }) }) it('navigates to playlist when selected', async () => { @@ -104,4 +129,99 @@ describe('SongContextMenu', () => { ) expect(mockOnClick).not.toHaveBeenCalled() }) + + describe('Instant Mix action', () => { + it('calls getSimilarSongs2 with song id and shows loading notification', async () => { + render( + + + , + ) + + fireEvent.click(screen.getAllByRole('button')[1]) + await waitFor(() => + screen.getByText(/resources\.song\.actions\.instantMix/), + ) + fireEvent.click(screen.getByText(/resources\.song\.actions\.instantMix/)) + + // Verify loading notification is shown + expect(mockNotify).toHaveBeenCalledWith('message.startingInstantMix', { + type: 'info', + }) + + await waitFor(() => + expect(subsonic.getSimilarSongs2).toHaveBeenCalledWith('song1', 100), + ) + expect(mockDispatch).toHaveBeenCalled() + }) + + it('plays seed song first followed by similar songs', async () => { + const seedRecord = { id: 'song1', title: 'Seed Song', size: 1 } + render( + + + , + ) + + fireEvent.click(screen.getAllByRole('button')[1]) + await waitFor(() => + screen.getByText(/resources\.song\.actions\.instantMix/), + ) + fireEvent.click(screen.getByText(/resources\.song\.actions\.instantMix/)) + + await waitFor(() => expect(mockDispatch).toHaveBeenCalled()) + + // Verify dispatch was called with playTracks action + const dispatchCall = mockDispatch.mock.calls.find( + (call) => call[0]?.type === 'PLAYER_PLAY_TRACKS', + ) + expect(dispatchCall).toBeDefined() + + // Verify seed song is first (id property contains the first song to play) + const { id, data } = dispatchCall[0] + expect(id).toBe('song1') + // Verify seed song data is included + expect(data['song1']).toBeDefined() + }) + + it('uses mediaFileId when available (playlist context)', async () => { + render( + + + , + ) + + fireEvent.click(screen.getAllByRole('button')[1]) + await waitFor(() => + screen.getByText(/resources\.song\.actions\.instantMix/), + ) + fireEvent.click(screen.getByText(/resources\.song\.actions\.instantMix/)) + + await waitFor(() => + expect(subsonic.getSimilarSongs2).toHaveBeenCalledWith( + 'actualSongId', + 100, + ), + ) + + await waitFor(() => expect(mockDispatch).toHaveBeenCalled()) + + // Verify the mediaFileId is used as the seed song id + const dispatchCall = mockDispatch.mock.calls.find( + (call) => call[0]?.type === 'PLAYER_PLAY_TRACKS', + ) + expect(dispatchCall).toBeDefined() + const { id, data } = dispatchCall[0] + expect(id).toBe('actualSongId') + // Verify seed song data is included + expect(data['actualSongId']).toBeDefined() + }) + }) }) diff --git a/ui/src/common/playbackActions.js b/ui/src/common/playbackActions.js new file mode 100644 index 000000000..414dbe413 --- /dev/null +++ b/ui/src/common/playbackActions.js @@ -0,0 +1,76 @@ +import subsonic from '../subsonic/index.js' +import { playTracks } from '../actions/index.js' + +const shuffleArray = (array) => { + const shuffled = [...array] + for (let i = shuffled.length - 1; i > 0; i--) { + const j = Math.floor(Math.random() * (i + 1)) + ;[shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]] + } + return shuffled +} + +const mapReplayGain = (song) => { + const { replayGain: rg } = song + if (!rg) { + return song + } + + return { + ...song, + ...(rg.albumGain !== undefined && { rgAlbumGain: rg.albumGain }), + ...(rg.albumPeak !== undefined && { rgAlbumPeak: rg.albumPeak }), + ...(rg.trackGain !== undefined && { rgTrackGain: rg.trackGain }), + ...(rg.trackPeak !== undefined && { rgTrackPeak: rg.trackPeak }), + } +} + +export const processSongsForPlayback = (songs) => { + const songData = {} + const ids = [] + songs.forEach((s) => { + const song = mapReplayGain(s) + songData[song.id] = song + ids.push(song.id) + }) + return { songData, ids } +} + +export const playSimilar = async (dispatch, notify, id, options = {}) => { + const { seedRecord = null, shuffle = false } = options + + const res = await subsonic.getSimilarSongs2(id, 100) + const data = res.json['subsonic-response'] + + if (data.status !== 'ok') { + throw new Error( + `Error fetching similar songs: ${data.error?.message || 'Unknown error'} (Code: ${data.error?.code || 'unknown'})`, + ) + } + + let songs = data.similarSongs2?.song || [] + + // Randomize similar songs if requested + if (shuffle) { + songs = shuffleArray(songs) + } + + // If no similar songs found and no seed, show warning + if (!songs.length && !seedRecord) { + notify('message.noSimilarSongsFound', 'warning') + return + } + + const { songData, ids } = processSongsForPlayback(songs) + + // Prepend seed song if provided + if (seedRecord) { + const seedId = seedRecord.mediaFileId || seedRecord.id + // Remove seed from similar songs if it appears there + const filteredIds = ids.filter((songId) => songId !== seedId) + songData[seedId] = mapReplayGain(seedRecord) + dispatch(playTracks(songData, [seedId, ...filteredIds])) + } else { + dispatch(playTracks(songData, ids)) + } +} diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json index 11cbbc92f..a18c79974 100644 --- a/ui/src/i18n/en.json +++ b/ui/src/i18n/en.json @@ -47,7 +47,8 @@ "shuffleAll": "Shuffle All", "download": "Download", "playNext": "Play Next", - "info": "Get Info" + "info": "Get Info", + "instantMix": "Instant Mix" } }, "album": { @@ -558,6 +559,7 @@ "transcodingEnabled": "Navidrome is currently running with %{config}, making it possible to run system commands from the transcoding settings using the web interface. We recommend to disable it for security reasons and only enable it when configuring Transcoding options.", "songsAddedToPlaylist": "Added 1 song to playlist |||| Added %{smart_count} songs to playlist", "noSimilarSongsFound": "No similar songs found", + "startingInstantMix": "Loading Instant Mix...", "noTopSongsFound": "No top songs found", "noPlaylistsAvailable": "None available", "delete_user_title": "Delete user '%{name}'", From 4d4740b83b117ba109be091c2d13eb8aec220166 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sun, 25 Jan 2026 17:59:12 -0500 Subject: [PATCH 03/82] fix(subsonic): fix support for LegacyClients Signed-off-by: Deluan --- server/subsonic/helpers.go | 2 +- server/subsonic/helpers_test.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/subsonic/helpers.go b/server/subsonic/helpers.go index dfeb4c6dd..5bc709ecb 100644 --- a/server/subsonic/helpers.go +++ b/server/subsonic/helpers.go @@ -240,7 +240,7 @@ func childFromMediaFile(ctx context.Context, mf model.MediaFile) responses.Child func osChildFromMediaFile(ctx context.Context, mf model.MediaFile) *responses.OpenSubsonicChild { player, ok := request.PlayerFrom(ctx) - if ok && isClientInList(conf.Server.Subsonic.MinimalClients, player.Client) { + if ok && isClientInList(conf.Server.Subsonic.LegacyClients, player.Client) { return nil } child := responses.OpenSubsonicChild{} diff --git a/server/subsonic/helpers_test.go b/server/subsonic/helpers_test.go index 6a122a3c7..2099c8f69 100644 --- a/server/subsonic/helpers_test.go +++ b/server/subsonic/helpers_test.go @@ -308,10 +308,10 @@ var _ = Describe("helpers", func() { ctx = context.Background() }) - Context("with minimal client", func() { + Context("with legacy client", func() { BeforeEach(func() { - conf.Server.Subsonic.MinimalClients = "minimal-client" - player := model.Player{Client: "minimal-client"} + conf.Server.Subsonic.LegacyClients = "legacy-client" + player := model.Player{Client: "legacy-client"} ctx = request.WithPlayer(ctx, player) }) @@ -321,9 +321,9 @@ var _ = Describe("helpers", func() { }) }) - Context("with non-minimal client", func() { + Context("with non-legacy client", func() { BeforeEach(func() { - conf.Server.Subsonic.MinimalClients = "minimal-client" + conf.Server.Subsonic.LegacyClients = "legacy-client" player := model.Player{Client: "regular-client"} ctx = request.WithPlayer(ctx, player) }) @@ -335,9 +335,9 @@ var _ = Describe("helpers", func() { }) }) - Context("when minimal clients list is empty", func() { + Context("when legacy clients list is empty", func() { BeforeEach(func() { - conf.Server.Subsonic.MinimalClients = "" + conf.Server.Subsonic.LegacyClients = "" player := model.Player{Client: "any-client"} ctx = request.WithPlayer(ctx, player) }) From fda35dd8ce3a6113970e2fc5f6cc3f4dd179b3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Mon, 26 Jan 2026 18:28:41 -0500 Subject: [PATCH 04/82] feat(plugins): add similar songs retrieval functions and improve duration consistency (#4933) * feat: add duration filtering for similar songs matching Signed-off-by: Deluan * test: refactor expectations for similar songs in provider matching tests Signed-off-by: Deluan * feat(plugins): add functions to retrieve similar songs by track, album, and artist Signed-off-by: Deluan * fix(plugins): support uint32 in ndpgen Signed-off-by: Deluan * fix(plugins): update duration field to use seconds as float instead of milliseconds as uint32 Signed-off-by: Deluan * fix: add helper functions for Rust's skip_serializing_if with numeric types Signed-off-by: Deluan * feat(provider): enhance track matching logic to fallback to title match when duration-filtered tracks fail --------- Signed-off-by: Deluan --- adapters/deezer/deezer.go | 5 +- core/agents/interfaces.go | 1 + core/external/provider_matching.go | 46 ++++ core/external/provider_matching_test.go | 223 +++++++++++++++--- plugins/capabilities/metadata_agent.go | 70 +++++- plugins/capabilities/metadata_agent.yaml | 120 +++++++++- plugins/cmd/ndpgen/internal/generator.go | 12 + plugins/cmd/ndpgen/internal/generator_test.go | 31 +++ .../internal/templates/capability.rs.tmpl | 14 ++ plugins/cmd/ndpgen/internal/types.go | 8 +- plugins/cmd/ndpgen/internal/xtp_schema.go | 8 +- plugins/metadata_agent.go | 94 ++++++-- plugins/metadata_agent_test.go | 69 ++++++ plugins/pdk/go/metadata/metadata.go | 182 +++++++++++++- plugins/pdk/go/metadata/metadata_stub.go | 73 +++++- .../rust/nd-pdk-capabilities/src/metadata.rs | 159 ++++++++++++- .../rust/nd-pdk-capabilities/src/scheduler.rs | 14 ++ .../rust/nd-pdk-capabilities/src/scrobbler.rs | 14 ++ .../rust/nd-pdk-capabilities/src/websocket.rs | 14 ++ plugins/testdata/test-metadata-agent/main.go | 60 +++++ 20 files changed, 1147 insertions(+), 70 deletions(-) diff --git a/adapters/deezer/deezer.go b/adapters/deezer/deezer.go index 7272bf9ae..a6806595e 100644 --- a/adapters/deezer/deezer.go +++ b/adapters/deezer/deezer.go @@ -135,8 +135,9 @@ func (s *deezerAgent) GetArtistTopSongs(ctx context.Context, _, artistName, _ st res := slice.Map(tracks, func(r Track) agents.Song { return agents.Song{ - Name: r.Title, - Album: r.Album.Title, + Name: r.Title, + Album: r.Album.Title, + Duration: uint32(r.Duration * 1000), // Convert seconds to milliseconds } }) return res, nil diff --git a/core/agents/interfaces.go b/core/agents/interfaces.go index d0805818e..94373ec1a 100644 --- a/core/agents/interfaces.go +++ b/core/agents/interfaces.go @@ -40,6 +40,7 @@ type Song struct { ArtistMBID string Album string AlbumMBID string + Duration uint32 // Duration in milliseconds, 0 means unknown } var ( diff --git a/core/external/provider_matching.go b/core/external/provider_matching.go index 6bf393f77..0bbe4fa35 100644 --- a/core/external/provider_matching.go +++ b/core/external/provider_matching.go @@ -3,6 +3,7 @@ package external import ( "context" "fmt" + "math" "github.com/Masterminds/squirrel" "github.com/navidrome/navidrome/conf" @@ -12,6 +13,11 @@ import ( "github.com/xrash/smetrics" ) +// durationToleranceSec is the maximum allowed difference in seconds when +// matching tracks by duration. A tolerance of 3 seconds accounts for minor +// encoding differences between sources. +const durationToleranceSec = 3 + // matchSongsToLibrary matches agent song results to local library tracks using a multi-phase // matching algorithm that prioritizes accuracy over recall. // @@ -175,6 +181,7 @@ type songQuery struct { artistMBID string // MusicBrainz Artist ID (optional, for higher specificity matching) album string // Sanitized album name (optional, for specificity scoring) albumMBID string // MusicBrainz Album ID (optional, for highest specificity matching) + durationMs uint32 // Duration in milliseconds (0 means unknown, skip duration filtering) } // matchScore combines title/album similarity with metadata specificity for ranking matches @@ -282,12 +289,50 @@ func (e *provider) loadTracksByTitleAndArtist(ctx context.Context, songs []agent return matches, nil } +// durationMatches checks if a track's duration is within tolerance of the target duration. +// Returns true if durationMs is 0 (unknown) or if the difference is within durationToleranceSec. +func durationMatches(durationMs uint32, mediaFileDurationSec float32) bool { + if durationMs <= 0 { + return true // Unknown duration matches anything + } + durationSec := float64(durationMs) / 1000.0 + diff := math.Abs(durationSec - float64(mediaFileDurationSec)) + return diff <= durationToleranceSec +} + // findBestMatch finds the best matching track using combined title/album similarity and specificity scoring. +// When duration is known (durationMs > 0), it acts as a top-priority filter: +// - First, only tracks with matching duration (±3 seconds) are considered +// - If no title match is found among duration-filtered tracks, falls back to matching all tracks // A track must meet the threshold for title similarity, then the best match is chosen by: // 1. Highest title similarity // 2. Highest specificity level // 3. Highest album similarity (as final tiebreaker) func (e *provider) findBestMatch(q songQuery, tracks model.MediaFiles, threshold float64) (model.MediaFile, bool) { + // If duration is known, try to find matches among duration-filtered tracks first + if q.durationMs > 0 { + var durationFiltered model.MediaFiles + for _, mf := range tracks { + if durationMatches(q.durationMs, mf.Duration) { + durationFiltered = append(durationFiltered, mf) + } + } + // If we have duration-filtered candidates, try matching those first + if len(durationFiltered) > 0 { + if mf, found := findBestMatchInTracks(q, durationFiltered, threshold); found { + return mf, true + } + } + // Fall through to try all tracks if no duration-filtered match found + } + + return findBestMatchInTracks(q, tracks, threshold) +} + +// findBestMatchInTracks performs the core matching logic on a set of tracks. +// It finds the track with the best combined score based on title similarity, +// specificity level, and album similarity. +func findBestMatchInTracks(q songQuery, tracks model.MediaFiles, threshold float64) (model.MediaFile, bool) { var bestMatch model.MediaFile bestScore := matchScore{titleSimilarity: -1} found := false @@ -338,6 +383,7 @@ func (e *provider) buildTitleQueries(songs []agents.Song, idMatches, mbidMatches artistMBID: s.ArtistMBID, album: str.SanitizeFieldForSorting(s.Album), albumMBID: s.AlbumMBID, + durationMs: s.Duration, }) } return queries diff --git a/core/external/provider_matching_test.go b/core/external/provider_matching_test.go index cb6b33e65..245209b21 100644 --- a/core/external/provider_matching_test.go +++ b/core/external/provider_matching_test.go @@ -41,6 +41,26 @@ var _ = Describe("Provider - Song Matching", func() { provider = NewProvider(ds, agentsCombined) }) + // Shared helper for tests that only need artist track queries (no ID/MBID matching) + setupSimilarSongsExpectations := func(returnedSongs []agents.Song, artistTracks model.MediaFiles) { + agentsCombined.On("GetSimilarSongsByTrack", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything). + Return(returnedSongs, nil).Once() + + // loadTracksByTitleAndArtist - queries by artist name + mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { + and, ok := opt.Filters.(squirrel.And) + if !ok || len(and) < 2 { + return false + } + eq, hasEq := and[0].(squirrel.Eq) + if !hasEq { + return false + } + _, hasArtist := eq["order_artist_name"] + return hasArtist + })).Return(artistTracks, nil).Maybe() + } + Describe("matchSongsToLibrary priority matching", func() { var track model.MediaFile @@ -261,26 +281,6 @@ var _ = Describe("Provider - Song Matching", func() { mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once() }) - setupFuzzyExpectations := func(returnedSongs []agents.Song, artistTracks model.MediaFiles) { - agentsCombined.On("GetSimilarSongsByTrack", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything). - Return(returnedSongs, nil).Once() - - // loadTracksByTitleAndArtist now queries by artist in a single pass - // Note: loadTracksByID and loadTracksByMBID return early when no IDs/MBIDs - mediaFileRepo.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool { - and, ok := opt.Filters.(squirrel.And) - if !ok || len(and) < 2 { - return false - } - eq, hasEq := and[0].(squirrel.Eq) - if !hasEq { - return false - } - _, hasArtist := eq["order_artist_name"] - return hasArtist - })).Return(artistTracks, nil).Maybe() - } - Context("with default threshold (85%)", func() { It("matches songs with remastered suffix", func() { conf.Server.SimilarSongsMatchThreshold = 85 @@ -294,7 +294,7 @@ var _ = Describe("Provider - Song Matching", func() { {ID: "remastered", Title: "Paranoid Android - Remastered", Artist: "Radiohead"}, } - setupFuzzyExpectations(returnedSongs, artistTracks) + setupSimilarSongsExpectations(returnedSongs, artistTracks) songs, err := provider.SimilarSongs(ctx, "track-1", 5) @@ -313,7 +313,7 @@ var _ = Describe("Provider - Song Matching", func() { {ID: "live", Title: "Bohemian Rhapsody (Live)", Artist: "Queen"}, } - setupFuzzyExpectations(returnedSongs, artistTracks) + setupSimilarSongsExpectations(returnedSongs, artistTracks) songs, err := provider.SimilarSongs(ctx, "track-1", 5) @@ -334,7 +334,7 @@ var _ = Describe("Provider - Song Matching", func() { {ID: "different2", Title: "Here Comes The Sun", Artist: "The Beatles"}, } - setupFuzzyExpectations(returnedSongs, artistTracks) + setupSimilarSongsExpectations(returnedSongs, artistTracks) songs, err := provider.SimilarSongs(ctx, "track-1", 5) @@ -355,7 +355,7 @@ var _ = Describe("Provider - Song Matching", func() { {ID: "remastered", Title: "Paranoid Android - Remastered", Artist: "Radiohead"}, } - setupFuzzyExpectations(returnedSongs, artistTracks) + setupSimilarSongsExpectations(returnedSongs, artistTracks) songs, err := provider.SimilarSongs(ctx, "track-1", 5) @@ -375,7 +375,7 @@ var _ = Describe("Provider - Song Matching", func() { {ID: "extended", Title: "Song (Extended Mix)", Artist: "Artist"}, } - setupFuzzyExpectations(returnedSongs, artistTracks) + setupSimilarSongsExpectations(returnedSongs, artistTracks) songs, err := provider.SimilarSongs(ctx, "track-1", 5) @@ -401,7 +401,7 @@ var _ = Describe("Provider - Song Matching", func() { ID: "wrong", Title: "Bohemian Rhapsody", Artist: "Queen", Album: "Greatest Hits", } - setupFuzzyExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch}) + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch}) songs, err := provider.SimilarSongs(ctx, "track-1", 5) @@ -424,7 +424,7 @@ var _ = Describe("Provider - Song Matching", func() { ID: "wrong", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "101", } - setupFuzzyExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch}) + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{wrongMatch, correctMatch}) songs, err := provider.SimilarSongs(ctx, "track-1", 5) @@ -446,7 +446,7 @@ var _ = Describe("Provider - Song Matching", func() { ID: "fuzzy", Title: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator (Deluxe Edition)", } - setupFuzzyExpectations(returnedSongs, model.MediaFiles{fuzzyMatch, exactMatch}) + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{fuzzyMatch, exactMatch}) songs, err := provider.SimilarSongs(ctx, "track-1", 5) @@ -457,4 +457,171 @@ var _ = Describe("Provider - Song Matching", func() { }) }) }) + + Describe("Duration filtering", func() { + var track model.MediaFile + + BeforeEach(func() { + DeferCleanup(configtest.SetupConfig()) + conf.Server.SimilarSongsMatchThreshold = 100 // Exact title match for predictable tests + + track = model.MediaFile{ID: "track-1", Title: "Test Track", Artist: "Test Artist"} + + // Setup for GetEntityByID to return the track + artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once() + }) + + Context("when agent provides duration", func() { + It("prefers tracks with matching duration", func() { + // Agent returns song with duration 180000ms (180 seconds) + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, + } + // Library has two versions: one matching duration, one not + correctMatch := model.MediaFile{ + ID: "correct", Title: "Similar Song", Artist: "Test Artist", Duration: 180.0, + } + wrongDuration := model.MediaFile{ + ID: "wrong", Title: "Similar Song", Artist: "Test Artist", Duration: 240.0, + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{wrongDuration, correctMatch}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("correct")) + }) + + It("matches within 3-second tolerance", func() { + // Agent returns song with duration 180000ms (180 seconds) + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, + } + // Library has track with 182 seconds (within tolerance) + withinTolerance := model.MediaFile{ + ID: "within-tolerance", Title: "Similar Song", Artist: "Test Artist", Duration: 182.5, + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{withinTolerance}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("within-tolerance")) + }) + + It("excludes tracks outside 3-second tolerance when other matches exist", func() { + // Agent returns song with duration 180000ms (180 seconds) + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, + } + // Library has one within tolerance, one outside + withinTolerance := model.MediaFile{ + ID: "within", Title: "Similar Song", Artist: "Test Artist", Duration: 181.0, + } + outsideTolerance := model.MediaFile{ + ID: "outside", Title: "Similar Song", Artist: "Test Artist", Duration: 190.0, + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{outsideTolerance, withinTolerance}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("within")) + }) + + It("falls back to normal matching when no duration matches", func() { + // Agent returns song with duration 180000ms + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, + } + // Library only has tracks with very different duration + differentDuration := model.MediaFile{ + ID: "different", Title: "Similar Song", Artist: "Test Artist", Duration: 300.0, + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{differentDuration}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + // Should fall back and return the track despite duration mismatch + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("different")) + }) + + It("falls back to title match when duration-filtered tracks fail title threshold", func() { + // Agent returns "Similar Song" with duration 180000ms + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, + } + // Library has: + // - differentTitle: matches duration but has different title (won't pass title threshold) + // - correctTitle: doesn't match duration but has correct title (should be found via fallback) + differentTitle := model.MediaFile{ + ID: "wrong-title", Title: "Different Song", Artist: "Test Artist", Duration: 180.0, + } + correctTitle := model.MediaFile{ + ID: "correct-title", Title: "Similar Song", Artist: "Test Artist", Duration: 300.0, + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{differentTitle, correctTitle}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + // Should fall back to all tracks and find the title match + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("correct-title")) + }) + }) + + Context("when agent does not provide duration", func() { + It("matches without duration filtering (duration=0)", func() { + // Agent returns song without duration + returnedSongs := []agents.Song{ + {Name: "Similar Song", Artist: "Test Artist", Duration: 0}, + } + // Library tracks with various durations should all be candidates + anyTrack := model.MediaFile{ + ID: "any", Title: "Similar Song", Artist: "Test Artist", Duration: 999.0, + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{anyTrack}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("any")) + }) + }) + + Context("edge cases", func() { + It("handles very short songs with duration tolerance", func() { + // 30-second song with 1-second difference (within 3-second tolerance) + returnedSongs := []agents.Song{ + {Name: "Short Song", Artist: "Test Artist", Duration: 30000}, + } + shortTrack := model.MediaFile{ + ID: "short", Title: "Short Song", Artist: "Test Artist", Duration: 31.0, + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{shortTrack}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("short")) + }) + }) + }) }) diff --git a/plugins/capabilities/metadata_agent.go b/plugins/capabilities/metadata_agent.go index fbe89a2be..7070637ff 100644 --- a/plugins/capabilities/metadata_agent.go +++ b/plugins/capabilities/metadata_agent.go @@ -40,6 +40,18 @@ type MetadataAgent interface { // GetAlbumImages retrieves images for an album. //nd:export name=nd_get_album_images GetAlbumImages(AlbumRequest) (*AlbumImagesResponse, error) + + // GetSimilarSongsByTrack retrieves songs similar to a specific track. + //nd:export name=nd_get_similar_songs_by_track + GetSimilarSongsByTrack(SimilarSongsByTrackRequest) (*SimilarSongsResponse, error) + + // GetSimilarSongsByAlbum retrieves songs similar to tracks on an album. + //nd:export name=nd_get_similar_songs_by_album + GetSimilarSongsByAlbum(SimilarSongsByAlbumRequest) (*SimilarSongsResponse, error) + + // GetSimilarSongsByArtist retrieves songs similar to an artist's catalog. + //nd:export name=nd_get_similar_songs_by_artist + GetSimilarSongsByArtist(SimilarSongsByArtistRequest) (*SimilarSongsResponse, error) } // ArtistMBIDRequest is the request for GetArtistMBID. @@ -122,7 +134,7 @@ type TopSongsRequest struct { Count int32 `json:"count"` } -// SongRef is a reference to a song with name and optional MBID. +// SongRef is a reference to a song with metadata for matching. type SongRef struct { // ID is the internal Navidrome mediafile ID (if known). ID string `json:"id,omitempty"` @@ -130,6 +142,16 @@ type SongRef struct { Name string `json:"name"` // MBID is the MusicBrainz ID for the song. MBID string `json:"mbid,omitempty"` + // Artist is the artist name. + Artist string `json:"artist,omitempty"` + // ArtistMBID is the MusicBrainz artist ID. + ArtistMBID string `json:"artistMbid,omitempty"` + // Album is the album name. + Album string `json:"album,omitempty"` + // AlbumMBID is the MusicBrainz release ID. + AlbumMBID string `json:"albumMbid,omitempty"` + // Duration is the song duration in seconds. + Duration float32 `json:"duration,omitempty"` } // TopSongsResponse is the response for GetArtistTopSongs. @@ -165,3 +187,49 @@ type AlbumImagesResponse struct { // Images is the list of album images. Images []ImageInfo `json:"images"` } + +// SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack. +type SimilarSongsByTrackRequest struct { + // ID is the internal Navidrome mediafile ID. + ID string `json:"id"` + // Name is the track title. + Name string `json:"name"` + // Artist is the artist name. + Artist string `json:"artist"` + // MBID is the MusicBrainz recording ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum. +type SimilarSongsByAlbumRequest struct { + // ID is the internal Navidrome album ID. + ID string `json:"id"` + // Name is the album name. + Name string `json:"name"` + // Artist is the album artist name. + Artist string `json:"artist"` + // MBID is the MusicBrainz release ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist. +type SimilarSongsByArtistRequest struct { + // ID is the internal Navidrome artist ID. + ID string `json:"id"` + // Name is the artist name. + Name string `json:"name"` + // MBID is the MusicBrainz artist ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsResponse is the response for GetSimilarSongsBy* functions. +type SimilarSongsResponse struct { + // Songs is the list of similar songs. + Songs []SongRef `json:"songs"` +} diff --git a/plugins/capabilities/metadata_agent.yaml b/plugins/capabilities/metadata_agent.yaml index ebc4a2ba0..07ae939e4 100644 --- a/plugins/capabilities/metadata_agent.yaml +++ b/plugins/capabilities/metadata_agent.yaml @@ -64,6 +64,30 @@ exports: output: $ref: '#/components/schemas/AlbumImagesResponse' contentType: application/json + nd_get_similar_songs_by_track: + description: GetSimilarSongsByTrack retrieves songs similar to a specific track. + input: + $ref: '#/components/schemas/SimilarSongsByTrackRequest' + contentType: application/json + output: + $ref: '#/components/schemas/SimilarSongsResponse' + contentType: application/json + nd_get_similar_songs_by_album: + description: GetSimilarSongsByAlbum retrieves songs similar to tracks on an album. + input: + $ref: '#/components/schemas/SimilarSongsByAlbumRequest' + contentType: application/json + output: + $ref: '#/components/schemas/SimilarSongsResponse' + contentType: application/json + nd_get_similar_songs_by_artist: + description: GetSimilarSongsByArtist retrieves songs similar to an artist's catalog. + input: + $ref: '#/components/schemas/SimilarSongsByArtistRequest' + contentType: application/json + output: + $ref: '#/components/schemas/SimilarSongsResponse' + contentType: application/json components: schemas: AlbumImagesResponse: @@ -229,8 +253,86 @@ components: $ref: '#/components/schemas/ArtistRef' required: - artists + SimilarSongsByAlbumRequest: + description: SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum. + properties: + id: + type: string + description: ID is the internal Navidrome album ID. + name: + type: string + description: Name is the album name. + artist: + type: string + description: Artist is the album artist name. + mbid: + type: string + description: MBID is the MusicBrainz release ID (if known). + count: + type: integer + format: int32 + description: Count is the maximum number of similar songs to return. + required: + - id + - name + - artist + - count + SimilarSongsByArtistRequest: + description: SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist. + properties: + id: + type: string + description: ID is the internal Navidrome artist ID. + name: + type: string + description: Name is the artist name. + mbid: + type: string + description: MBID is the MusicBrainz artist ID (if known). + count: + type: integer + format: int32 + description: Count is the maximum number of similar songs to return. + required: + - id + - name + - count + SimilarSongsByTrackRequest: + description: SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack. + properties: + id: + type: string + description: ID is the internal Navidrome mediafile ID. + name: + type: string + description: Name is the track title. + artist: + type: string + description: Artist is the artist name. + mbid: + type: string + description: MBID is the MusicBrainz recording ID (if known). + count: + type: integer + format: int32 + description: Count is the maximum number of similar songs to return. + required: + - id + - name + - artist + - count + SimilarSongsResponse: + description: SimilarSongsResponse is the response for GetSimilarSongsBy* functions. + properties: + songs: + type: array + description: Songs is the list of similar songs. + items: + $ref: '#/components/schemas/SongRef' + required: + - songs SongRef: - description: SongRef is a reference to a song with name and optional MBID. + description: SongRef is a reference to a song with metadata for matching. properties: id: type: string @@ -241,6 +343,22 @@ components: mbid: type: string description: MBID is the MusicBrainz ID for the song. + artist: + type: string + description: Artist is the artist name. + artistMbid: + type: string + description: ArtistMBID is the MusicBrainz artist ID. + album: + type: string + description: Album is the album name. + albumMbid: + type: string + description: AlbumMBID is the MusicBrainz release ID. + duration: + type: number + format: float + description: Duration is the song duration in seconds. required: - name TopSongsRequest: diff --git a/plugins/cmd/ndpgen/internal/generator.go b/plugins/cmd/ndpgen/internal/generator.go index 26df6fc17..69e232565 100644 --- a/plugins/cmd/ndpgen/internal/generator.go +++ b/plugins/cmd/ndpgen/internal/generator.go @@ -568,6 +568,18 @@ func skipSerializingFunc(goType string) string { return "String::is_empty" case "bool": return "std::ops::Not::not" + case "int32": + return "is_zero_i32" + case "uint32": + return "is_zero_u32" + case "int64": + return "is_zero_i64" + case "uint64": + return "is_zero_u64" + case "float32": + return "is_zero_f32" + case "float64": + return "is_zero_f64" default: return "Option::is_none" } diff --git a/plugins/cmd/ndpgen/internal/generator_test.go b/plugins/cmd/ndpgen/internal/generator_test.go index 0fcd0da98..4a189ddd2 100644 --- a/plugins/cmd/ndpgen/internal/generator_test.go +++ b/plugins/cmd/ndpgen/internal/generator_test.go @@ -1234,6 +1234,37 @@ type OnInitOutput struct { }) var _ = Describe("Rust Generation", func() { + Describe("skipSerializingFunc", func() { + It("should return Option::is_none for pointer, slice, and map types", func() { + Expect(skipSerializingFunc("*string")).To(Equal("Option::is_none")) + Expect(skipSerializingFunc("*MyStruct")).To(Equal("Option::is_none")) + Expect(skipSerializingFunc("[]string")).To(Equal("Option::is_none")) + Expect(skipSerializingFunc("[]int32")).To(Equal("Option::is_none")) + Expect(skipSerializingFunc("map[string]int")).To(Equal("Option::is_none")) + }) + + It("should return String::is_empty for string type", func() { + Expect(skipSerializingFunc("string")).To(Equal("String::is_empty")) + }) + + It("should return std::ops::Not::not for bool type", func() { + Expect(skipSerializingFunc("bool")).To(Equal("std::ops::Not::not")) + }) + + It("should return is_zero_* functions for numeric types", func() { + Expect(skipSerializingFunc("int32")).To(Equal("is_zero_i32")) + Expect(skipSerializingFunc("uint32")).To(Equal("is_zero_u32")) + Expect(skipSerializingFunc("int64")).To(Equal("is_zero_i64")) + Expect(skipSerializingFunc("uint64")).To(Equal("is_zero_u64")) + Expect(skipSerializingFunc("float32")).To(Equal("is_zero_f32")) + Expect(skipSerializingFunc("float64")).To(Equal("is_zero_f64")) + }) + + It("should return Option::is_none for unknown types", func() { + Expect(skipSerializingFunc("CustomType")).To(Equal("Option::is_none")) + }) + }) + Describe("rustOutputType", func() { It("should convert Go primitives to Rust primitives", func() { Expect(rustOutputType("bool")).To(Equal("bool")) diff --git a/plugins/cmd/ndpgen/internal/templates/capability.rs.tmpl b/plugins/cmd/ndpgen/internal/templates/capability.rs.tmpl index 01e6513ac..597a17338 100644 --- a/plugins/cmd/ndpgen/internal/templates/capability.rs.tmpl +++ b/plugins/cmd/ndpgen/internal/templates/capability.rs.tmpl @@ -7,6 +7,20 @@ use serde::{Deserialize, Serialize}; {{- if hasHashMap .Capability}} use std::collections::HashMap; {{- end}} + +// Helper functions for skip_serializing_if with numeric types +#[allow(dead_code)] +fn is_zero_i32(value: &i32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u32(value: &u32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_i64(value: &i64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u64(value: &u64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_f32(value: &f32) -> bool { *value == 0.0 } +#[allow(dead_code)] +fn is_zero_f64(value: &f64) -> bool { *value == 0.0 } {{- end}} {{- /* Generate type alias definitions */ -}} diff --git a/plugins/cmd/ndpgen/internal/types.go b/plugins/cmd/ndpgen/internal/types.go index 5fd7e892c..7bd2bcc3f 100644 --- a/plugins/cmd/ndpgen/internal/types.go +++ b/plugins/cmd/ndpgen/internal/types.go @@ -466,9 +466,7 @@ func RustDefaultValue(goType string) string { switch goType { case "string": return `String::new()` - case "int", "int32": - return "0" - case "int64": + case "int", "int32", "int64", "uint", "uint32", "uint64": return "0" case "float32", "float64": return "0.0" @@ -602,6 +600,10 @@ func ToRustTypeWithStructs(goType string, knownStructs map[string]bool) string { return "i32" case "int64": return "i64" + case "uint", "uint32": + return "u32" + case "uint64": + return "u64" case "float32": return "f32" case "float64": diff --git a/plugins/cmd/ndpgen/internal/xtp_schema.go b/plugins/cmd/ndpgen/internal/xtp_schema.go index 200e72adb..db30262cc 100644 --- a/plugins/cmd/ndpgen/internal/xtp_schema.go +++ b/plugins/cmd/ndpgen/internal/xtp_schema.go @@ -106,7 +106,7 @@ func buildExport(export Export) xtpExport { // isPrimitiveGoType returns true if the Go type is a primitive type. func isPrimitiveGoType(goType string) bool { switch goType { - case "bool", "string", "int", "int32", "int64", "float32", "float64", "[]byte": + case "bool", "string", "int", "int32", "int64", "uint", "uint32", "uint64", "float32", "float64", "[]byte": return true } return false @@ -302,6 +302,12 @@ func goTypeToXTPTypeAndFormat(goType string) (typ, format string) { return "integer", "int32" case "int64": return "integer", "int64" + case "uint", "uint32": + // XTP schema doesn't support unsigned formats; use int64 to hold full uint32 range + return "integer", "int64" + case "uint64": + // XTP schema doesn't support unsigned formats; use int64 (may lose precision for large values) + return "integer", "int64" case "float32": return "number", "float" case "float64": diff --git a/plugins/metadata_agent.go b/plugins/metadata_agent.go index 7db2142d1..67a7e373d 100644 --- a/plugins/metadata_agent.go +++ b/plugins/metadata_agent.go @@ -14,14 +14,17 @@ const CapabilityMetadataAgent Capability = "MetadataAgent" // Export function names (snake_case as per design) const ( - FuncGetArtistMBID = "nd_get_artist_mbid" - FuncGetArtistURL = "nd_get_artist_url" - FuncGetArtistBiography = "nd_get_artist_biography" - FuncGetSimilarArtists = "nd_get_similar_artists" - FuncGetArtistImages = "nd_get_artist_images" - FuncGetArtistTopSongs = "nd_get_artist_top_songs" - FuncGetAlbumInfo = "nd_get_album_info" - FuncGetAlbumImages = "nd_get_album_images" + FuncGetArtistMBID = "nd_get_artist_mbid" + FuncGetArtistURL = "nd_get_artist_url" + FuncGetArtistBiography = "nd_get_artist_biography" + FuncGetSimilarArtists = "nd_get_similar_artists" + FuncGetArtistImages = "nd_get_artist_images" + FuncGetArtistTopSongs = "nd_get_artist_top_songs" + FuncGetAlbumInfo = "nd_get_album_info" + FuncGetAlbumImages = "nd_get_album_images" + FuncGetSimilarSongsByTrack = "nd_get_similar_songs_by_track" + FuncGetSimilarSongsByAlbum = "nd_get_similar_songs_by_album" + FuncGetSimilarSongsByArtist = "nd_get_similar_songs_by_artist" ) func init() { @@ -35,6 +38,9 @@ func init() { FuncGetArtistTopSongs, FuncGetAlbumInfo, FuncGetAlbumImages, + FuncGetSimilarSongsByTrack, + FuncGetSimilarSongsByAlbum, + FuncGetSimilarSongsByArtist, ) } @@ -147,12 +153,7 @@ func (a *MetadataAgent) GetArtistTopSongs(ctx context.Context, id, artistName, m return nil, agents.ErrNotFound } - songs := make([]agents.Song, len(result.Songs)) - for i, s := range result.Songs { - songs[i] = agents.Song{ID: s.ID, Name: s.Name, MBID: s.MBID} - } - - return songs, nil + return songRefsToAgentSongs(result.Songs), nil } // GetAlbumInfo retrieves album information @@ -195,15 +196,62 @@ func (a *MetadataAgent) GetAlbumImages(ctx context.Context, name, artist, mbid s return images, nil } +func callSimilarSongsPluginFunction[T any](ctx context.Context, plugin *plugin, funcName string, input T) ([]agents.Song, error) { + result, err := callPluginFunction[T, *capabilities.SimilarSongsResponse](ctx, plugin, funcName, input) + if err != nil { + return nil, err + } + if result == nil || len(result.Songs) == 0 { + return nil, agents.ErrNotFound + } + return songRefsToAgentSongs(result.Songs), nil +} + +// GetSimilarSongsByTrack retrieves songs similar to a specific track +func (a *MetadataAgent) GetSimilarSongsByTrack(ctx context.Context, id, name, artist, mbid string, count int) ([]agents.Song, error) { + return callSimilarSongsPluginFunction[capabilities.SimilarSongsByTrackRequest](ctx, a.plugin, FuncGetSimilarSongsByTrack, capabilities.SimilarSongsByTrackRequest{ID: id, Name: name, Artist: artist, MBID: mbid, Count: int32(count)}) +} + +// GetSimilarSongsByAlbum retrieves songs similar to tracks on an album +func (a *MetadataAgent) GetSimilarSongsByAlbum(ctx context.Context, id, name, artist, mbid string, count int) ([]agents.Song, error) { + return callSimilarSongsPluginFunction[capabilities.SimilarSongsByAlbumRequest](ctx, a.plugin, FuncGetSimilarSongsByAlbum, capabilities.SimilarSongsByAlbumRequest{ID: id, Name: name, Artist: artist, MBID: mbid, Count: int32(count)}) +} + +// GetSimilarSongsByArtist retrieves songs similar to an artist's catalog +func (a *MetadataAgent) GetSimilarSongsByArtist(ctx context.Context, id, name, mbid string, count int) ([]agents.Song, error) { + return callSimilarSongsPluginFunction[capabilities.SimilarSongsByArtistRequest](ctx, a.plugin, FuncGetSimilarSongsByArtist, capabilities.SimilarSongsByArtistRequest{ID: id, Name: name, MBID: mbid, Count: int32(count)}) +} + +// songRefsToAgentSongs converts a slice of SongRef to agents.Song +func songRefsToAgentSongs(refs []capabilities.SongRef) []agents.Song { + songs := make([]agents.Song, len(refs)) + for i, s := range refs { + songs[i] = agents.Song{ + ID: s.ID, + Name: s.Name, + MBID: s.MBID, + Artist: s.Artist, + ArtistMBID: s.ArtistMBID, + Album: s.Album, + AlbumMBID: s.AlbumMBID, + Duration: uint32(s.Duration * 1000), + } + } + return songs +} + // Verify interface implementations at compile time var ( - _ agents.Interface = (*MetadataAgent)(nil) - _ agents.ArtistMBIDRetriever = (*MetadataAgent)(nil) - _ agents.ArtistURLRetriever = (*MetadataAgent)(nil) - _ agents.ArtistBiographyRetriever = (*MetadataAgent)(nil) - _ agents.ArtistSimilarRetriever = (*MetadataAgent)(nil) - _ agents.ArtistImageRetriever = (*MetadataAgent)(nil) - _ agents.ArtistTopSongsRetriever = (*MetadataAgent)(nil) - _ agents.AlbumInfoRetriever = (*MetadataAgent)(nil) - _ agents.AlbumImageRetriever = (*MetadataAgent)(nil) + _ agents.Interface = (*MetadataAgent)(nil) + _ agents.ArtistMBIDRetriever = (*MetadataAgent)(nil) + _ agents.ArtistURLRetriever = (*MetadataAgent)(nil) + _ agents.ArtistBiographyRetriever = (*MetadataAgent)(nil) + _ agents.ArtistSimilarRetriever = (*MetadataAgent)(nil) + _ agents.ArtistImageRetriever = (*MetadataAgent)(nil) + _ agents.ArtistTopSongsRetriever = (*MetadataAgent)(nil) + _ agents.AlbumInfoRetriever = (*MetadataAgent)(nil) + _ agents.AlbumImageRetriever = (*MetadataAgent)(nil) + _ agents.SimilarSongsByTrackRetriever = (*MetadataAgent)(nil) + _ agents.SimilarSongsByAlbumRetriever = (*MetadataAgent)(nil) + _ agents.SimilarSongsByArtistRetriever = (*MetadataAgent)(nil) ) diff --git a/plugins/metadata_agent_test.go b/plugins/metadata_agent_test.go index b4c37a88c..694cef716 100644 --- a/plugins/metadata_agent_test.go +++ b/plugins/metadata_agent_test.go @@ -108,6 +108,37 @@ var _ = Describe("MetadataAgent", Ordered, func() { Expect(images[0].Size).To(Equal(500)) }) }) + + Describe("GetSimilarSongsByTrack", func() { + It("returns similar songs from the plugin", func() { + retriever := agent.(agents.SimilarSongsByTrackRetriever) + songs, err := retriever.GetSimilarSongsByTrack(GinkgoT().Context(), "track-1", "Yesterday", "The Beatles", "some-mbid", 3) + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(3)) + Expect(songs[0].Name).To(Equal("Similar to Yesterday #1")) + Expect(songs[0].Artist).To(Equal("The Beatles")) + }) + }) + + Describe("GetSimilarSongsByAlbum", func() { + It("returns similar songs from the plugin", func() { + retriever := agent.(agents.SimilarSongsByAlbumRetriever) + songs, err := retriever.GetSimilarSongsByAlbum(GinkgoT().Context(), "album-1", "Abbey Road", "The Beatles", "album-mbid", 3) + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(3)) + Expect(songs[0].Album).To(Equal("Abbey Road")) + }) + }) + + Describe("GetSimilarSongsByArtist", func() { + It("returns similar songs from the plugin", func() { + retriever := agent.(agents.SimilarSongsByArtistRetriever) + songs, err := retriever.GetSimilarSongsByArtist(GinkgoT().Context(), "artist-1", "The Beatles", "some-mbid", 3) + Expect(err).ToNot(HaveOccurred()) + Expect(songs).To(HaveLen(3)) + Expect(songs[0].Name).To(ContainSubstring("The Beatles Style Song")) + }) + }) }) var _ = Describe("MetadataAgent error handling", Ordered, func() { @@ -186,6 +217,27 @@ var _ = Describe("MetadataAgent error handling", Ordered, func() { Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("simulated plugin error")) }) + + It("returns error from GetSimilarSongsByTrack", func() { + retriever := errorAgent.(agents.SimilarSongsByTrackRetriever) + _, err := retriever.GetSimilarSongsByTrack(GinkgoT().Context(), "track-1", "Test", "Artist", "mbid", 5) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("simulated plugin error")) + }) + + It("returns error from GetSimilarSongsByAlbum", func() { + retriever := errorAgent.(agents.SimilarSongsByAlbumRetriever) + _, err := retriever.GetSimilarSongsByAlbum(GinkgoT().Context(), "album-1", "Album", "Artist", "mbid", 5) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("simulated plugin error")) + }) + + It("returns error from GetSimilarSongsByArtist", func() { + retriever := errorAgent.(agents.SimilarSongsByArtistRetriever) + _, err := retriever.GetSimilarSongsByArtist(GinkgoT().Context(), "artist-1", "Artist", "mbid", 5) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("simulated plugin error")) + }) }) var _ = Describe("MetadataAgent partial implementation", Ordered, func() { @@ -255,6 +307,23 @@ var _ = Describe("MetadataAgent partial implementation", Ordered, func() { retriever := partialAgent.(agents.AlbumImageRetriever) _, err := retriever.GetAlbumImages(GinkgoT().Context(), "Album", "Artist", "mbid") Expect(err).To(MatchError(errNotImplemented)) + }) + It("returns ErrNotFound for unimplemented method (GetSimilarSongsByTrack)", func() { + retriever := partialAgent.(agents.SimilarSongsByTrackRetriever) + _, err := retriever.GetSimilarSongsByTrack(GinkgoT().Context(), "track-1", "Test", "Artist", "mbid", 5) + Expect(err).To(MatchError(errNotImplemented)) + }) + + It("returns ErrNotFound for unimplemented method (GetSimilarSongsByAlbum)", func() { + retriever := partialAgent.(agents.SimilarSongsByAlbumRetriever) + _, err := retriever.GetSimilarSongsByAlbum(GinkgoT().Context(), "album-1", "Album", "Artist", "mbid", 5) + Expect(err).To(MatchError(errNotImplemented)) + }) + + It("returns ErrNotFound for unimplemented method (GetSimilarSongsByArtist)", func() { + retriever := partialAgent.(agents.SimilarSongsByArtistRetriever) + _, err := retriever.GetSimilarSongsByArtist(GinkgoT().Context(), "artist-1", "Artist", "mbid", 5) + Expect(err).To(MatchError(errNotImplemented)) }) }) diff --git a/plugins/pdk/go/metadata/metadata.go b/plugins/pdk/go/metadata/metadata.go index 6898468a5..46f6da5d8 100644 --- a/plugins/pdk/go/metadata/metadata.go +++ b/plugins/pdk/go/metadata/metadata.go @@ -117,7 +117,53 @@ type SimilarArtistsResponse struct { Artists []ArtistRef `json:"artists"` } -// SongRef is a reference to a song with name and optional MBID. +// SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum. +type SimilarSongsByAlbumRequest struct { + // ID is the internal Navidrome album ID. + ID string `json:"id"` + // Name is the album name. + Name string `json:"name"` + // Artist is the album artist name. + Artist string `json:"artist"` + // MBID is the MusicBrainz release ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist. +type SimilarSongsByArtistRequest struct { + // ID is the internal Navidrome artist ID. + ID string `json:"id"` + // Name is the artist name. + Name string `json:"name"` + // MBID is the MusicBrainz artist ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack. +type SimilarSongsByTrackRequest struct { + // ID is the internal Navidrome mediafile ID. + ID string `json:"id"` + // Name is the track title. + Name string `json:"name"` + // Artist is the artist name. + Artist string `json:"artist"` + // MBID is the MusicBrainz recording ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsResponse is the response for GetSimilarSongsBy* functions. +type SimilarSongsResponse struct { + // Songs is the list of similar songs. + Songs []SongRef `json:"songs"` +} + +// SongRef is a reference to a song with metadata for matching. type SongRef struct { // ID is the internal Navidrome mediafile ID (if known). ID string `json:"id,omitempty"` @@ -125,6 +171,16 @@ type SongRef struct { Name string `json:"name"` // MBID is the MusicBrainz ID for the song. MBID string `json:"mbid,omitempty"` + // Artist is the artist name. + Artist string `json:"artist,omitempty"` + // ArtistMBID is the MusicBrainz artist ID. + ArtistMBID string `json:"artistMbid,omitempty"` + // Album is the album name. + Album string `json:"album,omitempty"` + // AlbumMBID is the MusicBrainz release ID. + AlbumMBID string `json:"albumMbid,omitempty"` + // Duration is the song duration in seconds. + Duration float32 `json:"duration,omitempty"` } // TopSongsRequest is the request for GetArtistTopSongs. @@ -193,16 +249,34 @@ type AlbumInfoProvider interface { // AlbumImagesProvider provides the GetAlbumImages function. type AlbumImagesProvider interface { GetAlbumImages(AlbumRequest) (*AlbumImagesResponse, error) +} + +// SimilarSongsByTrackProvider provides the GetSimilarSongsByTrack function. +type SimilarSongsByTrackProvider interface { + GetSimilarSongsByTrack(SimilarSongsByTrackRequest) (*SimilarSongsResponse, error) +} + +// SimilarSongsByAlbumProvider provides the GetSimilarSongsByAlbum function. +type SimilarSongsByAlbumProvider interface { + GetSimilarSongsByAlbum(SimilarSongsByAlbumRequest) (*SimilarSongsResponse, error) +} + +// SimilarSongsByArtistProvider provides the GetSimilarSongsByArtist function. +type SimilarSongsByArtistProvider interface { + GetSimilarSongsByArtist(SimilarSongsByArtistRequest) (*SimilarSongsResponse, error) } // Internal implementation holders var ( - artistMBIDImpl func(ArtistMBIDRequest) (*ArtistMBIDResponse, error) - artistURLImpl func(ArtistRequest) (*ArtistURLResponse, error) - artistBiographyImpl func(ArtistRequest) (*ArtistBiographyResponse, error) - similarArtistsImpl func(SimilarArtistsRequest) (*SimilarArtistsResponse, error) - artistImagesImpl func(ArtistRequest) (*ArtistImagesResponse, error) - artistTopSongsImpl func(TopSongsRequest) (*TopSongsResponse, error) - albumInfoImpl func(AlbumRequest) (*AlbumInfoResponse, error) - albumImagesImpl func(AlbumRequest) (*AlbumImagesResponse, error) + artistMBIDImpl func(ArtistMBIDRequest) (*ArtistMBIDResponse, error) + artistURLImpl func(ArtistRequest) (*ArtistURLResponse, error) + artistBiographyImpl func(ArtistRequest) (*ArtistBiographyResponse, error) + similarArtistsImpl func(SimilarArtistsRequest) (*SimilarArtistsResponse, error) + artistImagesImpl func(ArtistRequest) (*ArtistImagesResponse, error) + artistTopSongsImpl func(TopSongsRequest) (*TopSongsResponse, error) + albumInfoImpl func(AlbumRequest) (*AlbumInfoResponse, error) + albumImagesImpl func(AlbumRequest) (*AlbumImagesResponse, error) + similarSongsByTrackImpl func(SimilarSongsByTrackRequest) (*SimilarSongsResponse, error) + similarSongsByAlbumImpl func(SimilarSongsByAlbumRequest) (*SimilarSongsResponse, error) + similarSongsByArtistImpl func(SimilarSongsByArtistRequest) (*SimilarSongsResponse, error) ) // Register registers a metadata implementation. @@ -232,6 +306,15 @@ func Register(impl Metadata) { if p, ok := impl.(AlbumImagesProvider); ok { albumImagesImpl = p.GetAlbumImages } + if p, ok := impl.(SimilarSongsByTrackProvider); ok { + similarSongsByTrackImpl = p.GetSimilarSongsByTrack + } + if p, ok := impl.(SimilarSongsByAlbumProvider); ok { + similarSongsByAlbumImpl = p.GetSimilarSongsByAlbum + } + if p, ok := impl.(SimilarSongsByArtistProvider); ok { + similarSongsByArtistImpl = p.GetSimilarSongsByArtist + } } // NotImplementedCode is the standard return code for unimplemented functions. @@ -453,3 +536,84 @@ func _NdGetAlbumImages() int32 { return 0 } + +//go:wasmexport nd_get_similar_songs_by_track +func _NdGetSimilarSongsByTrack() int32 { + if similarSongsByTrackImpl == nil { + // Return standard code - host will skip this plugin gracefully + return NotImplementedCode + } + + var input SimilarSongsByTrackRequest + if err := pdk.InputJSON(&input); err != nil { + pdk.SetError(err) + return -1 + } + + output, err := similarSongsByTrackImpl(input) + if err != nil { + pdk.SetError(err) + return -1 + } + + if err := pdk.OutputJSON(output); err != nil { + pdk.SetError(err) + return -1 + } + + return 0 +} + +//go:wasmexport nd_get_similar_songs_by_album +func _NdGetSimilarSongsByAlbum() int32 { + if similarSongsByAlbumImpl == nil { + // Return standard code - host will skip this plugin gracefully + return NotImplementedCode + } + + var input SimilarSongsByAlbumRequest + if err := pdk.InputJSON(&input); err != nil { + pdk.SetError(err) + return -1 + } + + output, err := similarSongsByAlbumImpl(input) + if err != nil { + pdk.SetError(err) + return -1 + } + + if err := pdk.OutputJSON(output); err != nil { + pdk.SetError(err) + return -1 + } + + return 0 +} + +//go:wasmexport nd_get_similar_songs_by_artist +func _NdGetSimilarSongsByArtist() int32 { + if similarSongsByArtistImpl == nil { + // Return standard code - host will skip this plugin gracefully + return NotImplementedCode + } + + var input SimilarSongsByArtistRequest + if err := pdk.InputJSON(&input); err != nil { + pdk.SetError(err) + return -1 + } + + output, err := similarSongsByArtistImpl(input) + if err != nil { + pdk.SetError(err) + return -1 + } + + if err := pdk.OutputJSON(output); err != nil { + pdk.SetError(err) + return -1 + } + + return 0 +} diff --git a/plugins/pdk/go/metadata/metadata_stub.go b/plugins/pdk/go/metadata/metadata_stub.go index 07336142e..7b0a1109f 100644 --- a/plugins/pdk/go/metadata/metadata_stub.go +++ b/plugins/pdk/go/metadata/metadata_stub.go @@ -114,7 +114,53 @@ type SimilarArtistsResponse struct { Artists []ArtistRef `json:"artists"` } -// SongRef is a reference to a song with name and optional MBID. +// SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum. +type SimilarSongsByAlbumRequest struct { + // ID is the internal Navidrome album ID. + ID string `json:"id"` + // Name is the album name. + Name string `json:"name"` + // Artist is the album artist name. + Artist string `json:"artist"` + // MBID is the MusicBrainz release ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist. +type SimilarSongsByArtistRequest struct { + // ID is the internal Navidrome artist ID. + ID string `json:"id"` + // Name is the artist name. + Name string `json:"name"` + // MBID is the MusicBrainz artist ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack. +type SimilarSongsByTrackRequest struct { + // ID is the internal Navidrome mediafile ID. + ID string `json:"id"` + // Name is the track title. + Name string `json:"name"` + // Artist is the artist name. + Artist string `json:"artist"` + // MBID is the MusicBrainz recording ID (if known). + MBID string `json:"mbid,omitempty"` + // Count is the maximum number of similar songs to return. + Count int32 `json:"count"` +} + +// SimilarSongsResponse is the response for GetSimilarSongsBy* functions. +type SimilarSongsResponse struct { + // Songs is the list of similar songs. + Songs []SongRef `json:"songs"` +} + +// SongRef is a reference to a song with metadata for matching. type SongRef struct { // ID is the internal Navidrome mediafile ID (if known). ID string `json:"id,omitempty"` @@ -122,6 +168,16 @@ type SongRef struct { Name string `json:"name"` // MBID is the MusicBrainz ID for the song. MBID string `json:"mbid,omitempty"` + // Artist is the artist name. + Artist string `json:"artist,omitempty"` + // ArtistMBID is the MusicBrainz artist ID. + ArtistMBID string `json:"artistMbid,omitempty"` + // Album is the album name. + Album string `json:"album,omitempty"` + // AlbumMBID is the MusicBrainz release ID. + AlbumMBID string `json:"albumMbid,omitempty"` + // Duration is the song duration in seconds. + Duration float32 `json:"duration,omitempty"` } // TopSongsRequest is the request for GetArtistTopSongs. @@ -192,6 +248,21 @@ type AlbumImagesProvider interface { GetAlbumImages(AlbumRequest) (*AlbumImagesResponse, error) } +// SimilarSongsByTrackProvider provides the GetSimilarSongsByTrack function. +type SimilarSongsByTrackProvider interface { + GetSimilarSongsByTrack(SimilarSongsByTrackRequest) (*SimilarSongsResponse, error) +} + +// SimilarSongsByAlbumProvider provides the GetSimilarSongsByAlbum function. +type SimilarSongsByAlbumProvider interface { + GetSimilarSongsByAlbum(SimilarSongsByAlbumRequest) (*SimilarSongsResponse, error) +} + +// SimilarSongsByArtistProvider provides the GetSimilarSongsByArtist function. +type SimilarSongsByArtistProvider interface { + GetSimilarSongsByArtist(SimilarSongsByArtistRequest) (*SimilarSongsResponse, error) +} + // NotImplementedCode is the standard return code for unimplemented functions. const NotImplementedCode int32 = -2 diff --git a/plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs b/plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs index df7695f0e..24ca0b6df 100644 --- a/plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs +++ b/plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs @@ -4,6 +4,20 @@ // It is intended for use in Navidrome plugins built with extism-pdk. use serde::{Deserialize, Serialize}; + +// Helper functions for skip_serializing_if with numeric types +#[allow(dead_code)] +fn is_zero_i32(value: &i32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u32(value: &u32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_i64(value: &i64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u64(value: &u64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_f32(value: &f32) -> bool { *value == 0.0 } +#[allow(dead_code)] +fn is_zero_f64(value: &f64) -> bool { *value == 0.0 } /// AlbumImagesResponse is the response for GetAlbumImages. #[derive(Debug, Clone, Default, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] @@ -150,7 +164,72 @@ pub struct SimilarArtistsResponse { #[serde(default)] pub artists: Vec, } -/// SongRef is a reference to a song with name and optional MBID. +/// SimilarSongsByAlbumRequest is the request for GetSimilarSongsByAlbum. +#[derive(Debug, Clone, Default, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SimilarSongsByAlbumRequest { + /// ID is the internal Navidrome album ID. + #[serde(default)] + pub id: String, + /// Name is the album name. + #[serde(default)] + pub name: String, + /// Artist is the album artist name. + #[serde(default)] + pub artist: String, + /// MBID is the MusicBrainz release ID (if known). + #[serde(default, skip_serializing_if = "String::is_empty")] + pub mbid: String, + /// Count is the maximum number of similar songs to return. + #[serde(default)] + pub count: i32, +} +/// SimilarSongsByArtistRequest is the request for GetSimilarSongsByArtist. +#[derive(Debug, Clone, Default, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SimilarSongsByArtistRequest { + /// ID is the internal Navidrome artist ID. + #[serde(default)] + pub id: String, + /// Name is the artist name. + #[serde(default)] + pub name: String, + /// MBID is the MusicBrainz artist ID (if known). + #[serde(default, skip_serializing_if = "String::is_empty")] + pub mbid: String, + /// Count is the maximum number of similar songs to return. + #[serde(default)] + pub count: i32, +} +/// SimilarSongsByTrackRequest is the request for GetSimilarSongsByTrack. +#[derive(Debug, Clone, Default, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SimilarSongsByTrackRequest { + /// ID is the internal Navidrome mediafile ID. + #[serde(default)] + pub id: String, + /// Name is the track title. + #[serde(default)] + pub name: String, + /// Artist is the artist name. + #[serde(default)] + pub artist: String, + /// MBID is the MusicBrainz recording ID (if known). + #[serde(default, skip_serializing_if = "String::is_empty")] + pub mbid: String, + /// Count is the maximum number of similar songs to return. + #[serde(default)] + pub count: i32, +} +/// SimilarSongsResponse is the response for GetSimilarSongsBy* functions. +#[derive(Debug, Clone, Default, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SimilarSongsResponse { + /// Songs is the list of similar songs. + #[serde(default)] + pub songs: Vec, +} +/// SongRef is a reference to a song with metadata for matching. #[derive(Debug, Clone, Default, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct SongRef { @@ -163,6 +242,21 @@ pub struct SongRef { /// MBID is the MusicBrainz ID for the song. #[serde(default, skip_serializing_if = "String::is_empty")] pub mbid: String, + /// Artist is the artist name. + #[serde(default, skip_serializing_if = "String::is_empty")] + pub artist: String, + /// ArtistMBID is the MusicBrainz artist ID. + #[serde(default, skip_serializing_if = "String::is_empty")] + pub artist_mbid: String, + /// Album is the album name. + #[serde(default, skip_serializing_if = "String::is_empty")] + pub album: String, + /// AlbumMBID is the MusicBrainz release ID. + #[serde(default, skip_serializing_if = "String::is_empty")] + pub album_mbid: String, + /// Duration is the song duration in seconds. + #[serde(default, skip_serializing_if = "is_zero_f32")] + pub duration: f32, } /// TopSongsRequest is the request for GetArtistTopSongs. #[derive(Debug, Clone, Default, Serialize, Deserialize)] @@ -377,3 +471,66 @@ macro_rules! register_metadata_album_images { } }; } + +/// SimilarSongsByTrackProvider provides the GetSimilarSongsByTrack function. +pub trait SimilarSongsByTrackProvider { + fn get_similar_songs_by_track(&self, req: SimilarSongsByTrackRequest) -> Result; +} + +/// Register the get_similar_songs_by_track export. +/// This macro generates the WASM export function for this method. +#[macro_export] +macro_rules! register_metadata_similar_songs_by_track { + ($plugin_type:ty) => { + #[extism_pdk::plugin_fn] + pub fn nd_get_similar_songs_by_track( + req: extism_pdk::Json<$crate::metadata::SimilarSongsByTrackRequest> + ) -> extism_pdk::FnResult> { + let plugin = <$plugin_type>::default(); + let result = $crate::metadata::SimilarSongsByTrackProvider::get_similar_songs_by_track(&plugin, req.into_inner())?; + Ok(extism_pdk::Json(result)) + } + }; +} + +/// SimilarSongsByAlbumProvider provides the GetSimilarSongsByAlbum function. +pub trait SimilarSongsByAlbumProvider { + fn get_similar_songs_by_album(&self, req: SimilarSongsByAlbumRequest) -> Result; +} + +/// Register the get_similar_songs_by_album export. +/// This macro generates the WASM export function for this method. +#[macro_export] +macro_rules! register_metadata_similar_songs_by_album { + ($plugin_type:ty) => { + #[extism_pdk::plugin_fn] + pub fn nd_get_similar_songs_by_album( + req: extism_pdk::Json<$crate::metadata::SimilarSongsByAlbumRequest> + ) -> extism_pdk::FnResult> { + let plugin = <$plugin_type>::default(); + let result = $crate::metadata::SimilarSongsByAlbumProvider::get_similar_songs_by_album(&plugin, req.into_inner())?; + Ok(extism_pdk::Json(result)) + } + }; +} + +/// SimilarSongsByArtistProvider provides the GetSimilarSongsByArtist function. +pub trait SimilarSongsByArtistProvider { + fn get_similar_songs_by_artist(&self, req: SimilarSongsByArtistRequest) -> Result; +} + +/// Register the get_similar_songs_by_artist export. +/// This macro generates the WASM export function for this method. +#[macro_export] +macro_rules! register_metadata_similar_songs_by_artist { + ($plugin_type:ty) => { + #[extism_pdk::plugin_fn] + pub fn nd_get_similar_songs_by_artist( + req: extism_pdk::Json<$crate::metadata::SimilarSongsByArtistRequest> + ) -> extism_pdk::FnResult> { + let plugin = <$plugin_type>::default(); + let result = $crate::metadata::SimilarSongsByArtistProvider::get_similar_songs_by_artist(&plugin, req.into_inner())?; + Ok(extism_pdk::Json(result)) + } + }; +} diff --git a/plugins/pdk/rust/nd-pdk-capabilities/src/scheduler.rs b/plugins/pdk/rust/nd-pdk-capabilities/src/scheduler.rs index a77688a6d..53b8564ee 100644 --- a/plugins/pdk/rust/nd-pdk-capabilities/src/scheduler.rs +++ b/plugins/pdk/rust/nd-pdk-capabilities/src/scheduler.rs @@ -4,6 +4,20 @@ // It is intended for use in Navidrome plugins built with extism-pdk. use serde::{Deserialize, Serialize}; + +// Helper functions for skip_serializing_if with numeric types +#[allow(dead_code)] +fn is_zero_i32(value: &i32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u32(value: &u32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_i64(value: &i64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u64(value: &u64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_f32(value: &f32) -> bool { *value == 0.0 } +#[allow(dead_code)] +fn is_zero_f64(value: &f64) -> bool { *value == 0.0 } /// SchedulerCallbackRequest is the request provided when a scheduled task fires. #[derive(Debug, Clone, Default, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] diff --git a/plugins/pdk/rust/nd-pdk-capabilities/src/scrobbler.rs b/plugins/pdk/rust/nd-pdk-capabilities/src/scrobbler.rs index 7a777496d..9dbedd040 100644 --- a/plugins/pdk/rust/nd-pdk-capabilities/src/scrobbler.rs +++ b/plugins/pdk/rust/nd-pdk-capabilities/src/scrobbler.rs @@ -4,6 +4,20 @@ // It is intended for use in Navidrome plugins built with extism-pdk. use serde::{Deserialize, Serialize}; + +// Helper functions for skip_serializing_if with numeric types +#[allow(dead_code)] +fn is_zero_i32(value: &i32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u32(value: &u32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_i64(value: &i64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u64(value: &u64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_f32(value: &f32) -> bool { *value == 0.0 } +#[allow(dead_code)] +fn is_zero_f64(value: &f64) -> bool { *value == 0.0 } /// ScrobblerError represents an error type for scrobbling operations. pub type ScrobblerError = &'static str; /// ScrobblerErrorNotAuthorized indicates the user is not authorized. diff --git a/plugins/pdk/rust/nd-pdk-capabilities/src/websocket.rs b/plugins/pdk/rust/nd-pdk-capabilities/src/websocket.rs index 81374ebe8..b077110d3 100644 --- a/plugins/pdk/rust/nd-pdk-capabilities/src/websocket.rs +++ b/plugins/pdk/rust/nd-pdk-capabilities/src/websocket.rs @@ -4,6 +4,20 @@ // It is intended for use in Navidrome plugins built with extism-pdk. use serde::{Deserialize, Serialize}; + +// Helper functions for skip_serializing_if with numeric types +#[allow(dead_code)] +fn is_zero_i32(value: &i32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u32(value: &u32) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_i64(value: &i64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_u64(value: &u64) -> bool { *value == 0 } +#[allow(dead_code)] +fn is_zero_f32(value: &f32) -> bool { *value == 0.0 } +#[allow(dead_code)] +fn is_zero_f64(value: &f64) -> bool { *value == 0.0 } /// OnBinaryMessageRequest is the request provided when a binary message is received. #[derive(Debug, Clone, Default, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] diff --git a/plugins/testdata/test-metadata-agent/main.go b/plugins/testdata/test-metadata-agent/main.go index b72682c3f..2ff2a0bd6 100644 --- a/plugins/testdata/test-metadata-agent/main.go +++ b/plugins/testdata/test-metadata-agent/main.go @@ -120,4 +120,64 @@ func (t *testMetadataAgent) GetAlbumImages(input metadata.AlbumRequest) (*metada }, nil } +func (t *testMetadataAgent) GetSimilarSongsByTrack(input metadata.SimilarSongsByTrackRequest) (*metadata.SimilarSongsResponse, error) { + if err := checkConfigError(); err != nil { + return nil, err + } + count := int(input.Count) + if count == 0 { + count = 5 + } + songs := make([]metadata.SongRef, 0, count) + for i := range count { + songs = append(songs, metadata.SongRef{ + ID: "similar-track-id-" + strconv.Itoa(i+1), + Name: "Similar to " + input.Name + " #" + strconv.Itoa(i+1), + MBID: "similar-mbid-" + strconv.Itoa(i+1), + Artist: input.Artist, + ArtistMBID: "artist-mbid-" + strconv.Itoa(i+1), + }) + } + return &metadata.SimilarSongsResponse{Songs: songs}, nil +} + +func (t *testMetadataAgent) GetSimilarSongsByAlbum(input metadata.SimilarSongsByAlbumRequest) (*metadata.SimilarSongsResponse, error) { + if err := checkConfigError(); err != nil { + return nil, err + } + count := int(input.Count) + if count == 0 { + count = 5 + } + songs := make([]metadata.SongRef, 0, count) + for i := range count { + songs = append(songs, metadata.SongRef{ + ID: "album-similar-id-" + strconv.Itoa(i+1), + Name: "Album Similar #" + strconv.Itoa(i+1), + Artist: input.Artist, + Album: input.Name, + }) + } + return &metadata.SimilarSongsResponse{Songs: songs}, nil +} + +func (t *testMetadataAgent) GetSimilarSongsByArtist(input metadata.SimilarSongsByArtistRequest) (*metadata.SimilarSongsResponse, error) { + if err := checkConfigError(); err != nil { + return nil, err + } + count := int(input.Count) + if count == 0 { + count = 5 + } + songs := make([]metadata.SongRef, 0, count) + for i := range count { + songs = append(songs, metadata.SongRef{ + ID: "artist-similar-id-" + strconv.Itoa(i+1), + Name: input.Name + " Style Song #" + strconv.Itoa(i+1), + Artist: input.Name + " Similar Artist", + }) + } + return &metadata.SimilarSongsResponse{Songs: songs}, nil +} + func main() {} From 51026de80bbb6373cbaf26517dda8ee0ebe3abee Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 26 Jan 2026 20:13:04 -0500 Subject: [PATCH 05/82] fix(lastfm): send parameters in request body for POST requests in scrobble and updateNowPlaying methods Signed-off-by: Deluan --- adapters/lastfm/agent_test.go | 13 +++++-- adapters/lastfm/client.go | 11 +++++- adapters/lastfm/client_test.go | 68 ++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 6 deletions(-) diff --git a/adapters/lastfm/agent_test.go b/adapters/lastfm/agent_test.go index f2db44fa4..185bfbb23 100644 --- a/adapters/lastfm/agent_test.go +++ b/adapters/lastfm/agent_test.go @@ -6,6 +6,7 @@ import ( "errors" "io" "net/http" + "net/url" "os" "strconv" "time" @@ -265,7 +266,8 @@ var _ = Describe("lastfmAgent", func() { Expect(err).ToNot(HaveOccurred()) Expect(httpClient.SavedRequest.Method).To(Equal(http.MethodPost)) - sentParams := httpClient.SavedRequest.URL.Query() + body, _ := io.ReadAll(httpClient.SavedRequest.Body) + sentParams, _ := url.ParseQuery(string(body)) Expect(sentParams.Get("method")).To(Equal("track.updateNowPlaying")) Expect(sentParams.Get("sk")).To(Equal("SK-1")) Expect(sentParams.Get("track")).To(Equal(track.Title)) @@ -293,7 +295,8 @@ var _ = Describe("lastfmAgent", func() { err := agent.NowPlaying(ctx, "user-1", track, 0) Expect(err).ToNot(HaveOccurred()) - sentParams := httpClient.SavedRequest.URL.Query() + body, _ := io.ReadAll(httpClient.SavedRequest.Body) + sentParams, _ := url.ParseQuery(string(body)) Expect(sentParams.Get("artist")).To(Equal("First Artist")) Expect(sentParams.Get("albumArtist")).To(Equal("First Album Artist")) }) @@ -309,7 +312,8 @@ var _ = Describe("lastfmAgent", func() { Expect(err).ToNot(HaveOccurred()) Expect(httpClient.SavedRequest.Method).To(Equal(http.MethodPost)) - sentParams := httpClient.SavedRequest.URL.Query() + body, _ := io.ReadAll(httpClient.SavedRequest.Body) + sentParams, _ := url.ParseQuery(string(body)) Expect(sentParams.Get("method")).To(Equal("track.scrobble")) Expect(sentParams.Get("sk")).To(Equal("SK-1")) Expect(sentParams.Get("track")).To(Equal(track.Title)) @@ -334,7 +338,8 @@ var _ = Describe("lastfmAgent", func() { err := agent.Scrobble(ctx, "user-1", scrobbler.Scrobble{MediaFile: *track, TimeStamp: ts}) Expect(err).ToNot(HaveOccurred()) - sentParams := httpClient.SavedRequest.URL.Query() + body, _ := io.ReadAll(httpClient.SavedRequest.Body) + sentParams, _ := url.ParseQuery(string(body)) Expect(sentParams.Get("artist")).To(Equal("First Artist")) Expect(sentParams.Get("albumArtist")).To(Equal("First Album Artist")) }) diff --git a/adapters/lastfm/client.go b/adapters/lastfm/client.go index f15613a1d..9d991e79e 100644 --- a/adapters/lastfm/client.go +++ b/adapters/lastfm/client.go @@ -198,8 +198,15 @@ func (c *client) makeRequest(ctx context.Context, method string, params url.Valu c.sign(params) } - req, _ := http.NewRequestWithContext(ctx, method, apiBaseUrl, nil) - req.URL.RawQuery = params.Encode() + var req *http.Request + if method == http.MethodPost { + body := strings.NewReader(params.Encode()) + req, _ = http.NewRequestWithContext(ctx, method, apiBaseUrl, body) + req.Header.Set("Content-Type", "application/x-www-form-urlencoded") + } else { + req, _ = http.NewRequestWithContext(ctx, method, apiBaseUrl, nil) + req.URL.RawQuery = params.Encode() + } log.Trace(ctx, fmt.Sprintf("Sending Last.fm %s request", req.Method), "url", req.URL) resp, err := c.hc.Do(req) diff --git a/adapters/lastfm/client_test.go b/adapters/lastfm/client_test.go index bd3197474..c218721a7 100644 --- a/adapters/lastfm/client_test.go +++ b/adapters/lastfm/client_test.go @@ -178,6 +178,74 @@ var _ = Describe("client", func() { }) }) + Describe("scrobble", func() { + It("sends parameters in request body for POST", func() { + httpClient.Res = http.Response{ + Body: io.NopCloser(bytes.NewBufferString(`{"scrobbles":{"scrobble":{"ignoredMessage":{"code":"0"}},"@attr":{"accepted":1}}}`)), + StatusCode: 200, + } + + info := ScrobbleInfo{ + artist: "U2", + track: "One", + album: "Achtung Baby", + trackNumber: 1, + duration: 276, + albumArtist: "U2", + } + err := client.scrobble(context.Background(), "SESSION_KEY", info) + Expect(err).To(BeNil()) + + req := httpClient.SavedRequest + Expect(req.Method).To(Equal(http.MethodPost)) + Expect(req.Header.Get("Content-Type")).To(Equal("application/x-www-form-urlencoded")) + Expect(req.URL.RawQuery).To(BeEmpty()) + + body, _ := io.ReadAll(req.Body) + bodyParams, _ := url.ParseQuery(string(body)) + Expect(bodyParams.Get("method")).To(Equal("track.scrobble")) + Expect(bodyParams.Get("artist")).To(Equal("U2")) + Expect(bodyParams.Get("track")).To(Equal("One")) + Expect(bodyParams.Get("sk")).To(Equal("SESSION_KEY")) + Expect(bodyParams.Get("api_key")).To(Equal("API_KEY")) + Expect(bodyParams.Get("api_sig")).ToNot(BeEmpty()) + }) + }) + + Describe("updateNowPlaying", func() { + It("sends parameters in request body for POST", func() { + httpClient.Res = http.Response{ + Body: io.NopCloser(bytes.NewBufferString(`{"nowplaying":{"ignoredMessage":{"code":"0"}}}`)), + StatusCode: 200, + } + + info := ScrobbleInfo{ + artist: "U2", + track: "One", + album: "Achtung Baby", + trackNumber: 1, + duration: 276, + albumArtist: "U2", + } + err := client.updateNowPlaying(context.Background(), "SESSION_KEY", info) + Expect(err).To(BeNil()) + + req := httpClient.SavedRequest + Expect(req.Method).To(Equal(http.MethodPost)) + Expect(req.Header.Get("Content-Type")).To(Equal("application/x-www-form-urlencoded")) + Expect(req.URL.RawQuery).To(BeEmpty()) + + body, _ := io.ReadAll(req.Body) + bodyParams, _ := url.ParseQuery(string(body)) + Expect(bodyParams.Get("method")).To(Equal("track.updateNowPlaying")) + Expect(bodyParams.Get("artist")).To(Equal("U2")) + Expect(bodyParams.Get("track")).To(Equal("One")) + Expect(bodyParams.Get("sk")).To(Equal("SESSION_KEY")) + Expect(bodyParams.Get("api_key")).To(Equal("API_KEY")) + Expect(bodyParams.Get("api_sig")).ToNot(BeEmpty()) + }) + }) + Describe("sign", func() { It("adds an api_sig param with the signature", func() { params := url.Values{} From 63517e904cc8816c2b3005fa213b5e2456d2c1a9 Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 26 Jan 2026 20:31:39 -0500 Subject: [PATCH 06/82] feat(insights): collect ScannerExtractor configuration to measure gotaglib usage Signed-off-by: Deluan --- core/metrics/insights.go | 1 + core/metrics/insights/data.go | 1 + 2 files changed, 2 insertions(+) diff --git a/core/metrics/insights.go b/core/metrics/insights.go index df3ca9a42..f42e5c099 100644 --- a/core/metrics/insights.go +++ b/core/metrics/insights.go @@ -215,6 +215,7 @@ var staticData = sync.OnceValue(func() insights.Data { data.Config.BackupCount = conf.Server.Backup.Count data.Config.DevActivityPanel = conf.Server.DevActivityPanel data.Config.ScannerEnabled = conf.Server.Scanner.Enabled + data.Config.ScannerExtractor = conf.Server.Scanner.Extractor data.Config.ScanSchedule = conf.Server.Scanner.Schedule data.Config.ScanWatcherWait = uint64(math.Trunc(conf.Server.Scanner.WatcherWait.Seconds())) data.Config.ScanOnStartup = conf.Server.Scanner.ScanOnStartup diff --git a/core/metrics/insights/data.go b/core/metrics/insights/data.go index 19007fd06..99eb542a7 100644 --- a/core/metrics/insights/data.go +++ b/core/metrics/insights/data.go @@ -47,6 +47,7 @@ type Data struct { LogFileConfigured bool `json:"logFileConfigured,omitempty"` TLSConfigured bool `json:"tlsConfigured,omitempty"` ScannerEnabled bool `json:"scannerEnabled,omitempty"` + ScannerExtractor string `json:"scannerExtractor,omitempty"` ScanSchedule string `json:"scanSchedule,omitempty"` ScanWatcherWait uint64 `json:"scanWatcherWait,omitempty"` ScanOnStartup bool `json:"scanOnStartup,omitempty"` From 5db585e1b14ab5294b74c71824f77d709b48a98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Tue, 27 Jan 2026 11:12:18 -0500 Subject: [PATCH 07/82] refactor: use duration as a soft ranking signal instead of hard cutoff in track matching (#4944) * refactor: integrate duration into matchScore instead of using pre-filter Duration matching was handled as a binary pre-filter with fallback, inconsistent with how title, specificity, and album are scored via the matchScore system. Move duration into matchScore as a boolean field ranked between title similarity and specificity level, making all match criteria use the same hierarchical comparison. https://claude.ai/code/session_01BWJ5aAzbQRvwjB7PvUcNYs * refactor: remove findBestMatchInTracks function and integrate its logic into findBestMatch Signed-off-by: Deluan * refactor: use duration proximity score instead of boolean match Replace the binary durationMatch bool with a continuous durationProximity float64 (0.0-1.0) using 1/(1+diff). This removes the hard 3-second tolerance cutoff, so closer durations are always preferred over farther ones without an arbitrary cliff edge. https://claude.ai/code/session_01BWJ5aAzbQRvwjB7PvUcNYs * style: fix gofmt alignment in matchScore struct https://claude.ai/code/session_01BWJ5aAzbQRvwjB7PvUcNYs --------- Signed-off-by: Deluan Co-authored-by: Claude --- core/external/provider_matching.go | 73 +++++++++---------------- core/external/provider_matching_test.go | 44 +++++++-------- 2 files changed, 47 insertions(+), 70 deletions(-) diff --git a/core/external/provider_matching.go b/core/external/provider_matching.go index 0bbe4fa35..5d548fb90 100644 --- a/core/external/provider_matching.go +++ b/core/external/provider_matching.go @@ -13,11 +13,6 @@ import ( "github.com/xrash/smetrics" ) -// durationToleranceSec is the maximum allowed difference in seconds when -// matching tracks by duration. A tolerance of 3 seconds accounts for minor -// encoding differences between sources. -const durationToleranceSec = 3 - // matchSongsToLibrary matches agent song results to local library tracks using a multi-phase // matching algorithm that prioritizes accuracy over recall. // @@ -43,14 +38,15 @@ const durationToleranceSec = 3 // via SimilarSongsMatchThreshold, default 85%). Matches are ranked by: // // 1. Title similarity (Jaro-Winkler score, 0.0-1.0) -// 2. Specificity level (0-5, based on metadata precision): +// 2. Duration proximity (closer duration = higher score, 1.0 if unknown) +// 3. Specificity level (0-5, based on metadata precision): // - Level 5: Title + Artist MBID + Album MBID (most specific) // - Level 4: Title + Artist MBID + Album name (fuzzy) // - Level 3: Title + Artist name + Album name (fuzzy) // - Level 2: Title + Artist MBID // - Level 1: Title + Artist name // - Level 0: Title only -// 3. Album similarity (Jaro-Winkler, as final tiebreaker) +// 4. Album similarity (Jaro-Winkler, as final tiebreaker) // // # Examples // @@ -186,17 +182,21 @@ type songQuery struct { // matchScore combines title/album similarity with metadata specificity for ranking matches type matchScore struct { - titleSimilarity float64 // 0.0-1.0 (Jaro-Winkler) - albumSimilarity float64 // 0.0-1.0 (Jaro-Winkler), used as tiebreaker - specificityLevel int // 0-5 (higher = more specific metadata match) + titleSimilarity float64 // 0.0-1.0 (Jaro-Winkler) + durationProximity float64 // 0.0-1.0 (closer duration = higher, 1.0 if unknown) + albumSimilarity float64 // 0.0-1.0 (Jaro-Winkler), used as tiebreaker + specificityLevel int // 0-5 (higher = more specific metadata match) } // betterThan returns true if this score beats another. -// Comparison order: title similarity > specificity level > album similarity +// Comparison order: title similarity > duration proximity > specificity level > album similarity func (s matchScore) betterThan(other matchScore) bool { if s.titleSimilarity != other.titleSimilarity { return s.titleSimilarity > other.titleSimilarity } + if s.durationProximity != other.durationProximity { + return s.durationProximity > other.durationProximity + } if s.specificityLevel != other.specificityLevel { return s.specificityLevel > other.specificityLevel } @@ -289,50 +289,26 @@ func (e *provider) loadTracksByTitleAndArtist(ctx context.Context, songs []agent return matches, nil } -// durationMatches checks if a track's duration is within tolerance of the target duration. -// Returns true if durationMs is 0 (unknown) or if the difference is within durationToleranceSec. -func durationMatches(durationMs uint32, mediaFileDurationSec float32) bool { +// durationProximity returns a score from 0.0 to 1.0 indicating how close +// the track's duration is to the target. A perfect match returns 1.0, and the +// score decreases as the difference grows (using 1 / (1 + diff)). Returns 1.0 +// if durationMs is 0 (unknown), so duration does not influence scoring. +func durationProximity(durationMs uint32, mediaFileDurationSec float32) float64 { if durationMs <= 0 { - return true // Unknown duration matches anything + return 1.0 // Unknown duration — don't penalise } durationSec := float64(durationMs) / 1000.0 diff := math.Abs(durationSec - float64(mediaFileDurationSec)) - return diff <= durationToleranceSec + return 1.0 / (1.0 + diff) } // findBestMatch finds the best matching track using combined title/album similarity and specificity scoring. -// When duration is known (durationMs > 0), it acts as a top-priority filter: -// - First, only tracks with matching duration (±3 seconds) are considered -// - If no title match is found among duration-filtered tracks, falls back to matching all tracks // A track must meet the threshold for title similarity, then the best match is chosen by: // 1. Highest title similarity -// 2. Highest specificity level -// 3. Highest album similarity (as final tiebreaker) +// 2. Duration proximity (closer duration = higher score, 1.0 if unknown) +// 3. Highest specificity level +// 4. Highest album similarity (as final tiebreaker) func (e *provider) findBestMatch(q songQuery, tracks model.MediaFiles, threshold float64) (model.MediaFile, bool) { - // If duration is known, try to find matches among duration-filtered tracks first - if q.durationMs > 0 { - var durationFiltered model.MediaFiles - for _, mf := range tracks { - if durationMatches(q.durationMs, mf.Duration) { - durationFiltered = append(durationFiltered, mf) - } - } - // If we have duration-filtered candidates, try matching those first - if len(durationFiltered) > 0 { - if mf, found := findBestMatchInTracks(q, durationFiltered, threshold); found { - return mf, true - } - } - // Fall through to try all tracks if no duration-filtered match found - } - - return findBestMatchInTracks(q, tracks, threshold) -} - -// findBestMatchInTracks performs the core matching logic on a set of tracks. -// It finds the track with the best combined score based on title similarity, -// specificity level, and album similarity. -func findBestMatchInTracks(q songQuery, tracks model.MediaFiles, threshold float64) (model.MediaFile, bool) { var bestMatch model.MediaFile bestScore := matchScore{titleSimilarity: -1} found := false @@ -353,9 +329,10 @@ func findBestMatchInTracks(q songQuery, tracks model.MediaFiles, threshold float } score := matchScore{ - titleSimilarity: titleSim, - albumSimilarity: albumSim, - specificityLevel: computeSpecificityLevel(q, mf, threshold), + titleSimilarity: titleSim, + durationProximity: durationProximity(q.durationMs, mf.Duration), + albumSimilarity: albumSim, + specificityLevel: computeSpecificityLevel(q, mf, threshold), } if score.betterThan(bestScore) { diff --git a/core/external/provider_matching_test.go b/core/external/provider_matching_test.go index 245209b21..3a902cba3 100644 --- a/core/external/provider_matching_test.go +++ b/core/external/provider_matching_test.go @@ -458,7 +458,7 @@ var _ = Describe("Provider - Song Matching", func() { }) }) - Describe("Duration filtering", func() { + Describe("Duration matching", func() { var track model.MediaFile BeforeEach(func() { @@ -496,48 +496,48 @@ var _ = Describe("Provider - Song Matching", func() { Expect(songs[0].ID).To(Equal("correct")) }) - It("matches within 3-second tolerance", func() { + It("matches tracks with close duration", func() { // Agent returns song with duration 180000ms (180 seconds) returnedSongs := []agents.Song{ {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, } - // Library has track with 182 seconds (within tolerance) - withinTolerance := model.MediaFile{ - ID: "within-tolerance", Title: "Similar Song", Artist: "Test Artist", Duration: 182.5, + // Library has track with 182.5 seconds (close to target) + closeDuration := model.MediaFile{ + ID: "close-duration", Title: "Similar Song", Artist: "Test Artist", Duration: 182.5, } - setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{withinTolerance}) + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{closeDuration}) songs, err := provider.SimilarSongs(ctx, "track-1", 5) Expect(err).ToNot(HaveOccurred()) Expect(songs).To(HaveLen(1)) - Expect(songs[0].ID).To(Equal("within-tolerance")) + Expect(songs[0].ID).To(Equal("close-duration")) }) - It("excludes tracks outside 3-second tolerance when other matches exist", func() { + It("prefers closer duration over farther duration", func() { // Agent returns song with duration 180000ms (180 seconds) returnedSongs := []agents.Song{ {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, } - // Library has one within tolerance, one outside - withinTolerance := model.MediaFile{ - ID: "within", Title: "Similar Song", Artist: "Test Artist", Duration: 181.0, + // Library has one close, one far + closeDuration := model.MediaFile{ + ID: "close", Title: "Similar Song", Artist: "Test Artist", Duration: 181.0, } - outsideTolerance := model.MediaFile{ - ID: "outside", Title: "Similar Song", Artist: "Test Artist", Duration: 190.0, + farDuration := model.MediaFile{ + ID: "far", Title: "Similar Song", Artist: "Test Artist", Duration: 190.0, } - setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{outsideTolerance, withinTolerance}) + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{farDuration, closeDuration}) songs, err := provider.SimilarSongs(ctx, "track-1", 5) Expect(err).ToNot(HaveOccurred()) Expect(songs).To(HaveLen(1)) - Expect(songs[0].ID).To(Equal("within")) + Expect(songs[0].ID).To(Equal("close")) }) - It("falls back to normal matching when no duration matches", func() { + It("still matches when no tracks have matching duration", func() { // Agent returns song with duration 180000ms returnedSongs := []agents.Song{ {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, @@ -552,19 +552,19 @@ var _ = Describe("Provider - Song Matching", func() { songs, err := provider.SimilarSongs(ctx, "track-1", 5) Expect(err).ToNot(HaveOccurred()) - // Should fall back and return the track despite duration mismatch + // Duration mismatch doesn't exclude the track; it's just scored lower Expect(songs).To(HaveLen(1)) Expect(songs[0].ID).To(Equal("different")) }) - It("falls back to title match when duration-filtered tracks fail title threshold", func() { + It("prefers title match over duration match when titles differ", func() { // Agent returns "Similar Song" with duration 180000ms returnedSongs := []agents.Song{ {Name: "Similar Song", Artist: "Test Artist", Duration: 180000}, } // Library has: // - differentTitle: matches duration but has different title (won't pass title threshold) - // - correctTitle: doesn't match duration but has correct title (should be found via fallback) + // - correctTitle: doesn't match duration but has correct title (wins on title similarity) differentTitle := model.MediaFile{ ID: "wrong-title", Title: "Different Song", Artist: "Test Artist", Duration: 180.0, } @@ -577,7 +577,7 @@ var _ = Describe("Provider - Song Matching", func() { songs, err := provider.SimilarSongs(ctx, "track-1", 5) Expect(err).ToNot(HaveOccurred()) - // Should fall back to all tracks and find the title match + // Title similarity is the top priority, so the correct title wins despite duration mismatch Expect(songs).To(HaveLen(1)) Expect(songs[0].ID).To(Equal("correct-title")) }) @@ -605,8 +605,8 @@ var _ = Describe("Provider - Song Matching", func() { }) Context("edge cases", func() { - It("handles very short songs with duration tolerance", func() { - // 30-second song with 1-second difference (within 3-second tolerance) + It("handles very short songs with close duration", func() { + // 30-second song with 1-second difference returnedSongs := []agents.Song{ {Name: "Short Song", Artist: "Test Artist", Duration: 30000}, } From a55c4f04108fab215e64cf8e54cb814531b74923 Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 27 Jan 2026 14:31:23 -0500 Subject: [PATCH 08/82] fix(plugins): log plugin function not implemented and record successful request metrics Signed-off-by: Deluan --- plugins/manager_call.go | 3 ++- plugins/manager_call_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/manager_call.go b/plugins/manager_call.go index 957d552f7..834f45425 100644 --- a/plugins/manager_call.go +++ b/plugins/manager_call.go @@ -72,7 +72,8 @@ func callPluginFunction[I any, O any](ctx context.Context, plugin *plugin, funcN } if exit != 0 { if exit == notImplementedCode { - plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, false, elapsed.Milliseconds()) + log.Trace(ctx, "Plugin function not implemented", "plugin", plugin.name, "function", funcName, "pluginDuration", elapsed, "navidromeDuration", startCall.Sub(start)) + plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, true, elapsed.Milliseconds()) return result, fmt.Errorf("%w: %s", errNotImplemented, funcName) } plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, false, elapsed.Milliseconds()) diff --git a/plugins/manager_call_test.go b/plugins/manager_call_test.go index 742c0e084..32e9df99f 100644 --- a/plugins/manager_call_test.go +++ b/plugins/manager_call_test.go @@ -126,6 +126,6 @@ var _ = Describe("callPluginFunction metrics", Ordered, func() { Expect(calls).To(HaveLen(1)) Expect(calls[0].plugin).To(Equal("partial-metadata-agent")) Expect(calls[0].method).To(Equal(FuncGetArtistMBID)) - Expect(calls[0].ok).To(BeFalse()) + Expect(calls[0].ok).To(BeTrue()) }) }) From 1afcf7775b4f7afbe19875fe8e52e14c95a559d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Tue, 27 Jan 2026 14:54:29 -0500 Subject: [PATCH 09/82] feat: add ISRC matching for similar songs (#4946) * feat: add ISRC support to similar songs matching and plugin interface Add ISRC (International Standard Recording Code) as a high-priority identifier in the provider matching algorithm, alongside MBID. The matching pipeline now uses four strategies in priority order: ID > MBID > ISRC > Title+Artist fuzzy match. - Add ISRC field to agents.Song struct - Add ISRC field to plugin capability SongRef (Go, Rust PDKs) - Add loadTracksByISRC using json_tree query on tags column - Integrate ISRC into matchSongsToLibrary, selectBestMatchingSongs, and buildTitleQueries https://claude.ai/code/session_01Dd4mTq1VQZag4RNjCVusiF * chore: regenerate plugin schema after ISRC addition Run `make gen` to update the generated YAML schema for the metadata agent capability with the new ISRC field on SongRef. https://claude.ai/code/session_01Dd4mTq1VQZag4RNjCVusiF * feat(mediafile): add GetAllByTags method to MediaFileRepository for tag-based retrieval Signed-off-by: Deluan * feat(provider): speed up track matching by incorporating prior matches in ISRC and MBID lookups Signed-off-by: Deluan --------- Signed-off-by: Deluan Co-authored-by: Claude --- core/agents/interfaces.go | 1 + core/external/extdata_helper_test.go | 5 + core/external/provider_matching.go | 102 ++++++++++++++---- model/mediafile.go | 1 + persistence/mediafile_repository.go | 25 +++++ plugins/capabilities/metadata_agent.go | 2 + plugins/capabilities/metadata_agent.yaml | 3 + plugins/metadata_agent.go | 1 + plugins/pdk/go/metadata/metadata.go | 2 + plugins/pdk/go/metadata/metadata_stub.go | 2 + .../rust/nd-pdk-capabilities/src/metadata.rs | 3 + plugins/testdata/test-metadata-agent/main.go | 1 + tests/mock_mediafile_repo.go | 4 + 13 files changed, 133 insertions(+), 19 deletions(-) diff --git a/core/agents/interfaces.go b/core/agents/interfaces.go index 94373ec1a..19df91d02 100644 --- a/core/agents/interfaces.go +++ b/core/agents/interfaces.go @@ -36,6 +36,7 @@ type Song struct { ID string Name string MBID string + ISRC string Artist string ArtistMBID string Album string diff --git a/core/external/extdata_helper_test.go b/core/external/extdata_helper_test.go index f1d92be15..185a568b1 100644 --- a/core/external/extdata_helper_test.go +++ b/core/external/extdata_helper_test.go @@ -92,6 +92,11 @@ func (m *mockMediaFileRepo) Get(id string) (*model.MediaFile, error) { return args.Get(0).(*model.MediaFile), args.Error(1) } +// GetAllByTags implements model.MediaFileRepository. +func (m *mockMediaFileRepo) GetAllByTags(_ model.TagName, _ []string, options ...model.QueryOptions) (model.MediaFiles, error) { + return m.GetAll(options...) +} + // GetAll implements model.MediaFileRepository. func (m *mockMediaFileRepo) GetAll(options ...model.QueryOptions) (model.MediaFiles, error) { argsSlice := make([]interface{}, len(options)) diff --git a/core/external/provider_matching.go b/core/external/provider_matching.go index 5d548fb90..8a6c6a097 100644 --- a/core/external/provider_matching.go +++ b/core/external/provider_matching.go @@ -19,17 +19,18 @@ import ( // # Algorithm Overview // // The algorithm matches songs from external agents (Last.fm, Deezer, etc.) to tracks in the -// local music library using three matching strategies in priority order: +// local music library using four matching strategies in priority order: // // 1. Direct ID match: Songs with an ID field are matched directly to MediaFiles by ID // 2. MusicBrainz Recording ID (MBID) match: Songs with MBID are matched to tracks with // matching mbz_recording_id -// 3. Title+Artist fuzzy match: Remaining songs are matched using fuzzy string comparison +// 3. ISRC match: Songs with ISRC are matched to tracks with matching ISRC tag +// 4. Title+Artist fuzzy match: Remaining songs are matched using fuzzy string comparison // with metadata specificity scoring // // # Matching Priority // -// When selecting the final result, matches are prioritized in order: ID > MBID > Title+Artist. +// When selecting the final result, matches are prioritized in order: ID > MBID > ISRC > Title+Artist. // This ensures that more reliable identifiers take precedence over fuzzy text matching. // // # Fuzzy Matching Details @@ -59,7 +60,16 @@ import ( // ] // Result: t1 (MBID match takes priority over title+artist) // -// Example 2 - Specificity Ranking: +// Example 2 - ISRC Priority: +// +// Agent returns: {Name: "Paranoid Android", ISRC: "GBAYE0000351", Artist: "Radiohead"} +// Library has: [ +// {ID: "t1", Title: "Paranoid Android", Tags: {isrc: ["GBAYE0000351"]}}, +// {ID: "t2", Title: "Paranoid Android", Artist: "Radiohead"}, +// ] +// Result: t1 (ISRC match takes priority over title+artist) +// +// Example 3 - Specificity Ranking: // // Agent returns: {Name: "Enjoy the Silence", Artist: "Depeche Mode", Album: "Violator"} // Library has: [ @@ -68,7 +78,7 @@ import ( // ] // Result: t2 (Level 3 beats Level 1 due to album match) // -// Example 3 - Fuzzy Title Matching: +// Example 4 - Fuzzy Title Matching: // // Agent returns: {Name: "Bohemian Rhapsody", Artist: "Queen"} // Library has: {ID: "t1", Title: "Bohemian Rhapsody - Remastered", Artist: "Queen"} @@ -90,16 +100,36 @@ func (e *provider) matchSongsToLibrary(ctx context.Context, songs []agents.Song, if err != nil { return nil, fmt.Errorf("failed to load tracks by ID: %w", err) } - mbidMatches, err := e.loadTracksByMBID(ctx, songs) + mbidMatches, err := e.loadTracksByMBID(ctx, songs, idMatches) if err != nil { return nil, fmt.Errorf("failed to load tracks by MBID: %w", err) } - titleMatches, err := e.loadTracksByTitleAndArtist(ctx, songs, idMatches, mbidMatches) + isrcMatches, err := e.loadTracksByISRC(ctx, songs, idMatches, mbidMatches) + if err != nil { + return nil, fmt.Errorf("failed to load tracks by ISRC: %w", err) + } + titleMatches, err := e.loadTracksByTitleAndArtist(ctx, songs, idMatches, mbidMatches, isrcMatches) if err != nil { return nil, fmt.Errorf("failed to load tracks by title: %w", err) } - return e.selectBestMatchingSongs(songs, idMatches, mbidMatches, titleMatches, count), nil + return e.selectBestMatchingSongs(songs, idMatches, mbidMatches, isrcMatches, titleMatches, count), nil +} + +// songMatchedIn checks if a song has already been matched in any of the provided match maps. +// It checks the song's ID, MBID, and ISRC fields against the corresponding map keys. +func songMatchedIn(s agents.Song, priorMatches ...map[string]model.MediaFile) bool { + keys := []string{s.ID, s.MBID, s.ISRC} + for _, m := range priorMatches { + for _, key := range keys { + if key != "" { + if mf, ok := m[key]; ok && mf.ID != "" { + return true + } + } + } + } + return false } // loadTracksByID fetches MediaFiles from the library using direct ID matching. @@ -138,10 +168,10 @@ func (e *provider) loadTracksByID(ctx context.Context, songs []agents.Song) (map // It extracts all non-empty MBID fields from the input songs and performs a single // batch query against the mbz_recording_id column. Returns a map keyed by MBID for // O(1) lookup. Only non-missing files are returned. -func (e *provider) loadTracksByMBID(ctx context.Context, songs []agents.Song) (map[string]model.MediaFile, error) { +func (e *provider) loadTracksByMBID(ctx context.Context, songs []agents.Song, priorMatches ...map[string]model.MediaFile) (map[string]model.MediaFile, error) { var mbids []string for _, s := range songs { - if s.MBID != "" { + if s.MBID != "" && !songMatchedIn(s, priorMatches...) { mbids = append(mbids, s.MBID) } } @@ -168,6 +198,37 @@ func (e *provider) loadTracksByMBID(ctx context.Context, songs []agents.Song) (m return matches, nil } +// loadTracksByISRC fetches MediaFiles from the library using ISRC (International Standard +// Recording Code) matching. It extracts all non-empty ISRC fields from the input songs and +// queries the tags JSON column for matching ISRC values. Returns a map keyed by ISRC for +// O(1) lookup. Only non-missing files are returned. +func (e *provider) loadTracksByISRC(ctx context.Context, songs []agents.Song, priorMatches ...map[string]model.MediaFile) (map[string]model.MediaFile, error) { + var isrcs []string + for _, s := range songs { + if s.ISRC != "" && !songMatchedIn(s, priorMatches...) { + isrcs = append(isrcs, s.ISRC) + } + } + matches := map[string]model.MediaFile{} + if len(isrcs) == 0 { + return matches, nil + } + res, err := e.ds.MediaFile(ctx).GetAllByTags(model.TagISRC, isrcs, model.QueryOptions{ + Filters: squirrel.Eq{"missing": false}, + }) + if err != nil { + return matches, err + } + for _, mf := range res { + for _, isrc := range mf.Tags.Values(model.TagISRC) { + if _, ok := matches[isrc]; !ok { + matches[isrc] = mf + } + } + } + return matches, nil +} + // songQuery represents a normalized query for matching a song to library tracks. // All string fields are sanitized (lowercased, diacritics removed) for comparison. // This struct is used internally by loadTracksByTitleAndArtist to group queries by artist. @@ -246,8 +307,8 @@ func computeSpecificityLevel(q songQuery, mf model.MediaFile, albumThreshold flo // Uses a unified scoring approach that combines title similarity (Jaro-Winkler) with // metadata specificity (MBIDs, album names) for both exact and fuzzy matches. // Returns a map keyed by "title|artist" for compatibility with selectBestMatchingSongs. -func (e *provider) loadTracksByTitleAndArtist(ctx context.Context, songs []agents.Song, idMatches, mbidMatches map[string]model.MediaFile) (map[string]model.MediaFile, error) { - queries := e.buildTitleQueries(songs, idMatches, mbidMatches) +func (e *provider) loadTracksByTitleAndArtist(ctx context.Context, songs []agents.Song, priorMatches ...map[string]model.MediaFile) (map[string]model.MediaFile, error) { + queries := e.buildTitleQueries(songs, priorMatches...) if len(queries) == 0 { return map[string]model.MediaFile{}, nil } @@ -344,14 +405,10 @@ func (e *provider) findBestMatch(q songQuery, tracks model.MediaFiles, threshold return bestMatch, found } -func (e *provider) buildTitleQueries(songs []agents.Song, idMatches, mbidMatches map[string]model.MediaFile) []songQuery { +func (e *provider) buildTitleQueries(songs []agents.Song, priorMatches ...map[string]model.MediaFile) []songQuery { var queries []songQuery for _, s := range songs { - // Skip if already matched by ID or MBID - if s.ID != "" && idMatches[s.ID].ID != "" { - continue - } - if s.MBID != "" && mbidMatches[s.MBID].ID != "" { + if songMatchedIn(s, priorMatches...) { continue } queries = append(queries, songQuery{ @@ -366,7 +423,7 @@ func (e *provider) buildTitleQueries(songs []agents.Song, idMatches, mbidMatches return queries } -func (e *provider) selectBestMatchingSongs(songs []agents.Song, byID, byMBID, byTitleArtist map[string]model.MediaFile, count int) model.MediaFiles { +func (e *provider) selectBestMatchingSongs(songs []agents.Song, byID, byMBID, byISRC, byTitleArtist map[string]model.MediaFile, count int) model.MediaFiles { var mfs model.MediaFiles for _, t := range songs { if len(mfs) == count { @@ -386,6 +443,13 @@ func (e *provider) selectBestMatchingSongs(songs []agents.Song, byID, byMBID, by continue } } + // Try ISRC match third + if t.ISRC != "" { + if mf, ok := byISRC[t.ISRC]; ok { + mfs = append(mfs, mf) + continue + } + } // Fall back to title+artist match (composite key preserves duplicate titles) key := str.SanitizeFieldForSorting(t.Name) + "|" + str.SanitizeFieldForSortingNoArticle(t.Artist) if mf, ok := byTitleArtist[key]; ok { diff --git a/model/mediafile.go b/model/mediafile.go index 1ae63e759..1d34cd76e 100644 --- a/model/mediafile.go +++ b/model/mediafile.go @@ -359,6 +359,7 @@ type MediaFileRepository interface { Get(id string) (*MediaFile, error) GetWithParticipants(id string) (*MediaFile, error) GetAll(options ...QueryOptions) (MediaFiles, error) + GetAllByTags(tag TagName, values []string, options ...QueryOptions) (MediaFiles, error) GetCursor(options ...QueryOptions) (MediaFileCursor, error) Delete(id string) error DeleteMissing(ids []string) error diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.go index 9c682369a..2054a34b6 100644 --- a/persistence/mediafile_repository.go +++ b/persistence/mediafile_repository.go @@ -195,6 +195,31 @@ func (r *mediaFileRepository) GetAll(options ...model.QueryOptions) (model.Media return res.toModels(), nil } +func (r *mediaFileRepository) GetAllByTags(tag model.TagName, values []string, options ...model.QueryOptions) (model.MediaFiles, error) { + placeholders := make([]string, len(values)) + args := make([]any, len(values)) + for i, v := range values { + placeholders[i] = "?" + args[i] = v + } + tagFilter := Expr( + fmt.Sprintf("exists (select 1 from json_tree(media_file.tags, '$.%s') where key='value' and value in (%s))", + tag, strings.Join(placeholders, ",")), + args..., + ) + + var opts model.QueryOptions + if len(options) > 0 { + opts = options[0] + } + if opts.Filters != nil { + opts.Filters = And{tagFilter, opts.Filters} + } else { + opts.Filters = tagFilter + } + return r.GetAll(opts) +} + func (r *mediaFileRepository) GetCursor(options ...model.QueryOptions) (model.MediaFileCursor, error) { sq := r.selectMediaFile(options...) cursor, err := queryWithStableResults[dbMediaFile](r.sqlRepository, sq) diff --git a/plugins/capabilities/metadata_agent.go b/plugins/capabilities/metadata_agent.go index 7070637ff..407f21ec5 100644 --- a/plugins/capabilities/metadata_agent.go +++ b/plugins/capabilities/metadata_agent.go @@ -142,6 +142,8 @@ type SongRef struct { Name string `json:"name"` // MBID is the MusicBrainz ID for the song. MBID string `json:"mbid,omitempty"` + // ISRC is the International Standard Recording Code for the song. + ISRC string `json:"isrc,omitempty"` // Artist is the artist name. Artist string `json:"artist,omitempty"` // ArtistMBID is the MusicBrainz artist ID. diff --git a/plugins/capabilities/metadata_agent.yaml b/plugins/capabilities/metadata_agent.yaml index 07ae939e4..4940a5056 100644 --- a/plugins/capabilities/metadata_agent.yaml +++ b/plugins/capabilities/metadata_agent.yaml @@ -343,6 +343,9 @@ components: mbid: type: string description: MBID is the MusicBrainz ID for the song. + isrc: + type: string + description: ISRC is the International Standard Recording Code for the song. artist: type: string description: Artist is the artist name. diff --git a/plugins/metadata_agent.go b/plugins/metadata_agent.go index 67a7e373d..451ef26d1 100644 --- a/plugins/metadata_agent.go +++ b/plugins/metadata_agent.go @@ -230,6 +230,7 @@ func songRefsToAgentSongs(refs []capabilities.SongRef) []agents.Song { ID: s.ID, Name: s.Name, MBID: s.MBID, + ISRC: s.ISRC, Artist: s.Artist, ArtistMBID: s.ArtistMBID, Album: s.Album, diff --git a/plugins/pdk/go/metadata/metadata.go b/plugins/pdk/go/metadata/metadata.go index 46f6da5d8..7cd63865b 100644 --- a/plugins/pdk/go/metadata/metadata.go +++ b/plugins/pdk/go/metadata/metadata.go @@ -171,6 +171,8 @@ type SongRef struct { Name string `json:"name"` // MBID is the MusicBrainz ID for the song. MBID string `json:"mbid,omitempty"` + // ISRC is the International Standard Recording Code for the song. + ISRC string `json:"isrc,omitempty"` // Artist is the artist name. Artist string `json:"artist,omitempty"` // ArtistMBID is the MusicBrainz artist ID. diff --git a/plugins/pdk/go/metadata/metadata_stub.go b/plugins/pdk/go/metadata/metadata_stub.go index 7b0a1109f..bdcd06fcb 100644 --- a/plugins/pdk/go/metadata/metadata_stub.go +++ b/plugins/pdk/go/metadata/metadata_stub.go @@ -168,6 +168,8 @@ type SongRef struct { Name string `json:"name"` // MBID is the MusicBrainz ID for the song. MBID string `json:"mbid,omitempty"` + // ISRC is the International Standard Recording Code for the song. + ISRC string `json:"isrc,omitempty"` // Artist is the artist name. Artist string `json:"artist,omitempty"` // ArtistMBID is the MusicBrainz artist ID. diff --git a/plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs b/plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs index 24ca0b6df..463e52c37 100644 --- a/plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs +++ b/plugins/pdk/rust/nd-pdk-capabilities/src/metadata.rs @@ -242,6 +242,9 @@ pub struct SongRef { /// MBID is the MusicBrainz ID for the song. #[serde(default, skip_serializing_if = "String::is_empty")] pub mbid: String, + /// ISRC is the International Standard Recording Code for the song. + #[serde(default, skip_serializing_if = "String::is_empty")] + pub isrc: String, /// Artist is the artist name. #[serde(default, skip_serializing_if = "String::is_empty")] pub artist: String, diff --git a/plugins/testdata/test-metadata-agent/main.go b/plugins/testdata/test-metadata-agent/main.go index 2ff2a0bd6..23e933eb3 100644 --- a/plugins/testdata/test-metadata-agent/main.go +++ b/plugins/testdata/test-metadata-agent/main.go @@ -134,6 +134,7 @@ func (t *testMetadataAgent) GetSimilarSongsByTrack(input metadata.SimilarSongsBy ID: "similar-track-id-" + strconv.Itoa(i+1), Name: "Similar to " + input.Name + " #" + strconv.Itoa(i+1), MBID: "similar-mbid-" + strconv.Itoa(i+1), + ISRC: "similar-isrc-" + strconv.Itoa(i+1), Artist: input.Artist, ArtistMBID: "artist-mbid-" + strconv.Itoa(i+1), }) diff --git a/tests/mock_mediafile_repo.go b/tests/mock_mediafile_repo.go index 5b38a7187..8542fc8d5 100644 --- a/tests/mock_mediafile_repo.go +++ b/tests/mock_mediafile_repo.go @@ -76,6 +76,10 @@ func (m *MockMediaFileRepo) GetWithParticipants(id string) (*model.MediaFile, er return nil, model.ErrNotFound } +func (m *MockMediaFileRepo) GetAllByTags(_ model.TagName, _ []string, options ...model.QueryOptions) (model.MediaFiles, error) { + return m.GetAll(options...) +} + func (m *MockMediaFileRepo) GetAll(qo ...model.QueryOptions) (model.MediaFiles, error) { if len(qo) > 0 { m.Options = qo[0] From 71f549afbf9f85748dc2096ad5e98effbd9c1600 Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 27 Jan 2026 20:15:58 -0500 Subject: [PATCH 10/82] fix(configuration): ensure default PIDs are set for Album and Track Signed-off-by: Deluan --- conf/configuration.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/configuration.go b/conf/configuration.go index 6b735caf1..6245dbd33 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -1,6 +1,7 @@ package conf import ( + "cmp" "fmt" "net/url" "os" @@ -369,6 +370,10 @@ func Load(noConfigDump bool) { disableExternalServices() } + // Make sure we don't have empty PIDs + Server.PID.Album = cmp.Or(Server.PID.Album, consts.DefaultAlbumPID) + Server.PID.Track = cmp.Or(Server.PID.Track, consts.DefaultTrackPID) + logDeprecatedOptions("Scanner.GenreSeparators", "") logDeprecatedOptions("Scanner.GroupAlbumReleases", "") logDeprecatedOptions("DevEnableBufferedScrobble", "") // Deprecated: Buffered scrobbling is now always enabled and this option is ignored From 77367548f6a255cd5f182b09633e5208b49a5a72 Mon Sep 17 00:00:00 2001 From: Deluan Date: Wed, 28 Jan 2026 12:46:46 -0500 Subject: [PATCH 11/82] fix(artwork): clamp requested square size to original dimensions for cover art, to avoid upscaling Signed-off-by: Deluan --- core/artwork/artwork_internal_test.go | 27 +++++++++++++++++++++++++++ core/artwork/reader_resized.go | 5 +++++ 2 files changed, 32 insertions(+) diff --git a/core/artwork/artwork_internal_test.go b/core/artwork/artwork_internal_test.go index cfb7850bd..c18caf737 100644 --- a/core/artwork/artwork_internal_test.go +++ b/core/artwork/artwork_internal_test.go @@ -302,6 +302,33 @@ var _ = Describe("Artwork", func() { Entry("landscape jpg image", "jpg", true, 200), ) }) + When("Requested size is larger than original", func() { + It("clamps size to original dimensions", func() { + conf.Server.CoverArtPriority = "front.png" + // front.png is 16x16, requesting 99999 should return at original size + r, _, err := aw.Get(context.Background(), alMultipleCovers.CoverArtID(), 99999, false) + Expect(err).ToNot(HaveOccurred()) + + img, _, err := image.Decode(r) + Expect(err).ToNot(HaveOccurred()) + // Should be clamped to original size (16), not 99999 + Expect(img.Bounds().Size().X).To(Equal(16)) + Expect(img.Bounds().Size().Y).To(Equal(16)) + }) + + It("clamps square size to original dimensions", func() { + conf.Server.CoverArtPriority = "front.png" + // front.png is 16x16, requesting 99999 with square should return 16x16 square + r, _, err := aw.Get(context.Background(), alMultipleCovers.CoverArtID(), 99999, true) + Expect(err).ToNot(HaveOccurred()) + + img, _, err := image.Decode(r) + Expect(err).ToNot(HaveOccurred()) + // Should be clamped to original size (16), not 99999 + Expect(img.Bounds().Size().X).To(Equal(16)) + Expect(img.Bounds().Size().Y).To(Equal(16)) + }) + }) }) }) diff --git a/core/artwork/reader_resized.go b/core/artwork/reader_resized.go index 83e6e25c2..6de983baf 100644 --- a/core/artwork/reader_resized.go +++ b/core/artwork/reader_resized.go @@ -87,6 +87,11 @@ func resizeImage(reader io.Reader, size int, square bool) (io.Reader, int, error bounds := original.Bounds() originalSize := max(bounds.Max.X, bounds.Max.Y) + // Clamp size to original dimensions - upscaling wastes resources and adds no information + if size > originalSize { + size = originalSize + } + if originalSize <= size && !square { return nil, originalSize, nil } From c9e58e3666f06fab6ad6ba148cec155b7502ace6 Mon Sep 17 00:00:00 2001 From: Deluan Date: Thu, 29 Jan 2026 12:09:45 -0500 Subject: [PATCH 12/82] feat: enable plugins by default in configuration settings Signed-off-by: Deluan --- conf/configuration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/configuration.go b/conf/configuration.go index 6245dbd33..4c7d636d6 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -640,7 +640,7 @@ func setViperDefaults() { viper.SetDefault("inspect.backloglimit", consts.RequestThrottleBacklogLimit) viper.SetDefault("inspect.backlogtimeout", consts.RequestThrottleBacklogTimeout) viper.SetDefault("plugins.folder", "") - viper.SetDefault("plugins.enabled", false) + viper.SetDefault("plugins.enabled", true) viper.SetDefault("plugins.cachesize", "200MB") viper.SetDefault("plugins.autoreload", false) From 7b523d6b61a2fdffd1585af90a1faafbe7682b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Thu, 29 Jan 2026 13:05:51 -0500 Subject: [PATCH 13/82] feat(agents): support multiple languages for Last.fm and Deezer metadata (#4952) * feat(lastfm): support multiple languages for album and artist info retrieval Signed-off-by: Deluan * fix(lastfm): improve content validation for album and artist descriptions Signed-off-by: Deluan * refactor(lastfm): remove single language test and clarify languages field in configuration Signed-off-by: Deluan * feat(deezer): support multiple languages for artist bio retrieval Signed-off-by: Deluan * refactor(lastfm): rename ignoredBiographies to ignoredContent for clarity Signed-off-by: Deluan --------- Signed-off-by: Deluan --- adapters/deezer/client.go | 10 +- adapters/deezer/client_auth_test.go | 2 +- adapters/deezer/client_test.go | 31 ++-- adapters/deezer/deezer.go | 17 +- adapters/deezer/deezer_test.go | 171 ++++++++++++++++++ adapters/lastfm/agent.go | 94 ++++++---- adapters/lastfm/agent_test.go | 165 ++++++++++++++++- adapters/lastfm/auth_router.go | 2 +- adapters/lastfm/client.go | 13 +- adapters/lastfm/client_test.go | 16 +- conf/configuration.go | 32 +++- conf/configuration_test.go | 26 +++ conf/export_test.go | 2 + consts/consts.go | 2 + tests/fixtures/deezer.artist.bio.empty.json | 10 + tests/fixtures/deezer.artist.bio.en.json | 12 ++ tests/fixtures/deezer.artist.bio.fr.json | 12 ++ tests/fixtures/deezer.artist.bio.json | 9 - .../fixtures/lastfm.album.getinfo.empty.json | 1 + tests/fixtures/lastfm.album.getinfo.en.json | 1 + .../fixtures/lastfm.artist.getinfo.empty.json | 1 + tests/fixtures/lastfm.artist.getinfo.en.json | 1 + 22 files changed, 528 insertions(+), 102 deletions(-) create mode 100644 adapters/deezer/deezer_test.go create mode 100644 tests/fixtures/deezer.artist.bio.empty.json create mode 100644 tests/fixtures/deezer.artist.bio.en.json create mode 100644 tests/fixtures/deezer.artist.bio.fr.json delete mode 100644 tests/fixtures/deezer.artist.bio.json create mode 100644 tests/fixtures/lastfm.album.getinfo.empty.json create mode 100644 tests/fixtures/lastfm.album.getinfo.en.json create mode 100644 tests/fixtures/lastfm.artist.getinfo.empty.json create mode 100644 tests/fixtures/lastfm.artist.getinfo.en.json diff --git a/adapters/deezer/client.go b/adapters/deezer/client.go index 6c97745a3..31150c673 100644 --- a/adapters/deezer/client.go +++ b/adapters/deezer/client.go @@ -29,14 +29,12 @@ type httpDoer interface { type client struct { httpDoer httpDoer - language string jwt jwtToken } -func newClient(hc httpDoer, language string) *client { +func newClient(hc httpDoer) *client { return &client{ httpDoer: hc, - language: language, } } @@ -129,7 +127,7 @@ const pipeAPIURL = "https://pipe.deezer.com/api" var strictPolicy = bluemonday.StrictPolicy() -func (c *client) getArtistBio(ctx context.Context, artistID int) (string, error) { +func (c *client) getArtistBio(ctx context.Context, artistID int, lang string) (string, error) { jwt, err := c.getJWT(ctx) if err != nil { return "", fmt.Errorf("deezer: failed to get JWT: %w", err) @@ -160,10 +158,10 @@ func (c *client) getArtistBio(ctx context.Context, artistID int) (string, error) } req.Header.Set("Content-Type", "application/json") - req.Header.Set("Accept-Language", c.language) + req.Header.Set("Accept-Language", lang) req.Header.Set("Authorization", "Bearer "+jwt) - log.Trace(ctx, "Fetching Deezer artist biography via GraphQL", "artistId", artistID, "language", c.language) + log.Trace(ctx, "Fetching Deezer artist biography via GraphQL", "artistId", artistID, "language", lang) resp, err := c.httpDoer.Do(req) if err != nil { return "", err diff --git a/adapters/deezer/client_auth_test.go b/adapters/deezer/client_auth_test.go index b0c2d195d..915da39b7 100644 --- a/adapters/deezer/client_auth_test.go +++ b/adapters/deezer/client_auth_test.go @@ -21,7 +21,7 @@ var _ = Describe("JWT Authentication", func() { BeforeEach(func() { httpClient = &fakeHttpClient{} - client = newClient(httpClient, "en") + client = newClient(httpClient) ctx = context.Background() }) diff --git a/adapters/deezer/client_test.go b/adapters/deezer/client_test.go index a0e0a5cb1..9fa7afdd9 100644 --- a/adapters/deezer/client_test.go +++ b/adapters/deezer/client_test.go @@ -18,7 +18,7 @@ var _ = Describe("client", func() { BeforeEach(func() { httpClient = &fakeHttpClient{} - client = newClient(httpClient, "en") + client = newClient(httpClient) }) Describe("ArtistImages", func() { @@ -78,40 +78,33 @@ var _ = Describe("client", func() { }) It("returns artist bio from a successful request", func() { - f, err := os.Open("tests/fixtures/deezer.artist.bio.json") + f, err := os.Open("tests/fixtures/deezer.artist.bio.en.json") Expect(err).To(BeNil()) httpClient.mock("https://pipe.deezer.com/api", http.Response{Body: f, StatusCode: 200}) - bio, err := client.getArtistBio(GinkgoT().Context(), 27) + bio, err := client.getArtistBio(GinkgoT().Context(), 27, "en") Expect(err).To(BeNil()) Expect(bio).To(ContainSubstring("Schoolmates Thomas and Guy-Manuel")) Expect(bio).ToNot(ContainSubstring("

")) Expect(bio).ToNot(ContainSubstring("

")) }) - It("uses the configured language", func() { - client = newClient(httpClient, "fr") - // Mock JWT token for the new client instance with a valid JWT - testJWT := createTestJWT(5 * time.Minute) - httpClient.mock("https://auth.deezer.com/login/anonymous", http.Response{ - StatusCode: 200, - Body: io.NopCloser(bytes.NewBufferString(fmt.Sprintf(`{"jwt":"%s","refresh_token":""}`, testJWT))), - }) - f, err := os.Open("tests/fixtures/deezer.artist.bio.json") + It("uses the provided language", func() { + f, err := os.Open("tests/fixtures/deezer.artist.bio.fr.json") Expect(err).To(BeNil()) httpClient.mock("https://pipe.deezer.com/api", http.Response{Body: f, StatusCode: 200}) - _, err = client.getArtistBio(GinkgoT().Context(), 27) + _, err = client.getArtistBio(GinkgoT().Context(), 27, "fr") Expect(err).To(BeNil()) Expect(httpClient.lastRequest.Header.Get("Accept-Language")).To(Equal("fr")) }) It("includes the JWT token in the request", func() { - f, err := os.Open("tests/fixtures/deezer.artist.bio.json") + f, err := os.Open("tests/fixtures/deezer.artist.bio.en.json") Expect(err).To(BeNil()) httpClient.mock("https://pipe.deezer.com/api", http.Response{Body: f, StatusCode: 200}) - _, err = client.getArtistBio(GinkgoT().Context(), 27) + _, err = client.getArtistBio(GinkgoT().Context(), 27, "en") Expect(err).To(BeNil()) // Verify that the Authorization header has the Bearer token format authHeader := httpClient.lastRequest.Header.Get("Authorization") @@ -142,7 +135,7 @@ var _ = Describe("client", func() { Body: io.NopCloser(bytes.NewBufferString(errorResponse)), }) - _, err := client.getArtistBio(GinkgoT().Context(), 999) + _, err := client.getArtistBio(GinkgoT().Context(), 999, "en") Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("GraphQL error")) Expect(err.Error()).To(ContainSubstring("Artist not found")) @@ -164,7 +157,7 @@ var _ = Describe("client", func() { Body: io.NopCloser(bytes.NewBufferString(emptyBioResponse)), }) - _, err := client.getArtistBio(GinkgoT().Context(), 27) + _, err := client.getArtistBio(GinkgoT().Context(), 27, "en") Expect(err).To(MatchError("deezer: biography not found")) }) @@ -174,7 +167,7 @@ var _ = Describe("client", func() { Body: io.NopCloser(bytes.NewBufferString(`{"error":"Internal server error"}`)), }) - _, err := client.getArtistBio(GinkgoT().Context(), 27) + _, err := client.getArtistBio(GinkgoT().Context(), 27, "en") Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("failed to get JWT")) }) @@ -187,7 +180,7 @@ var _ = Describe("client", func() { Body: io.NopCloser(bytes.NewBufferString(fmt.Sprintf(`{"jwt":"%s","refresh_token":""}`, expiredJWT))), }) - _, err := client.getArtistBio(GinkgoT().Context(), 27) + _, err := client.getArtistBio(GinkgoT().Context(), 27, "en") Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("JWT token already expired or expires too soon")) }) diff --git a/adapters/deezer/deezer.go b/adapters/deezer/deezer.go index a6806595e..ed3071766 100644 --- a/adapters/deezer/deezer.go +++ b/adapters/deezer/deezer.go @@ -26,15 +26,19 @@ const deezerArtistSearchLimit = 50 type deezerAgent struct { dataStore model.DataStore client *client + languages []string } func deezerConstructor(dataStore model.DataStore) agents.Interface { - agent := &deezerAgent{dataStore: dataStore} + agent := &deezerAgent{ + dataStore: dataStore, + languages: conf.Server.Deezer.Languages, + } httpClient := &http.Client{ Timeout: consts.DefaultHttpClientTimeOut, } cachedHttpClient := cache.NewHTTPClient(httpClient, consts.DefaultHttpClientTimeOut) - agent.client = newClient(cachedHttpClient, conf.Server.Deezer.Language) + agent.client = newClient(cachedHttpClient) return agent } @@ -149,7 +153,14 @@ func (s *deezerAgent) GetArtistBiography(ctx context.Context, _, name, _ string) return "", err } - return s.client.getArtistBio(ctx, artist.ID) + for _, lang := range s.languages { + bio, err := s.client.getArtistBio(ctx, artist.ID, lang) + if err == nil && bio != "" { + return bio, nil + } + log.Debug(ctx, "Deezer/artist.bio returned empty/error, trying next language", "artist", name, "lang", lang, err) + } + return "", agents.ErrNotFound } func init() { diff --git a/adapters/deezer/deezer_test.go b/adapters/deezer/deezer_test.go new file mode 100644 index 000000000..4dd251585 --- /dev/null +++ b/adapters/deezer/deezer_test.go @@ -0,0 +1,171 @@ +package deezer + +import ( + "bytes" + "context" + "fmt" + "io" + "net/http" + "os" + "time" + + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/conf/configtest" + "github.com/navidrome/navidrome/core/agents" + "github.com/navidrome/navidrome/tests" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("deezerAgent", func() { + var ctx context.Context + + BeforeEach(func() { + ctx = context.Background() + DeferCleanup(configtest.SetupConfig()) + conf.Server.Deezer.Enabled = true + }) + + Describe("deezerConstructor", func() { + It("uses configured languages", func() { + conf.Server.Deezer.Languages = []string{"pt", "en"} + agent := deezerConstructor(&tests.MockDataStore{}).(*deezerAgent) + Expect(agent.languages).To(Equal([]string{"pt", "en"})) + }) + }) + + Describe("GetArtistBiography - Language Fallback", func() { + var agent *deezerAgent + var httpClient *langAwareHttpClient + + BeforeEach(func() { + httpClient = newLangAwareHttpClient() + + // Mock search artist (returns Michael Jackson) + fSearch, _ := os.Open("tests/fixtures/deezer.search.artist.json") + httpClient.searchResponse = &http.Response{Body: fSearch, StatusCode: 200} + + // Mock JWT token + testJWT := createTestJWT(5 * time.Minute) + httpClient.jwtResponse = &http.Response{ + StatusCode: 200, + Body: io.NopCloser(bytes.NewBufferString(fmt.Sprintf(`{"jwt":"%s","refresh_token":""}`, testJWT))), + } + }) + + setupAgent := func(languages []string) { + conf.Server.Deezer.Languages = languages + agent = &deezerAgent{ + dataStore: &tests.MockDataStore{}, + client: newClient(httpClient), + languages: languages, + } + } + + It("returns content in first language when available (1 bio API call)", func() { + setupAgent([]string{"fr", "en"}) + + // French biography available + fFr, _ := os.Open("tests/fixtures/deezer.artist.bio.fr.json") + httpClient.bioResponses["fr"] = &http.Response{Body: fFr, StatusCode: 200} + + bio, err := agent.GetArtistBiography(ctx, "", "Michael Jackson", "") + + Expect(err).ToNot(HaveOccurred()) + Expect(bio).To(ContainSubstring("Guy-Manuel de Homem Christo et Thomas Bangalter")) + Expect(httpClient.bioRequestCount).To(Equal(1)) + Expect(httpClient.bioRequests[0].Header.Get("Accept-Language")).To(Equal("fr")) + }) + + It("falls back to second language when first returns empty (2 bio API calls)", func() { + setupAgent([]string{"ja", "en"}) + + // Japanese returns empty biography + fJa, _ := os.Open("tests/fixtures/deezer.artist.bio.empty.json") + httpClient.bioResponses["ja"] = &http.Response{Body: fJa, StatusCode: 200} + // English returns full biography + fEn, _ := os.Open("tests/fixtures/deezer.artist.bio.en.json") + httpClient.bioResponses["en"] = &http.Response{Body: fEn, StatusCode: 200} + + bio, err := agent.GetArtistBiography(ctx, "", "Michael Jackson", "") + + Expect(err).ToNot(HaveOccurred()) + Expect(bio).To(ContainSubstring("Schoolmates Thomas and Guy-Manuel")) + Expect(httpClient.bioRequestCount).To(Equal(2)) + Expect(httpClient.bioRequests[0].Header.Get("Accept-Language")).To(Equal("ja")) + Expect(httpClient.bioRequests[1].Header.Get("Accept-Language")).To(Equal("en")) + }) + + It("returns ErrNotFound when all languages return empty", func() { + setupAgent([]string{"ja", "xx"}) + + // Both languages return empty biography + fJa, _ := os.Open("tests/fixtures/deezer.artist.bio.empty.json") + httpClient.bioResponses["ja"] = &http.Response{Body: fJa, StatusCode: 200} + fXx, _ := os.Open("tests/fixtures/deezer.artist.bio.empty.json") + httpClient.bioResponses["xx"] = &http.Response{Body: fXx, StatusCode: 200} + + _, err := agent.GetArtistBiography(ctx, "", "Michael Jackson", "") + + Expect(err).To(MatchError(agents.ErrNotFound)) + Expect(httpClient.bioRequestCount).To(Equal(2)) + }) + }) +}) + +// langAwareHttpClient is a mock HTTP client that returns different responses based on the Accept-Language header +type langAwareHttpClient struct { + searchResponse *http.Response + jwtResponse *http.Response + bioResponses map[string]*http.Response + bioRequests []*http.Request + bioRequestCount int +} + +func newLangAwareHttpClient() *langAwareHttpClient { + return &langAwareHttpClient{ + bioResponses: make(map[string]*http.Response), + bioRequests: make([]*http.Request, 0), + } +} + +func (c *langAwareHttpClient) Do(req *http.Request) (*http.Response, error) { + // Handle search artist request + if req.URL.Host == "api.deezer.com" && req.URL.Path == "/search/artist" { + if c.searchResponse != nil { + return c.searchResponse, nil + } + return &http.Response{ + StatusCode: 200, + Body: io.NopCloser(bytes.NewBufferString(`{"data":[],"total":0}`)), + }, nil + } + + // Handle JWT token request + if req.URL.Host == "auth.deezer.com" && req.URL.Path == "/login/anonymous" { + if c.jwtResponse != nil { + return c.jwtResponse, nil + } + return &http.Response{ + StatusCode: 500, + Body: io.NopCloser(bytes.NewBufferString(`{"error":"no mock"}`)), + }, nil + } + + // Handle bio request (GraphQL API) + if req.URL.Host == "pipe.deezer.com" && req.URL.Path == "/api" { + c.bioRequestCount++ + c.bioRequests = append(c.bioRequests, req) + lang := req.Header.Get("Accept-Language") + if resp, ok := c.bioResponses[lang]; ok { + return resp, nil + } + // Return empty bio by default + return &http.Response{ + StatusCode: 200, + Body: io.NopCloser(bytes.NewBufferString(`{"data":{"artist":{"bio":{"full":""}}}}`)), + }, nil + } + + panic("URL not mocked: " + req.URL.String()) +} diff --git a/adapters/lastfm/agent.go b/adapters/lastfm/agent.go index 3677be6e0..6dc635b50 100644 --- a/adapters/lastfm/agent.go +++ b/adapters/lastfm/agent.go @@ -26,8 +26,8 @@ const ( sessionKeyProperty = "LastFMSessionKey" ) -var ignoredBiographies = []string{ - // Unknown Artist +var ignoredContent = []string{ + // Empty Artist/Album `Schoolmates Thomas and Guy-Manuel began their career in 1992 with the indie rock trio Darlin' (named after The Beach Boys song) but were scathingly dismissed by Melody Maker magazine as \"daft punk.\" Turning to house-inspired electronica, they used the put down as a name for their DJ-ing partnership and became a hugely successful and influential dance act. First major single \"Da Funk\" was accompanied by a Spike Jonze-directed video and more success followed with global dance floor anthem \"Around the World,\" \"One More Time,\" and \"Harder, Faster, Better, Stronger\" - which was sampled by Kanye West for his hit \"Stronger.\" Albums Homework (1997), Discovery (2001) and Human After All (2005) all made the UK Top 10 establishing a style of simple, Chicago house-inspired grooves exploding into a robotic, rave sound.

" + } + } + }, + "extensions": { + "queryCost": 3 + } +} diff --git a/tests/fixtures/deezer.artist.bio.fr.json b/tests/fixtures/deezer.artist.bio.fr.json new file mode 100644 index 000000000..435f6fcf0 --- /dev/null +++ b/tests/fixtures/deezer.artist.bio.fr.json @@ -0,0 +1,12 @@ +{ + "data": { + "artist": { + "bio": { + "full": "Guy-Manuel de Homem Christo et Thomas Bangalter se rencontrent en 1987 au lycée Carnot de Paris. Partageant une même passion pour la musique, les deux amis fondent en 1992 Darlin', un groupe de rock influencé par les Stooges et MC5, dont la production sera taxée par un critique de la presse anglaise de «daft punk» (« punk idiot »).
\n
\nDécouragés face à l'apathie du milieu rock, ils décident un peu plus tard de se lancer à corps perdus dans le courant Techno alors en pleine explosion. Arrive alors la découverte de la House, des clubs et des raves, dont une en particulier qui déterminera leur avenir : en 1993 est organisé à EuroDisney une rave où notre duo rencontre les dirigeants du label techno écossais Soma." + } + } + }, + "extensions": { + "queryCost": 3 + } +} diff --git a/tests/fixtures/deezer.artist.bio.json b/tests/fixtures/deezer.artist.bio.json deleted file mode 100644 index 80e439bae..000000000 --- a/tests/fixtures/deezer.artist.bio.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "data": { - "artist": { - "bio": { - "full": "

Schoolmates Thomas and Guy-Manuel began their career in 1992 with the indie rock trio Darlin' (named after The Beach Boys song) but were scathingly dismissed by Melody Maker magazine as \"daft punk.\" Turning to house-inspired electronica, they used the put down as a name for their DJ-ing partnership and became a hugely successful and influential dance act.

" - } - } - } -} diff --git a/tests/fixtures/lastfm.album.getinfo.empty.json b/tests/fixtures/lastfm.album.getinfo.empty.json new file mode 100644 index 000000000..06403ff8c --- /dev/null +++ b/tests/fixtures/lastfm.album.getinfo.empty.json @@ -0,0 +1 @@ +{"album":{"artist":"Legião Urbana","mbid":"1749dd07-5aa9-436e-babc-e3e982deb273","tags":{"tag":[{"url":"https:\/\/www.last.fm\/tag\/rock","name":"rock"},{"url":"https:\/\/www.last.fm\/tag\/80s","name":"80s"},{"url":"https:\/\/www.last.fm\/tag\/brazilian","name":"brazilian"},{"url":"https:\/\/www.last.fm\/tag\/brasil","name":"brasil"},{"url":"https:\/\/www.last.fm\/tag\/brazilian+rock","name":"brazilian rock"}]},"name":"Dois","image":[{"size":"small","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/34s\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"medium","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/64s\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"large","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/174s\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"extralarge","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/300x300\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"mega","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/300x300\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/300x300\/e7dbfc64cde5478484af18f0e30662e0.png"}],"tracks":{"track":[{"streamable":{"fulltrack":"0","#text":"0"},"duration":232,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Daniel+na+Cova+dos+Le%C3%B5es","name":"Daniel na Cova dos Leões","@attr":{"rank":1},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":null,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Quase+Sem+Querer","name":"Quase Sem Querer","@attr":{"rank":2},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":280,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Acrilic+On+Canvas","name":"Acrilic On Canvas","@attr":{"rank":3},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":271,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Eduardo+e+M%C3%B4nica","name":"Eduardo e Mônica","@attr":{"rank":4},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":94,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Central+Do+Brasil","name":"Central Do Brasil","@attr":{"rank":5},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":302,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Tempo+Perdido","name":"Tempo Perdido","@attr":{"rank":6},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":170,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Metr%C3%B3pole","name":"Metrópole","@attr":{"rank":7},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":175,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Plantas+Em+Baixo+Do+Aqu%C3%A1rio","name":"Plantas Em Baixo Do Aquário","@attr":{"rank":8},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":162,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/M%C3%BAsica+urbana+2","name":"Música urbana 2","@attr":{"rank":9},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":184,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Andrea+Doria","name":"Andrea Doria","@attr":{"rank":10},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":231,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/F%C3%A1brica","name":"Fábrica","@attr":{"rank":11},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":258,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/%C3%8Dndios","name":"Índios","@attr":{"rank":12},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}}]},"listeners":"494356","playcount":"9833783","url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois"}} \ No newline at end of file diff --git a/tests/fixtures/lastfm.album.getinfo.en.json b/tests/fixtures/lastfm.album.getinfo.en.json new file mode 100644 index 000000000..f5444f35b --- /dev/null +++ b/tests/fixtures/lastfm.album.getinfo.en.json @@ -0,0 +1 @@ +{"album":{"artist":"Legião Urbana","mbid":"1749dd07-5aa9-436e-babc-e3e982deb273","tags":{"tag":[{"url":"https:\/\/www.last.fm\/tag\/rock","name":"rock"},{"url":"https:\/\/www.last.fm\/tag\/80s","name":"80s"},{"url":"https:\/\/www.last.fm\/tag\/brazilian","name":"brazilian"},{"url":"https:\/\/www.last.fm\/tag\/brasil","name":"brasil"},{"url":"https:\/\/www.last.fm\/tag\/brazilian+rock","name":"brazilian rock"}]},"playcount":"9833783","image":[{"size":"small","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/34s\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"medium","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/64s\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"large","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/174s\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"extralarge","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/300x300\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"mega","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/300x300\/e7dbfc64cde5478484af18f0e30662e0.png"},{"size":"","#text":"https:\/\/lastfm.freetls.fastly.net\/i\/u\/300x300\/e7dbfc64cde5478484af18f0e30662e0.png"}],"tracks":{"track":[{"streamable":{"fulltrack":"0","#text":"0"},"duration":232,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Daniel+na+Cova+dos+Le%C3%B5es","name":"Daniel na Cova dos Leões","@attr":{"rank":1},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":null,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Quase+Sem+Querer","name":"Quase Sem Querer","@attr":{"rank":2},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":280,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Acrilic+On+Canvas","name":"Acrilic On Canvas","@attr":{"rank":3},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":271,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Eduardo+e+M%C3%B4nica","name":"Eduardo e Mônica","@attr":{"rank":4},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":94,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Central+Do+Brasil","name":"Central Do Brasil","@attr":{"rank":5},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":302,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Tempo+Perdido","name":"Tempo Perdido","@attr":{"rank":6},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":170,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Metr%C3%B3pole","name":"Metrópole","@attr":{"rank":7},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":175,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Plantas+Em+Baixo+Do+Aqu%C3%A1rio","name":"Plantas Em Baixo Do Aquário","@attr":{"rank":8},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":162,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/M%C3%BAsica+urbana+2","name":"Música urbana 2","@attr":{"rank":9},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":184,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/Andrea+Doria","name":"Andrea Doria","@attr":{"rank":10},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":231,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/F%C3%A1brica","name":"Fábrica","@attr":{"rank":11},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}},{"streamable":{"fulltrack":"0","#text":"0"},"duration":258,"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois\/%C3%8Dndios","name":"Índios","@attr":{"rank":12},"artist":{"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana","name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99"}}]},"url":"https:\/\/www.last.fm\/music\/Legi%C3%A3o+Urbana\/Dois","name":"Dois","listeners":"494356","wiki":{"published":"10 Oct 2023, 13:56","summary":"Dois é o segundo álbum de estúdio da banda brasileira de rock Legião Urbana, lançado em 20 de julho de 1986 pela EMI. Ocupa a 21ª posição da lista dos 100 maiores discos da música brasileira pela Rolling Stone Brasil. Em setembro de 2012, foi eleito pelo público da rádio Eldorado FM, do portal Estadao.com e do Caderno C2+Música (estes dois últimos pertencentes ao jornal O Estado de S. Paulo) como o terceiro melhor disco brasileiro da história. O álbum vendeu mais de 900 mil cópias no Brasil. \"Tempo Perdido\" fez um grande sucesso e se tornou num dos clássicos Read more on Last.fm<\/a>.","content":"Dois é o segundo álbum de estúdio da banda brasileira de rock Legião Urbana, lançado em 20 de julho de 1986 pela EMI. Ocupa a 21ª posição da lista dos 100 maiores discos da música brasileira pela Rolling Stone Brasil. Em setembro de 2012, foi eleito pelo público da rádio Eldorado FM, do portal Estadao.com e do Caderno C2+Música (estes dois últimos pertencentes ao jornal O Estado de S. Paulo) como o terceiro melhor disco brasileiro da história. O álbum vendeu mais de 900 mil cópias no Brasil. \"Tempo Perdido\" fez um grande sucesso e se tornou num dos clássicos da Legião. \"Eduardo e Mônica\", \"\"Índios\"\" e \"Quase sem Querer\" também fizeram sucesso. Read more on Last.fm<\/a>. User-contributed text is available under the Creative Commons By-SA License; additional terms may apply."}}} \ No newline at end of file diff --git a/tests/fixtures/lastfm.artist.getinfo.empty.json b/tests/fixtures/lastfm.artist.getinfo.empty.json new file mode 100644 index 000000000..015b51701 --- /dev/null +++ b/tests/fixtures/lastfm.artist.getinfo.empty.json @@ -0,0 +1 @@ +{"artist":{"name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99","url":"https://www.last.fm/music/+noredirect/Legi%C3%A3o+Urbana","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}],"streamable":"0","ontour":"0","stats":{"listeners":"740591","playcount":"44493504"},"similar":{"artist":[{"name":"Renato Russo","url":"https://www.last.fm/music/Renato+Russo","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]},{"name":"Engenheiros Do Hawaii","url":"https://www.last.fm/music/Engenheiros+Do+Hawaii","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]},{"name":"Os Paralamas Do Sucesso","url":"https://www.last.fm/music/Os+Paralamas+Do+Sucesso","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]},{"name":"Barão Vermelho","url":"https://www.last.fm/music/Bar%C3%A3o+Vermelho","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]},{"name":"Capital Inicial","url":"https://www.last.fm/music/Capital+Inicial","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]}]},"tags":{"tag":[{"name":"rock","url":"https://www.last.fm/tag/rock"},{"name":"brazilian rock","url":"https://www.last.fm/tag/brazilian+rock"},{"name":"80s","url":"https://www.last.fm/tag/80s"},{"name":"brazilian","url":"https://www.last.fm/tag/brazilian"},{"name":"brasil","url":"https://www.last.fm/tag/brasil"}]},"bio":{"links":{"link":{"#text":"","rel":"original","href":"https://last.fm/music/+noredirect/Legi%C3%A3o+Urbana/+wiki"}},"published":"01 Jan 1970, 00:00","summary":" Read more on Last.fm","content":""}}} \ No newline at end of file diff --git a/tests/fixtures/lastfm.artist.getinfo.en.json b/tests/fixtures/lastfm.artist.getinfo.en.json new file mode 100644 index 000000000..6c643b8e2 --- /dev/null +++ b/tests/fixtures/lastfm.artist.getinfo.en.json @@ -0,0 +1 @@ +{"artist":{"name":"Legião Urbana","mbid":"47685be0-926f-4be9-b1ae-e32da47a3b99","url":"https://www.last.fm/music/+noredirect/Legi%C3%A3o+Urbana","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}],"streamable":"0","ontour":"0","stats":{"listeners":"740367","playcount":"44476703"},"similar":{"artist":[{"name":"Renato Russo","url":"https://www.last.fm/music/Renato+Russo","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]},{"name":"Engenheiros Do Hawaii","url":"https://www.last.fm/music/Engenheiros+Do+Hawaii","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]},{"name":"Os Paralamas Do Sucesso","url":"https://www.last.fm/music/Os+Paralamas+Do+Sucesso","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]},{"name":"Barão Vermelho","url":"https://www.last.fm/music/Bar%C3%A3o+Vermelho","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]},{"name":"Capital Inicial","url":"https://www.last.fm/music/Capital+Inicial","image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},{"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},{"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"mega"},{"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":""}]}]},"tags":{"tag":[{"name":"rock","url":"https://www.last.fm/tag/rock"},{"name":"brazilian rock","url":"https://www.last.fm/tag/brazilian+rock"},{"name":"80s","url":"https://www.last.fm/tag/80s"},{"name":"brazilian","url":"https://www.last.fm/tag/brazilian"},{"name":"brasil","url":"https://www.last.fm/tag/brasil"}]},"bio":{"links":{"link":{"#text":"","rel":"original","href":"https://last.fm/music/+noredirect/Legi%C3%A3o+Urbana/+wiki"}},"published":"03 Mar 2006, 04:04","summary":"Legião Urbana was a Brazilian post-punk band from Brasília, Distrito Federal, Brazil.\n\nFronted by lead singer and lyricist Renato Russo, Legião Urbana was founded in 1983 and existed until 1996, when Renato passed away due to complications caused by AIDS. Besides being the lead vocalist, Renato was an occasional guitar, bass and keyboards player. He also wrote most of the band's songs. In 13 years of career, they released 8 studio albums - the last being posthumous - and one live. Read more on Last.fm","content":"Legião Urbana was a Brazilian post-punk band from Brasília, Distrito Federal, Brazil.\n\nFronted by lead singer and lyricist Renato Russo, Legião Urbana was founded in 1983 and existed until 1996, when Renato passed away due to complications caused by AIDS. Besides being the lead vocalist, Renato was an occasional guitar, bass and keyboards player. He also wrote most of the band's songs. In 13 years of career, they released 8 studio albums - the last being posthumous - and one live.\n\nLegião Urbana is probably the most famous Brazilian rock bands, especially known for Renato's poetic lyrics, which range from love and spiritualism to politics, family, sex and drugs.\n\nNowadays, Dado Villa-Lobos (ex-guitar player of Legião Urbana) has a solo career and recorded his first album, named \"Jardim De Cactus\", in 2005. Drum player Marcelo Bonfá also tried a solo career. Read more on Last.fm. User-contributed text is available under the Creative Commons By-SA License; additional terms may apply."}}} \ No newline at end of file From 4c2bd7509c1b5f3030a77dbb9666b3b3354d2bae Mon Sep 17 00:00:00 2001 From: Deluan Date: Thu, 29 Jan 2026 17:04:10 -0500 Subject: [PATCH 14/82] fix(ui): disable shuffle for instant mix playback Signed-off-by: Deluan --- ui/src/common/SongContextMenu.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/common/SongContextMenu.jsx b/ui/src/common/SongContextMenu.jsx index ce6604f63..ac5b10e13 100644 --- a/ui/src/common/SongContextMenu.jsx +++ b/ui/src/common/SongContextMenu.jsx @@ -96,7 +96,7 @@ export const SongContextMenu = ({ const id = record.mediaFileId || record.id await playSimilar(dispatch, notify, id, { seedRecord: record, - shuffle: true, + shuffle: false, }) } catch (e) { // eslint-disable-next-line no-console From 7d5e13672d588e0195137f909afc2e480e7a9a67 Mon Sep 17 00:00:00 2001 From: Deluan Date: Thu, 29 Jan 2026 17:27:16 -0500 Subject: [PATCH 15/82] refactor(plugins): remove unnecessary configuration permissions from manifest files Signed-off-by: Deluan --- plugins/examples/crypto-ticker/manifest.json | 3 --- plugins/manifest-schema.json | 11 ----------- plugins/manifest_gen.go | 6 ------ 3 files changed, 20 deletions(-) diff --git a/plugins/examples/crypto-ticker/manifest.json b/plugins/examples/crypto-ticker/manifest.json index 59d00cbaa..362fcd0e9 100644 --- a/plugins/examples/crypto-ticker/manifest.json +++ b/plugins/examples/crypto-ticker/manifest.json @@ -60,9 +60,6 @@ } }, "permissions": { - "config": { - "reason": "To read ticker symbols configuration" - }, "scheduler": { "reason": "To schedule reconnection attempts on connection loss" }, diff --git a/plugins/manifest-schema.json b/plugins/manifest-schema.json index 881592c28..4e64ca6ea 100644 --- a/plugins/manifest-schema.json +++ b/plugins/manifest-schema.json @@ -153,17 +153,6 @@ } } }, - "ConfigPermission": { - "type": "object", - "description": "Configuration access permissions for a plugin", - "additionalProperties": false, - "properties": { - "reason": { - "type": "string", - "description": "Explanation for why config access is needed" - } - } - }, "SubsonicAPIPermission": { "type": "object", "description": "SubsonicAPI service permissions. Requires 'users' permission to be declared.", diff --git a/plugins/manifest_gen.go b/plugins/manifest_gen.go index 9762babbf..27c3c0677 100644 --- a/plugins/manifest_gen.go +++ b/plugins/manifest_gen.go @@ -45,12 +45,6 @@ func (j *ConfigDefinition) UnmarshalJSON(value []byte) error { return nil } -// Configuration access permissions for a plugin -type ConfigPermission struct { - // Explanation for why config access is needed - Reason *string `json:"reason,omitempty" yaml:"reason,omitempty" mapstructure:"reason,omitempty"` -} - // Experimental features that may change or be removed in future versions type Experimental struct { // Threads corresponds to the JSON schema field "threads". From 36252823ce1c8c22db19090fa80db3c802f54c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Fri, 30 Jan 2026 15:25:00 +0100 Subject: [PATCH 16/82] fix(agents): deduplicate mismatched songs in similar songs matching (#4956) * feat(agents): enhance song matching by removing unwanted duplicates while preserving identical entries Signed-off-by: Deluan * refactor: consolidate duplicate checks Signed-off-by: Deluan --------- Signed-off-by: Deluan --- core/external/provider_matching.go | 85 ++++++++++----- core/external/provider_matching_test.go | 135 ++++++++++++++++++++++++ 2 files changed, 192 insertions(+), 28 deletions(-) diff --git a/core/external/provider_matching.go b/core/external/provider_matching.go index 8a6c6a097..74ad56d42 100644 --- a/core/external/provider_matching.go +++ b/core/external/provider_matching.go @@ -119,17 +119,24 @@ func (e *provider) matchSongsToLibrary(ctx context.Context, songs []agents.Song, // songMatchedIn checks if a song has already been matched in any of the provided match maps. // It checks the song's ID, MBID, and ISRC fields against the corresponding map keys. func songMatchedIn(s agents.Song, priorMatches ...map[string]model.MediaFile) bool { + _, found := lookupByIdentifiers(s, priorMatches...) + return found +} + +// lookupByIdentifiers searches for a song's identifiers (ID, MBID, ISRC) in the provided maps. +// Returns the first matching MediaFile found and true, or an empty MediaFile and false if no match. +func lookupByIdentifiers(s agents.Song, maps ...map[string]model.MediaFile) (model.MediaFile, bool) { keys := []string{s.ID, s.MBID, s.ISRC} - for _, m := range priorMatches { + for _, m := range maps { for _, key := range keys { if key != "" { if mf, ok := m[key]; ok && mf.ID != "" { - return true + return mf, true } } } } - return false + return model.MediaFile{}, false } // loadTracksByID fetches MediaFiles from the library using direct ID matching. @@ -405,6 +412,9 @@ func (e *provider) findBestMatch(q songQuery, tracks model.MediaFiles, threshold return bestMatch, found } +// buildTitleQueries converts agent songs into normalized songQuery structs for title+artist matching. +// It skips songs that have already been matched in prior phases (by ID, MBID, or ISRC) and sanitizes +// all string fields for consistent comparison (lowercase, diacritics removed, articles stripped from artist names). func (e *provider) buildTitleQueries(songs []agents.Song, priorMatches ...map[string]model.MediaFile) []songQuery { var queries []songQuery for _, s := range songs { @@ -423,42 +433,61 @@ func (e *provider) buildTitleQueries(songs []agents.Song, priorMatches ...map[st return queries } +// selectBestMatchingSongs assembles the final result by mapping input songs to their best matching +// library tracks. It iterates through the input songs in order and selects the first available match +// using priority order: ID > MBID > ISRC > title+artist. +// +// The function also handles deduplication: when multiple different input songs would match the same +// library track (e.g., "Song (Live)" and "Song (Remastered)" both matching "Song (Live)" in the library), +// only the first match is kept. However, if the same input song appears multiple times (intentional +// repetition), duplicates are preserved in the output. +// +// Returns up to 'count' MediaFiles, preserving the input order. Songs that cannot be matched are skipped. func (e *provider) selectBestMatchingSongs(songs []agents.Song, byID, byMBID, byISRC, byTitleArtist map[string]model.MediaFile, count int) model.MediaFiles { - var mfs model.MediaFiles + mfs := make(model.MediaFiles, 0, len(songs)) + // Track MediaFile.ID -> input song that added it, for deduplication + addedBy := make(map[string]agents.Song, len(songs)) + for _, t := range songs { if len(mfs) == count { break } - // Try ID match first - if t.ID != "" { - if mf, ok := byID[t.ID]; ok { - mfs = append(mfs, mf) - continue + + mf, found := findMatchingTrack(t, byID, byMBID, byISRC, byTitleArtist) + if !found { + continue + } + + // Check for duplicate library track + if prevSong, alreadyAdded := addedBy[mf.ID]; alreadyAdded { + // Only add duplicate if input songs are identical + if t != prevSong { + continue // Different input songs → skip mismatch-induced duplicate } + } else { + addedBy[mf.ID] = t } - // Try MBID match second - if t.MBID != "" { - if mf, ok := byMBID[t.MBID]; ok { - mfs = append(mfs, mf) - continue - } - } - // Try ISRC match third - if t.ISRC != "" { - if mf, ok := byISRC[t.ISRC]; ok { - mfs = append(mfs, mf) - continue - } - } - // Fall back to title+artist match (composite key preserves duplicate titles) - key := str.SanitizeFieldForSorting(t.Name) + "|" + str.SanitizeFieldForSortingNoArticle(t.Artist) - if mf, ok := byTitleArtist[key]; ok { - mfs = append(mfs, mf) - } + + mfs = append(mfs, mf) } return mfs } +// findMatchingTrack looks up a song in the match maps using priority order: ID > MBID > ISRC > title+artist. +// Returns the matched MediaFile and true if found, or an empty MediaFile and false if no match exists. +func findMatchingTrack(t agents.Song, byID, byMBID, byISRC, byTitleArtist map[string]model.MediaFile) (model.MediaFile, bool) { + // Try identifier-based matches first (ID, MBID, ISRC) + if mf, found := lookupByIdentifiers(t, byID, byMBID, byISRC); found { + return mf, true + } + // Fall back to title+artist fuzzy match + key := str.SanitizeFieldForSorting(t.Name) + "|" + str.SanitizeFieldForSortingNoArticle(t.Artist) + if mf, ok := byTitleArtist[key]; ok { + return mf, true + } + return model.MediaFile{}, false +} + // similarityRatio calculates the similarity between two strings using Jaro-Winkler algorithm. // Returns a value between 0.0 (completely different) and 1.0 (identical). // Jaro-Winkler is well-suited for matching song titles because it gives higher scores diff --git a/core/external/provider_matching_test.go b/core/external/provider_matching_test.go index 3a902cba3..b3624ef3a 100644 --- a/core/external/provider_matching_test.go +++ b/core/external/provider_matching_test.go @@ -624,4 +624,139 @@ var _ = Describe("Provider - Song Matching", func() { }) }) }) + + Describe("Deduplication of mismatched songs", func() { + var track model.MediaFile + + BeforeEach(func() { + DeferCleanup(configtest.SetupConfig()) + conf.Server.SimilarSongsMatchThreshold = 85 // Allow fuzzy matching + + track = model.MediaFile{ID: "track-1", Title: "Test Track", Artist: "Test Artist"} + + // Setup for GetEntityByID to return the track + artistRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + albumRepo.On("Get", "track-1").Return(nil, model.ErrNotFound).Once() + mediaFileRepo.On("Get", "track-1").Return(&track, nil).Once() + }) + + It("removes duplicates when different input songs match the same library track", func() { + // Agent returns two different versions that will both fuzzy-match to the same library track + returnedSongs := []agents.Song{ + {Name: "Bohemian Rhapsody (Live)", Artist: "Queen"}, + {Name: "Bohemian Rhapsody (Original Mix)", Artist: "Queen"}, + } + // Library only has one version + libraryTrack := model.MediaFile{ + ID: "br-live", Title: "Bohemian Rhapsody (Live)", Artist: "Queen", + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{libraryTrack}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + // Should only return one track, not two duplicates + Expect(songs).To(HaveLen(1)) + Expect(songs[0].ID).To(Equal("br-live")) + }) + + It("preserves duplicates when identical input songs match the same library track", func() { + // Agent returns the exact same song twice (intentional repetition) + returnedSongs := []agents.Song{ + {Name: "Bohemian Rhapsody", Artist: "Queen", Album: "A Night at the Opera"}, + {Name: "Bohemian Rhapsody", Artist: "Queen", Album: "A Night at the Opera"}, + } + // Library has matching track + libraryTrack := model.MediaFile{ + ID: "br", Title: "Bohemian Rhapsody", Artist: "Queen", Album: "A Night at the Opera", + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{libraryTrack}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + // Should return two tracks since input songs were identical + Expect(songs).To(HaveLen(2)) + Expect(songs[0].ID).To(Equal("br")) + Expect(songs[1].ID).To(Equal("br")) + }) + + It("handles mixed scenario with both identical and different input songs", func() { + // Agent returns: Song A, Song B (different from A), Song A again (same as first) + // All three match to the same library track + returnedSongs := []agents.Song{ + {Name: "Yesterday", Artist: "The Beatles", Album: "Help!"}, + {Name: "Yesterday (Remastered)", Artist: "The Beatles", Album: "1"}, // Different version + {Name: "Yesterday", Artist: "The Beatles", Album: "Help!"}, // Same as first + {Name: "Yesterday (Anthology)", Artist: "The Beatles", Album: "Anthology"}, // Another different version + } + // Library only has one version + libraryTrack := model.MediaFile{ + ID: "yesterday", Title: "Yesterday", Artist: "The Beatles", Album: "Help!", + } + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{libraryTrack}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + // Should return 2 tracks: + // 1. First "Yesterday" (original) + // 2. Third "Yesterday" (same as first, so kept) + // Skip: Second "Yesterday (Remastered)" (different input, same library track) + // Skip: Fourth "Yesterday (Anthology)" (different input, same library track) + Expect(songs).To(HaveLen(2)) + Expect(songs[0].ID).To(Equal("yesterday")) + Expect(songs[1].ID).To(Equal("yesterday")) + }) + + It("does not deduplicate songs that match different library tracks", func() { + // Agent returns different songs that match different library tracks + returnedSongs := []agents.Song{ + {Name: "Song A", Artist: "Artist"}, + {Name: "Song B", Artist: "Artist"}, + {Name: "Song C", Artist: "Artist"}, + } + // Library has all three songs + trackA := model.MediaFile{ID: "track-a", Title: "Song A", Artist: "Artist"} + trackB := model.MediaFile{ID: "track-b", Title: "Song B", Artist: "Artist"} + trackC := model.MediaFile{ID: "track-c", Title: "Song C", Artist: "Artist"} + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{trackA, trackB, trackC}) + + songs, err := provider.SimilarSongs(ctx, "track-1", 5) + + Expect(err).ToNot(HaveOccurred()) + // All three should be returned since they match different library tracks + Expect(songs).To(HaveLen(3)) + Expect(songs[0].ID).To(Equal("track-a")) + Expect(songs[1].ID).To(Equal("track-b")) + Expect(songs[2].ID).To(Equal("track-c")) + }) + + It("respects count limit after deduplication", func() { + // Agent returns 4 songs: 2 unique + 2 that would create duplicates + returnedSongs := []agents.Song{ + {Name: "Song A", Artist: "Artist"}, + {Name: "Song A (Live)", Artist: "Artist"}, // Different, matches same track + {Name: "Song B", Artist: "Artist"}, + {Name: "Song B (Remix)", Artist: "Artist"}, // Different, matches same track + } + trackA := model.MediaFile{ID: "track-a", Title: "Song A", Artist: "Artist"} + trackB := model.MediaFile{ID: "track-b", Title: "Song B", Artist: "Artist"} + + setupSimilarSongsExpectations(returnedSongs, model.MediaFiles{trackA, trackB}) + + // Request only 2 songs + songs, err := provider.SimilarSongs(ctx, "track-1", 2) + + Expect(err).ToNot(HaveOccurred()) + // Should return exactly 2: Song A and Song B (skipping duplicates) + Expect(songs).To(HaveLen(2)) + Expect(songs[0].ID).To(Equal("track-a")) + Expect(songs[1].ID).To(Equal("track-b")) + }) + }) }) From f13ca58c98ed6f233f66982226d5649846db0c78 Mon Sep 17 00:00:00 2001 From: Kendall Garner <17521368+kgarner7@users.noreply.github.com> Date: Fri, 30 Jan 2026 14:26:17 +0000 Subject: [PATCH 17/82] fix(plugins): allow using defaults in config form manifest (#4954) --- ui/src/plugin/SchemaConfigEditor.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/plugin/SchemaConfigEditor.jsx b/ui/src/plugin/SchemaConfigEditor.jsx index 096bfeb9a..dc8f8a0f1 100644 --- a/ui/src/plugin/SchemaConfigEditor.jsx +++ b/ui/src/plugin/SchemaConfigEditor.jsx @@ -42,7 +42,7 @@ SchemaErrorBoundary.propTypes = { // params.missingProperty. We transform them to point to the field directly // (e.g., "/users/1/username") so JSONForms displays them under the correct input. const ajv = new Ajv({ - useDefaults: false, + useDefaults: true, allErrors: true, verbose: true, jsonPointers: true, From 84ab652ca751b094e1ae0e5b32d064b7be463881 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sat, 31 Jan 2026 07:24:19 +0100 Subject: [PATCH 18/82] feat: add riscv64 builds (#4949) * ci: add riscv64 builds This requires at least Debian Trixie base systems, and a cross-taglib version with riscv64 release assets. Signed-off-by: MichaIng * fix(makefile): add riscv64 to supported platforms and update cross-taglib version Signed-off-by: Deluan --------- Signed-off-by: MichaIng Signed-off-by: Deluan Co-authored-by: Deluan --- .github/workflows/pipeline.yml | 4 ++-- Dockerfile | 4 ++-- Makefile | 4 ++-- release/goreleaser.yml | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 5c57fdaa5..bb5b0e2ff 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -14,7 +14,7 @@ concurrency: cancel-in-progress: true env: - CROSS_TAGLIB_VERSION: "2.1.1-1" + CROSS_TAGLIB_VERSION: "2.1.1-2" CGO_CFLAGS_ALLOW: "--define-prefix" IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') && 'true' || 'false' }} @@ -193,7 +193,7 @@ jobs: needs: [js, go, go-lint, i18n-lint, git-version, check-push-enabled] strategy: matrix: - platform: [ linux/amd64, linux/arm64, linux/arm/v5, linux/arm/v6, linux/arm/v7, linux/386, darwin/amd64, darwin/arm64, windows/amd64, windows/386 ] + platform: [ linux/amd64, linux/arm64, linux/arm/v5, linux/arm/v6, linux/arm/v7, linux/386, linux/riscv64, darwin/amd64, darwin/arm64, windows/amd64, windows/386 ] runs-on: ubuntu-latest env: IS_LINUX: ${{ startsWith(matrix.platform, 'linux/') && 'true' || 'false' }} diff --git a/Dockerfile b/Dockerfile index 64b1c768a..791854729 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ COPY --from=xx-build /out/ /usr/bin/ ### Get TagLib FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.20 AS taglib-build ARG TARGETPLATFORM -ARG CROSS_TAGLIB_VERSION=2.1.1-1 +ARG CROSS_TAGLIB_VERSION=2.1.1-2 ENV CROSS_TAGLIB_RELEASES_URL=https://github.com/navidrome/cross-taglib/releases/download/v${CROSS_TAGLIB_VERSION}/ # wget in busybox can't follow redirects @@ -63,7 +63,7 @@ COPY --from=ui /build /build ######################################################################################################################## ### Build Navidrome binary -FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.25-bookworm AS base +FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.25-trixie AS base RUN apt-get update && apt-get install -y clang lld COPY --from=xx / / WORKDIR /workspace diff --git a/Makefile b/Makefile index 634d68c06..afeb55b7e 100644 --- a/Makefile +++ b/Makefile @@ -13,13 +13,13 @@ GIT_SHA=source_archive GIT_TAG=$(patsubst navidrome-%,v%,$(notdir $(PWD)))-SNAPSHOT endif -SUPPORTED_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v5,linux/arm/v6,linux/arm/v7,linux/386,darwin/amd64,darwin/arm64,windows/amd64,windows/386 +SUPPORTED_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v5,linux/arm/v6,linux/arm/v7,linux/386,linux/riscv64,darwin/amd64,darwin/arm64,windows/amd64,windows/386 IMAGE_PLATFORMS ?= $(shell echo $(SUPPORTED_PLATFORMS) | tr ',' '\n' | grep "linux" | grep -v "arm/v5" | tr '\n' ',' | sed 's/,$$//') PLATFORMS ?= $(SUPPORTED_PLATFORMS) DOCKER_TAG ?= deluan/navidrome:develop # Taglib version to use in cross-compilation, from https://github.com/navidrome/cross-taglib -CROSS_TAGLIB_VERSION ?= 2.1.1-1 +CROSS_TAGLIB_VERSION ?= 2.1.1-2 GOLANGCI_LINT_VERSION ?= v2.8.0 UI_SRC_FILES := $(shell find ui -type f -not -path "ui/build/*" -not -path "ui/node_modules/*") diff --git a/release/goreleaser.yml b/release/goreleaser.yml index 30c0d6f3b..e5035adda 100644 --- a/release/goreleaser.yml +++ b/release/goreleaser.yml @@ -19,6 +19,7 @@ builds: - linux_arm_v6 - linux_arm_v7 - linux_arm64 + - linux_riscv64 - windows_386 - windows_amd64 From ebbc31f1ab1e063cee143e1fff8c8a727f9d4201 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sun, 1 Feb 2026 16:16:58 +0100 Subject: [PATCH 19/82] fix(scanner): store scan errors in the database and update UI error handling Signed-off-by: Deluan --- scanner/controller.go | 4 +++ scanner/phase_1_folders.go | 2 +- scanner/scanner_multilibrary_test.go | 8 +++++- ui/src/layout/ActivityPanel.jsx | 36 ++++++++++++++++---------- ui/src/layout/ActivityPanel.test.jsx | 38 ++++++++++++++++++++++++---- 5 files changed, 67 insertions(+), 21 deletions(-) diff --git a/scanner/controller.go b/scanner/controller.go index b42246a50..635011840 100644 --- a/scanner/controller.go +++ b/scanner/controller.go @@ -224,6 +224,10 @@ func (s *controller) ScanFolders(requestCtx context.Context, fullScan bool, targ for _, w := range scanWarnings { log.Warn(ctx, fmt.Sprintf("Scan warning: %s", w)) } + // Store scan error in database so it can be displayed in the UI + if scanError != nil { + _ = s.ds.Property(ctx).Put(consts.LastScanErrorKey, scanError.Error()) + } // If changes were detected, send a refresh event to all clients if s.changesDetected { log.Debug(ctx, "Library changes imported. Sending refresh event") diff --git a/scanner/phase_1_folders.go b/scanner/phase_1_folders.go index b493a94d4..38967832c 100644 --- a/scanner/phase_1_folders.go +++ b/scanner/phase_1_folders.go @@ -40,7 +40,7 @@ func createPhaseFolders(ctx context.Context, state *scanState, ds model.DataStor job, err := newScanJob(ctx, ds, cw, lib, state.fullScan, targetFolders) if err != nil { log.Error(ctx, "Scanner: Error creating scan context", "lib", lib.Name, err) - state.sendWarning(err.Error()) + state.sendError(err) continue } jobs = append(jobs, job) diff --git a/scanner/scanner_multilibrary_test.go b/scanner/scanner_multilibrary_test.go index 66db62edf..107e66a99 100644 --- a/scanner/scanner_multilibrary_test.go +++ b/scanner/scanner_multilibrary_test.go @@ -51,8 +51,14 @@ var _ = Describe("Scanner - Multi-Library", Ordered, func() { BeforeEach(func() { DeferCleanup(configtest.SetupConfig()) + conf.Server.MusicFolder = "default:///music" // Use a distinct schema for the default library conf.Server.DevExternalScanner = false + // Register an empty fake storage for the default library + emptyFS := storagetest.FakeFS{} + emptyFS.SetFiles(fstest.MapFS{}) + storagetest.Register("default", &emptyFS) + db.Init(ctx) DeferCleanup(func() { Expect(tests.ClearDB()).To(Succeed()) @@ -770,7 +776,7 @@ var _ = Describe("Scanner - Multi-Library", Ordered, func() { // Second scan should recover and import all rock content warnings, err = s.ScanAll(ctx, true) Expect(err).ToNot(HaveOccurred()) - Expect(warnings).ToNot(BeEmpty(), "Should have warnings for temporary disk error") + Expect(warnings).To(BeEmpty(), "Should have no warnings after error recovery") // Verify both libraries now have content (at least jazz should work) rockFiles, err := ds.MediaFile(ctx).GetAll(model.QueryOptions{ diff --git a/ui/src/layout/ActivityPanel.jsx b/ui/src/layout/ActivityPanel.jsx index 6d5d32d31..085911ed7 100644 --- a/ui/src/layout/ActivityPanel.jsx +++ b/ui/src/layout/ActivityPanel.jsx @@ -15,7 +15,7 @@ import { Typography, } from '@material-ui/core' import { FiActivity } from 'react-icons/fi' -import { BiError } from 'react-icons/bi' +import { BiError, BiMessageError } from 'react-icons/bi' import { VscSync } from 'react-icons/vsc' import { GiMagnifyingGlass } from 'react-icons/gi' import subsonic from '../subsonic' @@ -28,7 +28,12 @@ import config from '../config' const useStyles = makeStyles((theme) => ({ wrapper: { position: 'relative', - color: (props) => (props.up ? null : 'orange'), + color: (props) => + props.serverDown + ? theme.palette.error.main + : props.hasWarning + ? theme.palette.warning.main + : null, }, progress: { color: theme.palette.primary.light, @@ -75,12 +80,10 @@ const ActivityPanel = () => { scanStatus.scanning, scanStatus.elapsedTime, ) - const [acknowledgedError, setAcknowledgedError] = useState(null) - const isErrorVisible = - scanStatus.error && scanStatus.error !== acknowledgedError - const classes = useStyles({ - up: up && (!scanStatus.error || !isErrorVisible), - }) + // Determine icon state: error (server down), warning (scan error), or normal + const serverDown = !up + const hasWarning = Boolean(scanStatus.error) + const classes = useStyles({ serverDown, hasWarning }) const translate = useTranslate() const notify = useNotify() const [anchorEl, setAnchorEl] = useState(null) @@ -88,13 +91,12 @@ const ActivityPanel = () => { useInitialScanStatus() const handleMenuOpen = (event) => { - if (scanStatus.error) { - setAcknowledgedError(scanStatus.error) - } setAnchorEl(event.currentTarget) } - const handleMenuClose = () => setAnchorEl(null) + const handleMenuClose = () => { + setAnchorEl(null) + } const triggerScan = (full) => () => subsonic.startScan({ fullScan: full }) useEffect(() => { @@ -125,8 +127,10 @@ const ActivityPanel = () => {
- {!up || isErrorVisible ? ( + {serverDown ? ( + ) : hasWarning ? ( + ) : ( )} @@ -155,7 +159,11 @@ const ActivityPanel = () => { {translate('activity.serverUptime')}: - + {up ? : translate('activity.serverDown')} diff --git a/ui/src/layout/ActivityPanel.test.jsx b/ui/src/layout/ActivityPanel.test.jsx index c506fd08b..3a951df5d 100644 --- a/ui/src/layout/ActivityPanel.test.jsx +++ b/ui/src/layout/ActivityPanel.test.jsx @@ -43,19 +43,47 @@ describe('', () => { }) }) - it('clears the error icon after opening the panel', () => { + it('shows warning icon when server reports a scan error', () => { render( , ) + // Warning icon should be visible when there's a scan error + expect(screen.getByTestId('activity-warning-icon')).toBeInTheDocument() + + // Open the panel - warning icon should still be visible const button = screen.getByRole('button') - expect(screen.getByTestId('activity-error-icon')).toBeInTheDocument() - fireEvent.click(button) - - expect(screen.getByTestId('activity-ok-icon')).toBeInTheDocument() + expect(screen.getByTestId('activity-warning-icon')).toBeInTheDocument() expect(screen.getByText('Scan failed')).toBeInTheDocument() }) + + it('shows error icon when server is down', () => { + const downStore = createStore( + combineReducers({ activity: activityReducer }), + { + activity: { + scanStatus: { + scanning: false, + folderCount: 0, + count: 0, + error: '', + elapsedTime: 0, + }, + serverStart: { version: config.version, startTime: null }, // null startTime = server down + }, + }, + ) + + render( + + + , + ) + + // Error icon should be visible when server is down + expect(screen.getByTestId('activity-error-icon')).toBeInTheDocument() + }) }) From 7b709899a16ac6a046c01810646a7959b0c7a633 Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 2 Feb 2026 08:59:40 +0100 Subject: [PATCH 20/82] refactor(plugins): simplify websocket callback invocation by creating a generic helper function Signed-off-by: Deluan --- plugins/host_websocket.go | 87 ++++++++------------------------------- 1 file changed, 17 insertions(+), 70 deletions(-) diff --git a/plugins/host_websocket.go b/plugins/host_websocket.go index c4d18c127..7d1b93def 100644 --- a/plugins/host_websocket.go +++ b/plugins/host_websocket.go @@ -324,105 +324,52 @@ func (s *webSocketServiceImpl) readLoop(ctx context.Context, connectionID string } } -func (s *webSocketServiceImpl) invokeOnTextMessage(ctx context.Context, connectionID, message string) { +// invokeWebSocketCallback is a generic helper that handles the common callback invocation pattern. +func invokeWebSocketCallback[I any](ctx context.Context, s *webSocketServiceImpl, funcName string, input I, callbackName string, connectionID string) { instance := s.getPluginInstance() if instance == nil { return } - input := capabilities.OnTextMessageRequest{ - ConnectionID: connectionID, - Message: message, - } - - // Create a timeout context for this callback invocation callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout) defer cancel() start := time.Now() - err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnTextMessage, input) + err := callPluginFunctionNoOutput(callbackCtx, instance, funcName, input) if err != nil { - // Don't log error if function simply doesn't exist (optional callback) if !errors.Is(errFunctionNotFound, err) { - log.Error(ctx, "WebSocket text message callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err) + log.Error(ctx, "WebSocket "+callbackName+" callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err) } } } +func (s *webSocketServiceImpl) invokeOnTextMessage(ctx context.Context, connectionID, message string) { + invokeWebSocketCallback(ctx, s, FuncWebSocketOnTextMessage, capabilities.OnTextMessageRequest{ + ConnectionID: connectionID, + Message: message, + }, "text message", connectionID) +} + func (s *webSocketServiceImpl) invokeOnBinaryMessage(ctx context.Context, connectionID string, data []byte) { - instance := s.getPluginInstance() - if instance == nil { - return - } - - input := capabilities.OnBinaryMessageRequest{ + invokeWebSocketCallback(ctx, s, FuncWebSocketOnBinaryMessage, capabilities.OnBinaryMessageRequest{ ConnectionID: connectionID, Data: base64.StdEncoding.EncodeToString(data), - } - - // Create a timeout context for this callback invocation - callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout) - defer cancel() - - start := time.Now() - err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnBinaryMessage, input) - if err != nil { - // Don't log error if function simply doesn't exist (optional callback) - if !errors.Is(errFunctionNotFound, err) { - log.Error(ctx, "WebSocket binary message callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err) - } - } + }, "binary message", connectionID) } func (s *webSocketServiceImpl) invokeOnError(ctx context.Context, connectionID, errorMsg string) { - instance := s.getPluginInstance() - if instance == nil { - return - } - - input := capabilities.OnErrorRequest{ + invokeWebSocketCallback(ctx, s, FuncWebSocketOnError, capabilities.OnErrorRequest{ ConnectionID: connectionID, Error: errorMsg, - } - - // Create a timeout context for this callback invocation - callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout) - defer cancel() - - start := time.Now() - err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnError, input) - if err != nil { - // Don't log error if function simply doesn't exist (optional callback) - if !errors.Is(errFunctionNotFound, err) { - log.Error(ctx, "WebSocket error callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err) - } - } + }, "error", connectionID) } func (s *webSocketServiceImpl) invokeOnClose(ctx context.Context, connectionID string, code int32, reason string) { - instance := s.getPluginInstance() - if instance == nil { - return - } - - input := capabilities.OnCloseRequest{ + invokeWebSocketCallback(ctx, s, FuncWebSocketOnClose, capabilities.OnCloseRequest{ ConnectionID: connectionID, Code: code, Reason: reason, - } - - // Create a timeout context for this callback invocation - callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout) - defer cancel() - - start := time.Now() - err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnClose, input) - if err != nil { - // Don't log error if function simply doesn't exist (optional callback) - if !errors.Is(errFunctionNotFound, err) { - log.Error(ctx, "WebSocket close callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err) - } - } + }, "close", connectionID) } func (s *webSocketServiceImpl) getPluginInstance() *plugin { From 9bce7677f5e0ff2590f2e940d703160876214224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Mon, 2 Feb 2026 09:05:28 +0100 Subject: [PATCH 21/82] fix(ui): update Bulgarian, Catalan, German, Greek, Spanish, Finnish, French, Galician, Dutch, Polish, Portuguese (BR), Russian, Slovenian, Swedish, Thai translations from POEditor (#4852) Co-authored-by: navidrome-bot --- resources/i18n/bg.json | 85 ++- resources/i18n/ca.json | 1191 +++++++++++++++++++++---------------- resources/i18n/de.json | 83 ++- resources/i18n/el.json | 83 ++- resources/i18n/es.json | 137 ++--- resources/i18n/fi.json | 93 ++- resources/i18n/fr.json | 83 ++- resources/i18n/gl.json | 83 ++- resources/i18n/nl.json | 83 ++- resources/i18n/pl.json | 83 ++- resources/i18n/pt-br.json | 81 ++- resources/i18n/ru.json | 87 ++- resources/i18n/sl.json | 95 ++- resources/i18n/sv.json | 86 ++- resources/i18n/th.json | 83 ++- 15 files changed, 1780 insertions(+), 656 deletions(-) diff --git a/resources/i18n/bg.json b/resources/i18n/bg.json index dfe3f27ed..bce5a3a6e 100644 --- a/resources/i18n/bg.json +++ b/resources/i18n/bg.json @@ -36,7 +36,8 @@ "bitDepth": "Битова дълбочина", "sampleRate": "", "missing": "Липсва", - "libraryName": "" + "libraryName": "", + "composer": "" }, "actions": { "addToQueue": "Пусни по-късно", @@ -46,7 +47,8 @@ "download": "Свали", "playNext": "Следваща", "info": "Информация", - "showInPlaylist": "" + "showInPlaylist": "", + "instantMix": "" } }, "album": { @@ -302,7 +304,7 @@ "scan": "", "manageUsers": "", "viewDetails": "", - "quickScan": "", + "quickScan": "Quick Scan", "fullScan": "" }, "notifications": { @@ -328,6 +330,80 @@ "scanInProgress": "", "noLibrariesAssigned": "" } + }, + "plugin": { + "name": "", + "fields": { + "id": "", + "name": "", + "description": "", + "version": "", + "author": "", + "website": "", + "permissions": "", + "enabled": "", + "status": "", + "path": "", + "lastError": "", + "hasError": "", + "updatedAt": "", + "createdAt": "", + "configKey": "", + "configValue": "", + "allUsers": "", + "selectedUsers": "", + "allLibraries": "", + "selectedLibraries": "" + }, + "sections": { + "status": "", + "info": "", + "configuration": "", + "manifest": "", + "usersPermission": "", + "libraryPermission": "" + }, + "status": { + "enabled": "", + "disabled": "" + }, + "actions": { + "enable": "", + "disable": "", + "disabledDueToError": "", + "disabledUsersRequired": "", + "disabledLibrariesRequired": "", + "addConfig": "", + "rescan": "" + }, + "notifications": { + "enabled": "", + "disabled": "", + "updated": "", + "error": "" + }, + "validation": { + "invalidJson": "" + }, + "messages": { + "configHelp": "", + "clickPermissions": "", + "noConfig": "", + "allUsersHelp": "", + "noUsers": "", + "permissionReason": "", + "usersRequired": "", + "allLibrariesHelp": "", + "noLibraries": "", + "librariesRequired": "", + "requiredHosts": "", + "configValidationError": "", + "schemaRenderError": "" + }, + "placeholders": { + "configKey": "", + "configValue": "" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Премахни всички липсващи файлове", "remove_all_missing_content": "Сигурни ли сте, че желаете да премахнете всички липсващи файлове от базата данни? Това ще премахне завинаги всички препратки към тях, включително броя на възпроизвежданията и оценките им.", "noSimilarSongsFound": "", - "noTopSongsFound": "" + "noTopSongsFound": "", + "startingInstantMix": "" }, "menu": { "library": "Библиотека", diff --git a/resources/i18n/ca.json b/resources/i18n/ca.json index e3e7b544e..a7244b5bd 100644 --- a/resources/i18n/ca.json +++ b/resources/i18n/ca.json @@ -1,518 +1,711 @@ { - "languageName": "Català", - "resources": { - "song": { - "name": "Cançó |||| Cançons", - "fields": { - "albumArtist": "Artista de l'àlbum", - "duration": "Durada", - "trackNumber": "#", - "playCount": "Reproduccions", - "title": "Títol", - "artist": "Artista", - "album": "Àlbum", - "path": "Ruta del fitxer", - "genre": "Gènere", - "compilation": "Compilació", - "year": "Any", - "size": "Mida del fitxer", - "updatedAt": "Actualitzat", - "bitRate": "Taxa de bits", - "bitDepth": "Bits", - "sampleRate": "Freqüencia de mostreig", - "channels": "Canals", - "discSubtitle": "Subtítol del disc", - "starred": "Preferit", - "comment": "Comentari", - "rating": "Valoració", - "quality": "Qualitat", - "bpm": "tempo", - "playDate": "Darrer resproduït", - "createdAt": "Creat el", - "grouping": "Agrupació", - "mood": "Sentiment", - "participants": "Participants", - "tags": "Etiquetes", - "mappedTags": "Etiquetes assignades", - "rawTags": "Etiquetes sense processar" - }, - "actions": { - "addToQueue": "Reprodueix després", - "playNow": "Reprodueix ara", - "addToPlaylist": "Afegeix a la llista", - "shuffleAll": "Aleatori", - "download": "Descarrega", - "playNext": "Reprodueix següent", - "info": "Obtén informació" - } - }, - "album": { - "name": "Àlbum |||| Àlbums", - "fields": { - "albumArtist": "Artista de l'àlbum", - "artist": "Artista", - "duration": "Durada", - "songCount": "Cançons", - "playCount": "Reproduccions", - "size": "Mida", - "name": "Nom", - "genre": "Gènere", - "compilation": "Compilació", - "year": "Any", - "updatedAt": "Actualitzat ", - "comment": "Comentari", - "rating": "Valoració", - "createdAt": "Creat el", - "size": "Mida", - "originalDate": "Original", - "releaseDate": "Publicat", - "releases": "LLançament |||| Llançaments", - "released": "Publicat", - "recordLabel": "Discogràfica", - "catalogNum": "Número de catàleg", - "releaseType": "Tipus de publicació", - "grouping": "Agrupació", - "media": "Mitjà", - "mood": "Sentiment" - }, - "actions": { - "playAll": "Reprodueix", - "playNext": "Reprodueix la següent", - "addToQueue": "Reprodueix després", - "share": "Compartir", - "shuffle": "Aleatori", - "addToPlaylist": "Afegeix a la llista", - "download": "Descarrega", - "info": "Obtén informació" - }, - "lists": { - "all": "Tot", - "random": "Aleatori", - "recentlyAdded": "Afegit fa poc", - "recentlyPlayed": "Reproduït fa poc", - "mostPlayed": "Més reproduït", - "starred": "Preferits", - "topRated": "Més ben valorades" - } - }, - "artist": { - "name": "Artista |||| Artistes", - "fields": { - "name": "Nom", - "albumCount": "Nombre d'àlbums", - "songCount": "Nombre de cançons", - "size": "Mida", - "playCount": "Reproduccions", - "rating": "Valoració", - "genre": "Gènere", - "role": "Rol" - }, - "roles": { - "albumartist": "Artista de l'Àlbum |||| Artistes de l'Àlbum", - "artist": "Artista |||| Artistes", - "composer": "Compositor |||| Compositors", - "conductor": "Conductor |||| Conductors", - "lyricist": "Lletrista |||| Lletristes", - "arranger": "Arranjador |||| Arranjadors", - "producer": "Productor |||| Productors", - "director": "Director |||| Directors", - "engineer": "Enginyer |||| Enginyers", - "mixer": "Mesclador |||| Mescladors", - "remixer": "Remesclador |||| Remescladors", - "djmixer": "DJ Mesclador |||| DJ Mescladors", - "performer": "Intèrpret |||| Intèrprets" - } - }, - "user": { - "name": "Usuari |||| Usuaris", - "fields": { - "userName": "Nom d'usuari", - "isAdmin": "És admin", - "lastLoginAt": "Última connexió", - "lastAccessAt": "Últim Accés", - "updatedAt": "Actualitzat", - "name": "Nom", - "password": "Contrasenya", - "createdAt": "Creat", - "changePassword": "Canviar la contrasenya?", - "currentPassword": "Contrasenya actual", - "newPassword": "Contrasenya nova", - "token": "Token" - }, - "helperTexts": { - "name": "Els canvis en el nom s'hi aplicaran en la següent connexió" - }, - "notifications": { - "created": "Usuari creat", - "updated": "Usuari actualitzat", - "deleted": "Usuari eliminat" - }, - "message": { - "listenBrainzToken": "Introduïu el vostre token d'usuari de ListenBrainz", - "clickHereForToken": "Feu clic ací per a obtenir el vostre token" - } - }, - "player": { - "name": "Reproductor |||| Reproductors", - "fields": { - "name": "Nom", - "transcodingId": "Transcodificador", - "maxBitRate": "Taxa de bits màx.", - "client": "Client", - "userName": "Nom d'usuari", - "lastSeen": "Vist", - "reportRealPath": "Informa de la ruta real", - "scrobbleEnabled": "Activa el seguiment des de serveis externs" - } - }, - "transcoding": { - "name": "Transcodificador |||| Transcodificadors", - "fields": { - "name": "Nom", - "targetFormat": "Format desitjat", - "defaultBitRate": "Taxa de bits per defecte", - "command": "Ordre" - } - }, - "playlist": { - "name": "Llista |||| Llistes", - "fields": { - "name": "Nom", - "duration": "Durada", - "ownerName": "Propietari", - "public": "Públic", - "updatedAt": "Actualitzat ", - "createdAt": "Creat", - "songCount": "Cançons", - "comment": "Comentari", - "sync": "Auto-importació", - "path": "Importa de" - }, - "actions": { - "selectPlaylist": "Selecciona una llista:", - "addNewPlaylist": "Crea \"%{nom}", - "export": "Exporta", - "makePublic": "Fes públic", - "makePrivate": "Fes privat" - }, - "message": { - "duplicate_song": "Afegeix cançons duplicades", - "song_exist": "Heu afegit duplicats a la llista. Voleu afegir-los o ignorar-los?" - } - }, - "radio": { - "name": "Ràdio |||| Ràdios", - "fields": { - "name": "Nom", - "streamUrl": "URL del flux", - "homePageUrl": "URL principal", - "updatedAt": "Actualitzat", - "createdAt": "Creat" - }, - "actions": { - "playNow": "Reprodueix" - } - }, - "share": { - "name": "Compartir |||| Compartits", - "fields": { - "username": "Compartit per", - "url": "URL", - "description": "Descripció", - "downloadable": "Permet descarregar?", - "contents": "Continguts", - "expiresAt": "Caduca", - "lastVisitedAt": "Última Visita", - "visitCount": "Visites", - "format": "Format", - "maxBitRate": "Taxa de bits màx.", - "updatedAt": "Actualitzat", - "createdAt": "Creat" - }, - "notifications": {}, - "actions": {} - }, - "missing": { + "languageName": "Català", + "resources": { + "song": { + "name": "Cançó |||| Cançons", + "fields": { + "albumArtist": "Artista de l'àlbum", + "duration": "Durada", + "trackNumber": "#", + "playCount": "Reproduccions", + "title": "Títol", + "artist": "Artista", + "album": "Àlbum", + "path": "Ruta del fitxer", + "genre": "Gènere", + "compilation": "Compilació", + "year": "Any", + "size": "Mida del fitxer", + "updatedAt": "Actualitzat", + "bitRate": "Taxa de bits", + "discSubtitle": "Subtítol del disc", + "starred": "Preferit", + "comment": "Comentari", + "rating": "Valoració", + "quality": "Qualitat", + "bpm": "tempo", + "playDate": "Darrer resproduït", + "channels": "Canals", + "createdAt": "Data d'addició", + "grouping": "Agrupació", + "mood": "Sentiment", + "participants": "Participants", + "tags": "Etiquetes", + "mappedTags": "Etiquetes assignades", + "rawTags": "Etiquetes sense processar", + "bitDepth": "Bits", + "sampleRate": "Freqüencia de mostreig", + "missing": "Desaparegut", + "libraryName": "Biblioteca", + "composer": "Compositor" + }, + "actions": { + "addToQueue": "Reprodueix després", + "playNow": "Reprodueix ara", + "addToPlaylist": "Afegeix a la llista", + "shuffleAll": "Aleatori", + "download": "Descarrega", + "playNext": "Reprodueix següent", + "info": "Obtén informació", + "showInPlaylist": "Mostra a la llista", + "instantMix": "Mescla immediata" + } + }, + "album": { + "name": "Àlbum |||| Àlbums", + "fields": { + "albumArtist": "Artista de l'àlbum", + "artist": "Artista", + "duration": "Durada", + "songCount": "Cançons", + "playCount": "Reproduccions", + "name": "Nom", + "genre": "Gènere", + "compilation": "Compilació", + "year": "Any", + "updatedAt": "Actualitzat ", + "comment": "Comentari", + "rating": "Valoració", + "createdAt": "Data d'addició", + "size": "Mida", + "originalDate": "Original", + "releaseDate": "Publicat", + "releases": "LLançament |||| Llançaments", + "released": "Publicat", + "recordLabel": "Discogràfica", + "catalogNum": "Número de catàleg", + "releaseType": "Tipus de publicació", + "grouping": "Agrupació", + "media": "Mitjà", + "mood": "Sentiment", + "date": "Data d'enregistrament", + "missing": "Desaparegut", + "libraryName": "Biblioteca" + }, + "actions": { + "playAll": "Reprodueix", + "playNext": "Reprodueix la següent", + "addToQueue": "Reprodueix després", + "shuffle": "Aleatori", + "addToPlaylist": "Afegeix a la llista", + "download": "Descarrega", + "info": "Obtén informació", + "share": "Compartir" + }, + "lists": { + "all": "Tot", + "random": "Aleatori", + "recentlyAdded": "Afegit fa poc", + "recentlyPlayed": "Reproduït fa poc", + "mostPlayed": "Més reproduït", + "starred": "Preferits", + "topRated": "Més ben valorades" + } + }, + "artist": { + "name": "Artista |||| Artistes", + "fields": { + "name": "Nom", + "albumCount": "Nombre d'àlbums", + "songCount": "Nombre de cançons", + "playCount": "Reproduccions", + "rating": "Valoració", + "genre": "Gènere", + "size": "Mida", + "role": "Rol", + "missing": "Desaparegut" + }, + "roles": { + "albumartist": "Artista de l'Àlbum |||| Artistes de l'Àlbum", + "artist": "Artista |||| Artistes", + "composer": "Compositor |||| Compositors", + "conductor": "Conductor |||| Conductors", + "lyricist": "Lletrista |||| Lletristes", + "arranger": "Arranjador |||| Arranjadors", + "producer": "Productor |||| Productors", + "director": "Director |||| Directors", + "engineer": "Enginyer |||| Enginyers", + "mixer": "Mesclador |||| Mescladors", + "remixer": "Remesclador |||| Remescladors", + "djmixer": "DJ Mesclador |||| DJ Mescladors", + "performer": "Intèrpret |||| Intèrprets", + "maincredit": "Artista de l'àlbum or Artista |||| Artistes de l'àlbum or Artistes" + }, + "actions": { + "shuffle": "Barreja", + "radio": "Ràdio", + "topSongs": "Cançons populars" + } + }, + "user": { + "name": "Usuari |||| Usuaris", + "fields": { + "userName": "Nom d'usuari", + "isAdmin": "És admin", + "lastLoginAt": "Última connexió", + "updatedAt": "Actualitzat", + "name": "Nom", + "password": "Contrasenya", + "createdAt": "Creat", + "changePassword": "Canviar la contrasenya?", + "currentPassword": "Contrasenya actual", + "newPassword": "Contrasenya nova", + "token": "Token", + "lastAccessAt": "Últim accés", + "libraries": "Biblioteques" + }, + "helperTexts": { + "name": "Els canvis en el nom s'hi aplicaran en la següent connexió", + "libraries": "Seleccioneu biblioteques específiques per a aquest usuari o deixeu-ho buit per utilitzar les biblioteques predeterminades" + }, + "notifications": { + "created": "Usuari creat", + "updated": "Usuari actualitzat", + "deleted": "Usuari eliminat" + }, + "message": { + "listenBrainzToken": "Introduïu el vostre token d'usuari de ListenBrainz", + "clickHereForToken": "Feu clic ací per a obtenir el vostre token", + "selectAllLibraries": "Selecciona totes les biblioteques", + "adminAutoLibraries": "Els administradors tenen accés a totes les biblioteques automàticament" + }, + "validation": { + "librariesRequired": "Cal que trieu almenys una biblioteca per als usuaris que no siguin administradors" + } + }, + "player": { + "name": "Reproductor |||| Reproductors", + "fields": { + "name": "Nom", + "transcodingId": "Transcodificador", + "maxBitRate": "Taxa de bits màx.", + "client": "Client", + "userName": "Nom d'usuari", + "lastSeen": "Vist", + "reportRealPath": "Informa de la ruta real", + "scrobbleEnabled": "Activa el seguiment des de serveis externs" + } + }, + "transcoding": { + "name": "Transcodificador |||| Transcodificadors", + "fields": { + "name": "Nom", + "targetFormat": "Format desitjat", + "defaultBitRate": "Taxa de bits per defecte", + "command": "Ordre" + } + }, + "playlist": { + "name": "Llista |||| Llistes", + "fields": { + "name": "Nom", + "duration": "Durada", + "ownerName": "Propietari", + "public": "Públic", + "updatedAt": "Actualitzat ", + "createdAt": "Creat", + "songCount": "Cançons", + "comment": "Comentari", + "sync": "Auto-importació", + "path": "Importa de" + }, + "actions": { + "selectPlaylist": "Selecciona una llista:", + "addNewPlaylist": "Crea \"%{nom}", + "export": "Exporta", + "makePublic": "Fes públic", + "makePrivate": "Fes privat", + "saveQueue": "Desar la cua a una llista", + "searchOrCreate": "Cerca llistes o escriu per crear-ne de noves...", + "pressEnterToCreate": "Prem Retorn per crear una nova llista", + "removeFromSelection": "Elimina de la selecció" + }, + "message": { + "duplicate_song": "Afegeix cançons duplicades", + "song_exist": "Heu afegit duplicats a la llista. Voleu afegir-los o ignorar-los?", + "noPlaylistsFound": "No s'ha trobat cap llista", + "noPlaylists": "No hi ha cap llista disponible" + } + }, + "radio": { + "name": "Ràdio |||| Ràdios", + "fields": { + "name": "Nom", + "streamUrl": "URL del flux", + "homePageUrl": "URL principal", + "updatedAt": "Actualitzat", + "createdAt": "Creat" + }, + "actions": { + "playNow": "Reprodueix" + } + }, + "share": { + "name": "Compartir |||| Compartits", + "fields": { + "username": "Compartit per", + "url": "URL", + "description": "Descripció", + "contents": "Continguts", + "expiresAt": "Caduca", + "lastVisitedAt": "Última Visita", + "visitCount": "Visites", + "format": "Format", + "maxBitRate": "Taxa de bits màx.", + "updatedAt": "Actualitzat", + "createdAt": "Creat", + "downloadable": "Permet descarregar?" + } + }, + "missing": { "name": "Fitxer faltant |||| Fitxers Faltants", - "empty": "No falten fitxers", "fields": { "path": "Directori", "size": "Mida", - "updatedAt": "Desaparegut" + "updatedAt": "Desaparegut", + "libraryName": "Biblioteca" }, "actions": { - "remove": "Eliminar" + "remove": "Eliminar", + "remove_all": "Suprimeix-ho tot" }, "notifications": { "removed": "Fitxers faltants eliminats" + }, + "empty": "No falten fitxers" + }, + "library": { + "name": "Biblioteca |||| Biblioteques\n", + "fields": { + "name": "Nom", + "path": "Camí", + "remotePath": "Camí remot", + "lastScanAt": "Últim escaneig", + "songCount": "Cançons", + "albumCount": "Àlbums", + "artistCount": "Artistes", + "totalSongs": "Cançons", + "totalAlbums": "Àlbums", + "totalArtists": "Artistes", + "totalFolders": "Carpetes", + "totalFiles": "Fitxers", + "totalMissingFiles": "Fitxers desapareguts", + "totalSize": "Mida total", + "totalDuration": "Durada", + "defaultNewUsers": "Predeterminat per a usuaris nous", + "createdAt": "Creat", + "updatedAt": "Actualitzat" + }, + "sections": { + "basic": "Informació bàsica", + "statistics": "Estadístiques" + }, + "actions": { + "scan": "Escaneja la biblioteca", + "manageUsers": "Gestiona l'accés d'usuari", + "viewDetails": "Mostra els detalls", + "quickScan": "Escaneig ràpid", + "fullScan": "Escaneig complet" + }, + "notifications": { + "created": "La biblioteca s'ha creat correctament", + "updated": "La biblioteca s'ha actualitzat correctament", + "deleted": "La biblioteca s'ha suprimit correctament", + "scanStarted": "Començant l'escaneig de la biblioteca", + "scanCompleted": "S'ha completat l'escaneig de la biblioteca", + "quickScanStarted": "Començant escaneig ràpid", + "fullScanStarted": "Començant escaneig complet", + "scanError": "S'ha produït un error en començar l'escaneig. Comproveu els registres" + }, + "validation": { + "nameRequired": "Es requereix un nom per la biblioteca", + "pathRequired": "Es requereix un camí a la biblioteca", + "pathNotDirectory": "El camí a la biblioteca ha de ser un directori", + "pathNotFound": "No s'ha trobat el camí a la biblioteca", + "pathNotAccessible": "No es pot accedir al camí de la biblioteca ", + "pathInvalid": "Camí a la llibreria no vàlid" + }, + "messages": { + "deleteConfirm": "Esteu segur que voleu suprimir aquesta biblioteca? Se'n suprimiran totes les dades associades i els accessos d'usuari.", + "scanInProgress": "Escaneig en curs...", + "noLibrariesAssigned": "Aquest usuari no té cap biblioteca assignada" + } + }, + "plugin": { + "name": "\nConnector |||| Connectors", + "fields": { + "id": "ID", + "name": "Nom", + "description": "Descripció", + "version": "Versió", + "author": "Autor", + "website": "Lloc web", + "permissions": "Permissos", + "enabled": "Activat", + "status": "Estat", + "path": "Camí", + "lastError": "Error", + "hasError": "Error", + "updatedAt": "Actualitzat", + "createdAt": "Instal·lat", + "configKey": "Clau", + "configValue": "Valor", + "allUsers": "Permet tots els usuaris", + "selectedUsers": "Usuaris seleccionats", + "allLibraries": "Permet totes les llibreries", + "selectedLibraries": "Biblioteques seleccionades" + }, + "sections": { + "status": "Estat", + "info": "Informació del controlador", + "configuration": "Configuració", + "manifest": "Manifest", + "usersPermission": "Permís dels usuaris", + "libraryPermission": "Permís de la llibreria" + }, + "status": { + "enabled": "Activat", + "disabled": "Desactivat" + }, + "actions": { + "enable": "Activa", + "disable": "Desactiva", + "disabledDueToError": "Arregleu l'error abans de l'activació", + "disabledUsersRequired": "Seleccioneu els usuaris abans de l'activació", + "disabledLibrariesRequired": "Seleccioneu les biblioteques abans de l'activació", + "addConfig": "Afegeix una configuració", + "rescan": "Torna a escanejar" + }, + "notifications": { + "enabled": "Controlador activat", + "disabled": "Controlador desactivat", + "updated": "Controlador activat", + "error": "S'ha produït un error en actualitzar el controlador" + }, + "validation": { + "invalidJson": "El fitxer Configuració ha de ser un JSON vàlid" + }, + "messages": { + "configHelp": "Configureu el controlador utilitzant parelles clau-valor. Deixeu-ho buit si el controlador no requereix cap configuració.", + "clickPermissions": "Feu clic en un permís per veure’n els detalls", + "noConfig": "No s'ha establert cap configuració", + "allUsersHelp": "Quan està activat, el controlador té accés a tots els usuaris, inclosos els creats a posteriori.", + "noUsers": "No s'ha seleccionat cap usuari", + "permissionReason": "Motiu", + "usersRequired": "Aquest controlador necessita accedir a la informació de la biblioteca. Selecciona a quines biblioteques pot accedir o activa «Permet tots els usuaris».", + "allLibrariesHelp": "Quan està activat, el controlador té accés a totes les llibreries, incloses les creades a posteriori.", + "noLibraries": "No s'ha seleccionat cap biblioteca", + "librariesRequired": "Aquest controlador necessita accedir a la informació de la biblioteca. Selecciona a quines biblioteques pot accedir o activa «Permet totes les biblioteques».", + "requiredHosts": "Hosts requerits", + "configValidationError": "Ha fallat la validació de la configuració:", + "schemaRenderError": "No s'ha pogut renderitzar el formulari de configuració. És possible que l'esquema del controlador sigui invàlid." + }, + "placeholders": { + "configKey": "clau", + "configValue": "valor" } } }, - "ra": { - "auth": { - "welcome1": "Gràcies d'haver instal·lat Navidrome!", - "welcome2": "Per a començar, creeu un usuari administrador", - "confirmPassword": "Confirmeu la contrasenya", - "buttonCreateAdmin": "Crea un administrador", - "auth_check_error": "Si us plau, inicieu sessió per a continuar", - "user_menu": "Perfil", - "username": "Nom d'usuari", - "password": "Contrasenya", - "sign_in": "Inicia sessió", - "sign_in_error": "L'autenticació ha fallat, torneu-ho a intentar", - "logout": "Sortida", - "insightsCollectionNote": "Navidrome recull dades d'us anonimitzades per\najudar a millorar el projecte. Clica [aquí] per a saber-ne\nmés i no participar-hi si no vols" - }, - "validation": { - "invalidChars": "Si us plau, useu només lletres i nombres", - "passwordDoesNotMatch": "Les contrasenyes no coincideixen", - "required": "Obligatori", - "minLength": "Ha de tenir, si més no, %{min} caràcters", - "maxLength": "Ha de tenir %{max} caràcters o menys", - "minValue": "Ha de ser com a mínim %{min}", - "maxValue": "Ha de ser %{max} o menys", - "number": "Ha de ser un nombre", - "email": "Ha de ser un correu vàlid", - "oneOf": "Ha de ser un de: %{options}", - "regex": "Ha de tenir el format (regexp): %{pattern}", - "unique": "Ha de ser únic", - "url": "Ha de ser una URL vàlida" - }, - "action": { - "add_filter": "Afegeix un filtre", - "add": "Afegeix", - "back": "Enrere", - "bulk_actions": "1 element seleccionat |||| %{smart_count} elements seleccionats", - "bulk_actions_mobile": "1 |||| %{smart_count}", - "cancel": "Cancel·la", - "clear_input_value": "Neteja el valor", - "clone": "Clona", - "confirm": "Confirma", - "create": "Crea", - "delete": "Suprimeix", - "edit": "Edita", - "export": "Exporta", - "list": "Llista", - "refresh": "Refresca", - "remove_filter": "Suprimeix aquest filtre", - "remove": "Elimina", - "save": "Desa", - "search": "Cerca", - "show": "Mostra", - "sort": "Ordena", - "undo": "Desfés", - "expand": "Expandeix", - "close": "Tanca", - "open_menu": "Obre el menú", - "close_menu": "Tanca el menú", - "unselect": "Anul·la la selecció", - "skip": "Omet", - "share": "Compartir", - "download": "Descarregar" - }, - "boolean": { - "true": "Sí", - "false": "No" - }, - "page": { - "create": "Crea %{nom}", - "dashboard": "Tauler", - "edit": "%{name} #%{id}", - "error": "Alguna cosa ha fallat", - "list": "%{name}", - "loading": "Ara es carrega", - "not_found": "No s'ha trobat", - "show": "%{name} #%{id}", - "empty": "No hi ha %{name} encara.", - "invite": "Voleu afegir-ne una?" - }, - "input": { - "file": { - "upload_several": "Deixeu caure-hi fitxers per a carregar-los o feu clic per a seleccionar-ne un.", - "upload_single": "Deixeu caure-hi un fitxer per a carregar o feu clic per a seleccionar-lo." - }, - "image": { - "upload_several": "Deixeu caure-hi imatges per a carregar-les o feu clic per a seleccionar-ne una.", - "upload_single": "Deixeu caure-hi una imatge per a carregar-la o feu clic per a seleccionar-la." - }, - "references": { - "all_missing": "No ha estat possible trobar les dades de referència.", - "many_missing": "Sembla que almenys una de les referències associades ja no està disponible.", - "single_missing": "Sembla que la referència associada ja no està disponible." - }, - "password": { - "toggle_visible": "Amaga la contrasenya", - "toggle_hidden": "Mostra la contrasenya" - } - }, - "message": { - "about": "Quant a...", - "are_you_sure": "N'esteu segur?", - "bulk_delete_content": "Voleu eliminar aquest %{name}? |||| Voleu eliminar aquests %{smart_count} element?\n", - "bulk_delete_title": "Esborra %{name} |||| Esborra %{smart_count} %{name}", - "delete_content": "Segur que voleu eliminar aquest element?", - "delete_title": "Elimina %{name} #%{id}", - "details": "Detalls", - "error": "S'ha produït un error en un client i la vostra sol·licitud no ha pogut ser completada.", - "invalid_form": "El formulari no és vàlid.", - "loading": "La pàgina es carrega, un moment si us plau.", - "no": "No", - "not_found": "La URL és incorrecta o heu seguit un enllaç erroni.", - "yes": "Sí", - "unsaved_changes": "Alguns canvis no s'hi han desat. Segur que voleu ignorar-los?" - }, - "navigation": { - "no_results": "No s'ha trobat", - "no_more_results": "La pàgina número %{page} no existeix. Proveu l'anterior.", - "page_out_of_boundaries": "La pàgina número %{page} no existeix", - "page_out_from_end": "No podeu anar més enllà de la darrera pàgina", - "page_out_from_begin": "No podeu anar més enllà de la primera pàgina", - "page_range_info": "%{offsetBegin}-%{offsetEnd} de %{total}", - "page_rows_per_page": "Elements per pàgina:", - "next": "Següent", - "prev": "Anterior", - "skip_nav": "Salta al contingut" - }, - "notification": { - "updated": "Element actualitzat |||| %{smart_count} elements actualitzats", - "created": "Element creat", - "deleted": "Element actualitzat |||| %{smart_count} elements actualitzats", - "bad_item": "Element incorrecte", - "item_doesnt_exist": "L'element no existeix", - "http_error": "Error de comunicació del servidor", - "data_provider_error": "dataProvider error. Vegeu la consola si en voleu més detalls.", - "i18n_error": "No ha estat possible carregar les traduccions per a l'idioma indicat", - "canceled": "Acció cancel·lada", - "logged_out": "La sessió ha acabat, si us plau reconnecteu", - "new_version": "Hi ha una versió nova disponible! Si us plau actualitzeu aquesta finestra." - }, - "toggleFieldsMenu": { - "columnsToDisplay": "Columnes a mostrar", - "layout": "Disposició", - "grid": "Quadrícula", - "table": "Taula" - } + "ra": { + "auth": { + "welcome1": "Gràcies d'haver instal·lat Navidrome!", + "welcome2": "Per a començar, creeu un usuari administrador", + "confirmPassword": "Confirmeu la contrasenya", + "buttonCreateAdmin": "Crea un administrador", + "auth_check_error": "Si us plau, inicieu sessió per a continuar", + "user_menu": "Perfil", + "username": "Nom d'usuari", + "password": "Contrasenya", + "sign_in": "Inicia sessió", + "sign_in_error": "L'autenticació ha fallat, torneu-ho a intentar", + "logout": "Sortida", + "insightsCollectionNote": "Navidrome recull dades d'us anonimitzades per\najudar a millorar el projecte. Clica [aquí] per a saber-ne\nmés i no participar-hi si no vols" + }, + "validation": { + "invalidChars": "Si us plau, utilitzeu només lletres i nombres", + "passwordDoesNotMatch": "Les contrasenyes no coincideixen", + "required": "Obligatori", + "minLength": "Ha de tenir, si més no, %{min} caràcters", + "maxLength": "Ha de tenir %{max} caràcters o menys", + "minValue": "Ha de ser com a mínim %{min}", + "maxValue": "Ha de ser %{max} o menys", + "number": "Ha de ser un nombre", + "email": "Ha de ser un correu vàlid", + "oneOf": "Ha de ser un de: %{options}", + "regex": "Ha de tenir el format (regexp): %{pattern}", + "unique": "Ha de ser únic", + "url": "Ha de ser una URL vàlida" + }, + "action": { + "add_filter": "Afegeix un filtre", + "add": "Afegeix", + "back": "Enrere", + "bulk_actions": "1 element seleccionat |||| %{smart_count} elements seleccionats", + "cancel": "Cancel·la", + "clear_input_value": "Neteja el valor", + "clone": "Clona", + "confirm": "Confirma", + "create": "Crea", + "delete": "Suprimeix", + "edit": "Edita", + "export": "Exporta", + "list": "Llista", + "refresh": "Refresca", + "remove_filter": "Suprimeix aquest filtre", + "remove": "Elimina", + "save": "Desa", + "search": "Cerca", + "show": "Mostra", + "sort": "Ordena", + "undo": "Desfés", + "expand": "Expandeix", + "close": "Tanca", + "open_menu": "Obre el menú", + "close_menu": "Tanca el menú", + "unselect": "Anul·la la selecció", + "skip": "Omet", + "bulk_actions_mobile": "1 |||| %{smart_count}", + "share": "Compartir", + "download": "Descarregar" + }, + "boolean": { + "true": "Sí", + "false": "No" + }, + "page": { + "create": "Crea %{nom}", + "dashboard": "Tauler", + "edit": "%{name} #%{id}", + "error": "Alguna cosa ha fallat", + "list": "%{name}", + "loading": "Ara es carrega", + "not_found": "No s'ha trobat", + "show": "%{name} #%{id}", + "empty": "No hi ha %{name} encara.", + "invite": "Voleu afegir-ne una?" + }, + "input": { + "file": { + "upload_several": "Deixeu caure-hi fitxers per a carregar-los o feu clic per a seleccionar-ne un.", + "upload_single": "Deixeu caure-hi un fitxer per a carregar o feu clic per a seleccionar-lo." + }, + "image": { + "upload_several": "Deixeu caure-hi imatges per a carregar-les o feu clic per a seleccionar-ne una.", + "upload_single": "Deixeu caure-hi una imatge per a carregar-la o feu clic per a seleccionar-la." + }, + "references": { + "all_missing": "No ha estat possible trobar les dades de referència.", + "many_missing": "Sembla que almenys una de les referències associades ja no està disponible.", + "single_missing": "Sembla que la referència associada ja no està disponible." + }, + "password": { + "toggle_visible": "Amaga la contrasenya", + "toggle_hidden": "Mostra la contrasenya" + } }, "message": { - "note": "NOTA", - "transcodingDisabled": "Per motius de seguretat, el canvi de configuració del trasnscodificador amb la interfície web no està habilitat. Si voleu canviar les opcions de transcodificació (sia editar-les sia afegir-ne), reinicieu el servidor amb l'opció %{config}.", - "transcodingEnabled": "Ara Navidrome s'executa amb %{config}, cosa que fa possible executar ordres del sistema des de les opcions de transcodificació usant la interfície web. Per motius de seguretat us recomanem que només l'activeu quan necessiteu configurar les opcions de transcodificació.", - "songsAddedToPlaylist": "S'ha afegit 1 cançó a la llista |||| S'han afegit %{smart_count} a la llista", - "noPlaylistsAvailable": "No n'hi ha cap disponible", - "delete_user_title": "Esborra usuari '%{nom}'", - "delete_user_content": "Segur que voleu eliminar aquest usuari i les seues dades\n(incloent-hi llistes i preferències)", - "remove_missing_title": "Eliminar fitxers faltants", - "remove_missing_content": "Segur que vols eliminar els fitxers faltants seleccionats de la base de dades? Això eliminarà permanentment les referències a ells, incloent-hi el nombre de reproduccions i les valoracions.", - "notifications_blocked": "Heu blocat les notificacions d'escriptori en les preferències del navegador", - "notifications_not_available": "El navegador no suporta les notificacions o no heu connectat a Navidrome per https", - "lastfmLinkSuccess": "Ha reexit la vinculació amb Last.fm i se n'ha activat el seguiment", - "lastfmLinkFailure": "No ha estat possible la vinculació amb Last.fm", - "lastfmUnlinkSuccess": "Desvinculat de Last.fm i desactivat el seguiment", - "lastfmUnlinkFailure": "No s'ha pogut desvincular de Last.fm", - "listenBrainzLinkSuccess": "Connectat correctament a ListenBrainz i seguiment activat com a: %{user}", - "listenBrainzLinkFailure": "No s'ha pogut connectar a ListenBrainz: %{error}", - "listenBrainzUnlinkSuccess": "ListenBrainz desconnectat i seguiment desactivat", - "listenBrainzUnlinkFailure": "No s'ha pogut desconnectar de ListenBrainz", - "openIn": { - "lastfm": "Obri en Last.fm", - "musicbrainz": "Obri en MusicBrainz" - }, - "lastfmLink": "Llegeix més...", - "shareOriginalFormat": "Compartir en format original", - "shareDialogTitle": "Compartir %{resource} '%{name}'", - "shareBatchDialogTitle": "Compartir 1 %{resource} |||| Compartir %{smart_count} %{resource}", - "shareCopyToClipboard": "Copiar al porta-retalls: Ctrl+C, Enter", - "shareSuccess": "URL copiada al porta-retalls: %{url}", - "shareFailure": "Error copiant URL %{url} al porta-retalls", - "downloadDialogTitle": "Deascarregar %{resource} '%{name}' (%{size})", - "downloadOriginalFormat": "Descarregar en format original" + "about": "Quant a...", + "are_you_sure": "N'esteu segur?", + "bulk_delete_content": "Voleu eliminar aquest %{name}? |||| Voleu eliminar aquests %{smart_count} element?\n", + "bulk_delete_title": "Esborra %{name} |||| Esborra %{smart_count} %{name}", + "delete_content": "Segur que voleu eliminar aquest element?", + "delete_title": "Elimina %{name} #%{id}", + "details": "Detalls", + "error": "S'ha produït un error en un client i la vostra sol·licitud no ha pogut ser completada.", + "invalid_form": "El formulari no és vàlid.", + "loading": "La pàgina es carrega, un moment si us plau.", + "no": "No", + "not_found": "La URL és incorrecta o heu seguit un enllaç erroni.", + "yes": "Sí", + "unsaved_changes": "Alguns canvis no s'hi han desat. Segur que voleu ignorar-los?" }, - "menu": { - "library": "Discoteca", - "settings": "Configuració", - "version": "Versió", - "theme": "Tema", - "personal": { - "name": "Personal", - "options": { - "theme": "Tema", - "language": "Llengua", - "defaultView": "Vista per defecte", - "desktop_notifications": "Notificacions d'escriptori", - "lastfmNotConfigured": "No s'ha configurat l'API de Last.fm", - "lastfmScrobbling": "Activa el seguiment de Last.fm", - "listenBrainzScrobbling": "Activa el seguiment de ListenBrainz", - "replaygain": "Mode ReplayGain", - "preAmp": "PreAmp de ReplayGain (dB)", - "gain": { - "none": "Cap", - "album": "Guany de l'àlbum", - "track": "Guany de la pista" - } - } - }, - "albumList": "Àlbums", - "about": "Quant a...", - "playlists": "Llistes", - "sharedPlaylists": "Llistes compartides" + "navigation": { + "no_results": "No s'ha trobat", + "no_more_results": "La pàgina número %{page} no existeix. Proveu l'anterior.", + "page_out_of_boundaries": "La pàgina número %{page} no existeix", + "page_out_from_end": "No podeu anar més enllà de la darrera pàgina", + "page_out_from_begin": "No podeu anar més enllà de la primera pàgina", + "page_range_info": "%{offsetBegin}-%{offsetEnd} de %{total}", + "page_rows_per_page": "Elements per pàgina:", + "next": "Següent", + "prev": "Anterior", + "skip_nav": "Salta al contingut" }, - "player": { - "playListsText": "Reprodueix la cua", - "openText": "Obre", - "closeText": "Tanca", - "notContentText": "No hi ha música", - "clickToPlayText": "Feu clic per a reproduir", - "clickToPauseText": "Feu clic per a posar en pausa", - "nextTrackText": "Pista següent", - "previousTrackText": "Pista anterior", - "reloadText": "Recarrega", - "volumeText": "Volum", - "toggleLyricText": "Activa / desactiva lletra", - "toggleMiniModeText": "Minimitza", - "destroyText": "Destrueix", - "downloadText": "Descarrega", - "removeAudioListsText": "Elimina llistes d'àudio", - "clickToDeleteText": "Feu clic per a eliminar %{name}", - "emptyLyricText": "Sense lletra", - "playModeText": { - "order": "En ordre", - "orderLoop": "Repeteix", - "singleLoop": "Repeteix una vegada", - "shufflePlay": "Aleatori" - } + "notification": { + "updated": "Element actualitzat |||| %{smart_count} elements actualitzats", + "created": "Element creat", + "deleted": "Element actualitzat |||| %{smart_count} elements actualitzats", + "bad_item": "Element incorrecte", + "item_doesnt_exist": "L'element no existeix", + "http_error": "Error de comunicació del servidor", + "data_provider_error": "dataProvider error. Vegeu la consola si en voleu més detalls.", + "i18n_error": "No ha estat possible carregar les traduccions per a l'idioma indicat", + "canceled": "Acció cancel·lada", + "logged_out": "La sessió ha acabat, si us plau reconnecteu", + "new_version": "Hi ha una versió nova disponible! Si us plau actualitzeu aquesta finestra." }, - "about": { - "links": { - "homepage": "Inici", - "source": "Codi font", - "featureRequests": "Sol·licitud de funcionalitats", - "lastInsightsCollection": "Última recolecció d'informació", - "insights": { - "disabled": "Desactivada", - "waiting": "Esperant" - } - } - }, - "activity": { - "title": "Activitat", - "totalScanned": "Carpetes escanejades en total", - "quickScan": "Escaneig ràpid", - "fullScan": "Escaneig complet", - "serverUptime": "Temps de funcionament del servidor", - "serverDown": "Sense connexió" - }, - "help": { - "title": "Dreceres de teclat de Navidrome", - "hotkeys": { - "show_help": "Mostra aquesta ajuda", - "toggle_menu": "Commuta la barra lateral", - "toggle_play": "Reprodueix / Pausa", - "prev_song": "Cançó anterior", - "next_song": "Cançó següent", - "vol_up": "Apuja el volum", - "vol_down": "Abaixa el volum", - "toggle_love": "Afegeix la pista a favorits", - "current_song": "Anar a la cançó actual" - } + "toggleFieldsMenu": { + "columnsToDisplay": "Columnes a mostrar", + "layout": "Disposició", + "grid": "Quadrícula", + "table": "Taula" } -} + }, + "message": { + "note": "NOTA", + "transcodingDisabled": "Per motius de seguretat, el canvi de configuració del transcodificador amb la interfície web està desactivat. Si voleu canviar les opcions de transcodificació (sia editar-les sia afegir-ne), reinicieu el servidor amb l'opció %{config}.", + "transcodingEnabled": "Navidrome s'executa amb %{config}, cosa que fa possible executar ordres del sistema des de les opcions de transcodificació usant la interfície web. Per motius de seguretat us recomanem que només l'activeu quan necessiteu configurar les opcions de transcodificació.", + "songsAddedToPlaylist": "S'ha afegit 1 cançó a la llista |||| S'han afegit %{smart_count} a la llista", + "noPlaylistsAvailable": "No n'hi ha cap disponible", + "delete_user_title": "Esborra usuari '%{nom}'", + "delete_user_content": "Segur que voleu eliminar aquest usuari i les seues dades\n(incloent-hi llistes i preferències)", + "notifications_blocked": "Heu blocat les notificacions d'escriptori en les preferències del navegador", + "notifications_not_available": "El navegador no és compatible amb les notificacions o no us heu connectat a Navidrome per https", + "lastfmLinkSuccess": "Ha reexit la vinculació amb Last.fm i se n'ha activat el seguiment", + "lastfmLinkFailure": "No ha estat possible la vinculació amb Last.fm", + "lastfmUnlinkSuccess": "Desvinculat de Last.fm i desactivat el seguiment", + "lastfmUnlinkFailure": "No s'ha pogut desvincular de Last.fm", + "openIn": { + "lastfm": "Obri en Last.fm", + "musicbrainz": "Obri en MusicBrainz" + }, + "lastfmLink": "Llegeix més...", + "listenBrainzLinkSuccess": "Connectat correctament a ListenBrainz i seguiment activat com a: %{user}", + "listenBrainzLinkFailure": "No s'ha pogut connectar a ListenBrainz: %{error}", + "listenBrainzUnlinkSuccess": "ListenBrainz desconnectat i seguiment desactivat", + "listenBrainzUnlinkFailure": "No s'ha pogut desconnectar de ListenBrainz", + "downloadOriginalFormat": "Descarregar en el format original", + "shareOriginalFormat": "Compartir en format original", + "shareDialogTitle": "Compartir %{resource} '%{name}'", + "shareBatchDialogTitle": "Compartir 1 %{resource} |||| Compartir %{smart_count} %{resource}", + "shareSuccess": "URL copiada al porta-retalls: %{url}", + "shareFailure": "Error copiant URL %{url} al porta-retalls", + "downloadDialogTitle": "Deascarregar %{resource} '%{name}' (%{size})", + "shareCopyToClipboard": "Copiar al porta-retalls: Ctrl+C, Enter", + "remove_missing_title": "Eliminar fitxers faltants", + "remove_missing_content": "Segur que vols eliminar els fitxers faltants seleccionats de la base de dades? Això eliminarà permanentment les referències a ells, incloent-hi el nombre de reproduccions i les valoracions.", + "remove_all_missing_title": "Suprimir tots els fitxers perduts", + "remove_all_missing_content": "Esteu segur que voleu eliminar tots els fitxers desapareguts de la base de dades? Se n'eliminarà permanentment qualsevol referència, inclosos el nombre de reproduccions i les puntuacions.", + "noSimilarSongsFound": "No s'ha trobat cap cançó similar", + "noTopSongsFound": "No s'ha trobat cap cançó popular", + "startingInstantMix": "S'està carregant la mescla immediata..." + }, + "menu": { + "library": "Biblioteca", + "settings": "Configuració", + "version": "Versió", + "theme": "Tema", + "personal": { + "name": "Personal", + "options": { + "theme": "Tema", + "language": "Llengua", + "defaultView": "Vista per defecte", + "desktop_notifications": "Notificacions d'escriptori", + "lastfmScrobbling": "Activa el seguiment de Last.fm", + "listenBrainzScrobbling": "Activa el seguiment de ListenBrainz", + "replaygain": "Mode ReplayGain", + "preAmp": "PreAmp de ReplayGain (dB)", + "gain": { + "none": "Cap", + "album": "Guany de l'àlbum", + "track": "Guany de la pista" + }, + "lastfmNotConfigured": "No s'ha configurat l'API de Last.fm" + } + }, + "albumList": "Àlbums", + "about": "Quant a...", + "playlists": "Llistes", + "sharedPlaylists": "Llistes compartides", + "librarySelector": { + "allLibraries": "Totes les llibreries (%{count})", + "multipleLibraries": "%{selected} de %{total} Biblioteques", + "selectLibraries": "Selecciona les biblioteques", + "none": "Cap" + } + }, + "player": { + "playListsText": "Reprodueix la cua", + "openText": "Obre", + "closeText": "Tanca", + "notContentText": "No hi ha música", + "clickToPlayText": "Feu clic per a reproduir", + "clickToPauseText": "Feu clic per a posar en pausa", + "nextTrackText": "Pista següent", + "previousTrackText": "Pista anterior", + "reloadText": "Recarrega", + "volumeText": "Volum", + "toggleLyricText": "Activa / desactiva lletra", + "toggleMiniModeText": "Minimitza", + "destroyText": "Destrueix", + "downloadText": "Descarrega", + "removeAudioListsText": "Elimina llistes d'àudio", + "clickToDeleteText": "Feu clic per a eliminar %{name}", + "emptyLyricText": "Sense lletra", + "playModeText": { + "order": "En ordre", + "orderLoop": "Repeteix", + "singleLoop": "Repeteix una vegada", + "shufflePlay": "Aleatori" + } + }, + "about": { + "links": { + "homepage": "Inici", + "source": "Codi font", + "featureRequests": "Sol·licitud de funcionalitats", + "lastInsightsCollection": "Última recolecció d'informació", + "insights": { + "disabled": "Desactivada", + "waiting": "Esperant" + } + }, + "tabs": { + "about": "Quant a", + "config": "Configuració" + }, + "config": { + "configName": "Nom de Config", + "environmentVariable": "Variable d'entorn", + "currentValue": "Valor actual", + "configurationFile": "Fitxer de configuració", + "exportToml": "Exporta la configuració (TOML)", + "exportSuccess": "Configuració exportada al porta-retalls en format TOML", + "exportFailed": "La còpia de la configuració ha fallat", + "devFlagsHeader": "Indicadors de desenvolupament (subjecte a canvis o eliminació)", + "devFlagsComment": "Aquests paràmetres són experimentals i és possible que s'eliminin en versions futures" + } + }, + "activity": { + "title": "Activitat", + "totalScanned": "Carpetes escanejades en total", + "quickScan": "Escaneig ràpid", + "fullScan": "Escaneig complet", + "serverUptime": "Temps de funcionament del servidor", + "serverDown": "Sense connexió", + "scanType": "Últim escaneig", + "status": "Error d'escaneig", + "elapsedTime": "Temps transcorregut", + "selectiveScan": "Selectiu" + }, + "help": { + "title": "Dreceres de teclat de Navidrome", + "hotkeys": { + "show_help": "Mostra aquesta ajuda", + "toggle_menu": "Commuta la barra lateral", + "toggle_play": "Reprodueix / Pausa", + "prev_song": "Cançó anterior", + "next_song": "Cançó següent", + "vol_up": "Apuja el volum", + "vol_down": "Abaixa el volum", + "toggle_love": "Afegeix la pista a favorits", + "current_song": "Anar a la cançó actual" + } + }, + "nowPlaying": { + "title": "Està sonant", + "empty": "No s'està reproduint res", + "minutesAgo": "Fa %{smart_count} minut |||| Fa %{smart_count} minuts" + } +} \ No newline at end of file diff --git a/resources/i18n/de.json b/resources/i18n/de.json index 22e2fab44..972debb37 100644 --- a/resources/i18n/de.json +++ b/resources/i18n/de.json @@ -36,7 +36,8 @@ "bitDepth": "Bittiefe", "sampleRate": "Samplerate", "missing": "Fehlend", - "libraryName": "Bibliothek" + "libraryName": "Bibliothek", + "composer": "Komponist" }, "actions": { "addToQueue": "Später abspielen", @@ -46,7 +47,8 @@ "download": "Herunterladen", "playNext": "Als nächstes abspielen", "info": "Mehr Informationen", - "showInPlaylist": "In Wiedergabeliste anzeigen" + "showInPlaylist": "In Wiedergabeliste anzeigen", + "instantMix": "" } }, "album": { @@ -328,6 +330,80 @@ "scanInProgress": "Bibliothek Scan läuft...", "noLibrariesAssigned": "Keine Bibliotheken zugeordnet" } + }, + "plugin": { + "name": "Plugin |||| Plugins", + "fields": { + "id": "ID", + "name": "Name", + "description": "Beschreibung", + "version": "Version", + "author": "Autor", + "website": "Website", + "permissions": "Berechtigungen", + "enabled": "Aktiv", + "status": "Status", + "path": "Pfad", + "lastError": "Fehler", + "hasError": "Fehler", + "updatedAt": "Aktualisiert am", + "createdAt": "Installiert", + "configKey": "Schlüssel", + "configValue": "Wert", + "allUsers": "Alle Benutzer", + "selectedUsers": "Ausgewählte Benutzer", + "allLibraries": "Alle Bibliotheken", + "selectedLibraries": "Ausgewählte Bibliotheken" + }, + "sections": { + "status": "Status", + "info": "Plugin Information", + "configuration": "Konfiguration", + "manifest": "Manifest", + "usersPermission": "Benutzer Zugriff", + "libraryPermission": "Bibliotheken Zugriff" + }, + "status": { + "enabled": "Aktiv", + "disabled": "Inaktiv" + }, + "actions": { + "enable": "Aktivieren", + "disable": "Deaktivieren", + "disabledDueToError": "Fehler beheben um Plugin zu aktivieren", + "disabledUsersRequired": "Wähle Benutzer Zugriff um Plugin zu aktivieren", + "disabledLibrariesRequired": "Wähle Bibliotheken Zugriff um Plugin zu aktivieren", + "addConfig": "Konfiguration hinzufügen", + "rescan": "Scan" + }, + "notifications": { + "enabled": "Plugin aktiv", + "disabled": "Plugin inaktiv", + "updated": "Plugin aktualisiert", + "error": "Fehler beim aktualisieren des Plugins" + }, + "validation": { + "invalidJson": "Konfiguration muss valides JSON sein" + }, + "messages": { + "configHelp": "Plugin mit Schlüssel-Werte Paaren konfigurieren. Leer lassen wenn das Plugin keine Konfiguration benötigt.", + "clickPermissions": "Berechtigung anklicken für mehr Details", + "noConfig": "Keine Konfiguration gesetzt", + "allUsersHelp": "Wenn aktiviert, erhält das Plugin Zugriff auf alle Benutzer, inklusive solcher, die in Zukunft erstellt werden.", + "noUsers": "Keine Benutzer ausgewählt", + "permissionReason": "Begründung", + "usersRequired": "Dieses Plugin benötigt Zugriff auf Benutzerinformationen. Wähle aus, auf welche Nutzer das Plugin zugreifen darf oder wähle 'Alle Benutzer'.", + "allLibrariesHelp": "Wenn aktiviert, erhält das Plugin Zugriff auf alle Bibliotheken, inklusive solcher, die in Zukunft erstellt werden.", + "noLibraries": "Keine Bibliotheken ausgewählt", + "librariesRequired": "Dieses Plugin benötigt Zugriff auf Bibliotheken. Wähle aus, auf welche Bibliotheken das Plugin zugreifen darf oder wähle 'Alle Bibliotheken'.", + "requiredHosts": "Benötigte Hosts", + "configValidationError": "Validierung der Konfiguration fehlgeschlagen:", + "schemaRenderError": "Rendern der Konfiguration fehlgeschlagen. Das Schema das Plugins ist eventuell nicht korrekt." + }, + "placeholders": { + "configKey": "Schlüssel", + "configValue": "Wert" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Alle fehlenden Dateien entfernen", "remove_all_missing_content": "Möchtest du wirklich alle Fehlenden Dateien aus der Datenbank entfernen? Alle Referenzen zu den Dateien wie Anzahl Wiedergaben und Bewertungen werden permanent gelöscht.", "noSimilarSongsFound": "Keine ähnlichen Titel gefunden", - "noTopSongsFound": "Keine beliebten Titel gefunden" + "noTopSongsFound": "Keine beliebten Titel gefunden", + "startingInstantMix": "" }, "menu": { "library": "Bibliothek", diff --git a/resources/i18n/el.json b/resources/i18n/el.json index 4dd58e9cc..02d0b06c4 100644 --- a/resources/i18n/el.json +++ b/resources/i18n/el.json @@ -36,7 +36,8 @@ "bitDepth": "Λίγο βάθος", "sampleRate": "Ποσοστό δειγματοληψίας", "missing": "Απών", - "libraryName": "Βιβλιοθήκη" + "libraryName": "Βιβλιοθήκη", + "composer": "Συνθέτης" }, "actions": { "addToQueue": "Αναπαραγωγη Μετα", @@ -46,7 +47,8 @@ "download": "Ληψη", "playNext": "Επόμενη Αναπαραγωγή", "info": "Εμφάνιση Πληροφοριών", - "showInPlaylist": "Εμφάνιση στη λίστα αναπαραγωγής" + "showInPlaylist": "Εμφάνιση στη λίστα αναπαραγωγής", + "instantMix": "Άμεση Μίξη" } }, "album": { @@ -328,6 +330,80 @@ "scanInProgress": "Σάρωση σε εξέλιξη...", "noLibrariesAssigned": "Δεν έχουν αντιστοιχιστεί βιβλιοθήκες σε αυτόν τον χρήστη" } + }, + "plugin": { + "name": "Πρόσθετο |||| Πρόσθετα", + "fields": { + "id": "ID", + "name": "Όνομα", + "description": "Περιγραφή", + "version": "Έκδοση", + "author": "Καλλιτέχνης", + "website": "Ιστοσελίδα", + "permissions": "Άδειες", + "enabled": "Ενεργό", + "status": "Κατάσταση", + "path": "Διαδρομή", + "lastError": "Σφάλμα", + "hasError": "Σφάλμα", + "updatedAt": "Ενημερώθηκε", + "createdAt": "Εγκατασταθηκε", + "configKey": "Κλειδί", + "configValue": "Τιμή", + "allUsers": "Επιτρέψτε όλους τους χρήστες", + "selectedUsers": "Επιλογή χρηστών", + "allLibraries": "Επιτρέψτε όλες τις βιβλιοθήκες", + "selectedLibraries": "Επιλεγμένες βιβλιοθήκες" + }, + "sections": { + "status": "Κατάσταση", + "info": "Πληροφορίες Πρόσθετου", + "configuration": "Παραμετροποίηση", + "manifest": "Manifest", + "usersPermission": "Άδειες Χρηστών", + "libraryPermission": "Άδειες Βιβλιοθηκών" + }, + "status": { + "enabled": "Ενεργό", + "disabled": "Ανενεργό" + }, + "actions": { + "enable": "Ενεργοποίηση", + "disable": "Απενεργοποίηση", + "disabledDueToError": "Διορθώστε το σφάλμα πριν την ενεργοποίηση", + "disabledUsersRequired": "Επιλέξτε χρήστες πριν την ενεργοποίηση", + "disabledLibrariesRequired": "Επιλέξτε βιβλιοθήκες πριν την ενεργοποίηση", + "addConfig": "Προσθήκη παραμετροποίησης", + "rescan": "Σάρωση ξανά" + }, + "notifications": { + "enabled": "Πρόσθετο ενεργοποιημένο", + "disabled": "Πρόσθετο απενεργοποιημένο", + "updated": "Πρόσθετο ενημερωμένο", + "error": "Σφάλμα κατά την ενημέρωση του πρόσθετου" + }, + "validation": { + "invalidJson": "Η παραμετροποίηση πρέπει να είναι συμβατό JSON" + }, + "messages": { + "configHelp": "Παραμετροποιήστε το πρόσθετο με χρήση ζεύγων κλειδιών-τιμών. Αφήστε κενό αν το πρόσθετο δεν απαιτεί παραμετροποίηση", + "clickPermissions": "Κάνετε κλικ για λεπτομέρειες αδειών", + "noConfig": "Δεν ορίστηκε παραμετροποίηση", + "allUsersHelp": "Όταν είναι ενεργό, το πρόσθετο θα έχει πρόσβαση σε όλους τους χρήστες, συμπεριλαμβανομένων και όσων δημιουργηθούν στο μέλλον.", + "noUsers": "Δεν επιλέχθηκαν χρήστες", + "permissionReason": "Αιτία", + "usersRequired": "Το πρόσθετο απαιτεί πρόσβαση στις πληροφορίες χρηστών. Ορίστε τους χρήστες που θα έχει πρόσβαση το πρόσθετο, ή ενεργοποιήστε το 'Επιτρέψτε όλους τους χρήστες'", + "allLibrariesHelp": "Όταν είναι ενεργό, το πρόσθετο θα έχει πρόσβαση σε όλες τις βιβλιοθήκες, συμπεριλαμβανομένων και όσων δημιουργηθούν στο μέλλον.", + "noLibraries": "Δεν επιλέχθηκαν βιβλιοθήκες", + "librariesRequired": "Αυτό το πρόσθετο απαιτεί πρόσβαση στις πληροφορίες βιβλιοθήκης. Επιλέξτε σε ποιές βιβλιοθήκες μπορεί να έχει πρόσβαση το πρόσθετο, ή ενεργοποιήστε το 'Επιτρέψτε όλες τις βιβλιοθήκες'", + "requiredHosts": "Απαιτούμενοι hosts", + "configValidationError": "Η επικύρωση διαμόρφωσης απέτυχε:", + "schemaRenderError": "Δεν είναι δυνατή η απόδοση της φόρμας διαμόρφωσης. Το σχήμα της προσθήκης ενδέχεται να μην είναι έγκυρο." + }, + "placeholders": { + "configKey": "κλειδί", + "configValue": "τιμή" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Αφαίρεση όλων των αρχείων που λείπουν", "remove_all_missing_content": "Είστε βέβαιοι ότι θέλετε να καταργήσετε όλα τα αρχεία που λείπουν από τη βάση δεδομένων? Αυτό θα καταργήσει οριστικά τυχόν αναφορές σε αυτά, συμπεριλαμβανομένου του αριθμού αναπαραγωγών και των αξιολογήσεών τους.", "noSimilarSongsFound": "Δεν βρέθηκαν παρόμοια τραγούδια", - "noTopSongsFound": "Δεν βρέθηκαν κορυφαία τραγούδια" + "noTopSongsFound": "Δεν βρέθηκαν κορυφαία τραγούδια", + "startingInstantMix": "Φόρτωση Άμεσης Μίξης..." }, "menu": { "library": "Βιβλιοθήκη", diff --git a/resources/i18n/es.json b/resources/i18n/es.json index 8d7219883..4e9e13e57 100644 --- a/resources/i18n/es.json +++ b/resources/i18n/es.json @@ -12,16 +12,12 @@ "artist": "Artista", "album": "Álbum", "path": "Ruta del archivo", - "libraryName": "Biblioteca", "genre": "Género", "compilation": "Compilación", "year": "Año", "size": "Tamaño del archivo", "updatedAt": "Actualizado el", "bitRate": "Tasa de bits", - "bitDepth": "Profundidad de bits", - "sampleRate": "Frecuencia de muestreo", - "channels": "Canales", "discSubtitle": "Subtítulo del disco", "starred": "Favorito", "comment": "Comentario", @@ -29,6 +25,7 @@ "quality": "Calidad", "bpm": "BPM", "playDate": "Últimas reproducciones", + "channels": "Canales", "createdAt": "Creado el", "grouping": "Agrupación", "mood": "Estado de ánimo", @@ -36,17 +33,22 @@ "tags": "Etiquetas", "mappedTags": "Etiquetas asignadas", "rawTags": "Etiquetas sin procesar", - "missing": "Faltante" + "bitDepth": "Profundidad de bits", + "sampleRate": "Frecuencia de muestreo", + "missing": "Faltante", + "libraryName": "Biblioteca", + "composer": "Compositor" }, "actions": { "addToQueue": "Reproducir después", "playNow": "Reproducir ahora", "addToPlaylist": "Agregar a la playlist", - "showInPlaylist": "Mostrar en la lista de reproducción", "shuffleAll": "Todas aleatorias", "download": "Descarga", "playNext": "Siguiente", - "info": "Obtener información" + "info": "Obtener información", + "showInPlaylist": "Mostrar en la lista de reproducción", + "instantMix": "" } }, "album": { @@ -57,38 +59,38 @@ "duration": "Duración", "songCount": "Canciones", "playCount": "Reproducciones", - "size": "Tamaño del archivo", "name": "Nombre", - "libraryName": "Biblioteca", "genre": "Género", "compilation": "Compilación", "year": "Año", - "date": "Fecha de grabación", - "originalDate": "Original", - "releaseDate": "Publicado", - "releases": "Lanzamiento |||| Lanzamientos", - "released": "Publicado", "updatedAt": "Actualizado el", "comment": "Comentario", "rating": "Calificación", "createdAt": "Creado el", + "size": "Tamaño del archivo", + "originalDate": "Original", + "releaseDate": "Publicado", + "releases": "Lanzamiento |||| Lanzamientos", + "released": "Publicado", "recordLabel": "Discográfica", "catalogNum": "Número de catálogo", "releaseType": "Tipo de lanzamiento", "grouping": "Agrupación", "media": "Medios", "mood": "Estado de ánimo", - "missing": "Faltante" + "date": "Fecha de grabación", + "missing": "Faltante", + "libraryName": "Biblioteca" }, "actions": { "playAll": "Reproducir", "playNext": "Reproducir siguiente", "addToQueue": "Reproducir después", - "share": "Compartir", "shuffle": "Aleatorio", "addToPlaylist": "Agregar a la lista", "download": "Descargar", - "info": "Obtener información" + "info": "Obtener información", + "share": "Compartir" }, "lists": { "all": "Todos", @@ -106,10 +108,10 @@ "name": "Nombre", "albumCount": "Número de álbumes", "songCount": "Número de canciones", - "size": "Tamaño", "playCount": "Reproducciones", "rating": "Calificación", "genre": "Género", + "size": "Tamaño", "role": "Rol", "missing": "Faltante" }, @@ -130,9 +132,9 @@ "maincredit": "Artista del álbum o Artista |||| Artistas del álbum o Artistas" }, "actions": { - "topSongs": "Más destacadas", "shuffle": "Aleatorio", - "radio": "Radio" + "radio": "Radio", + "topSongs": "Más destacadas" } }, "user": { @@ -141,7 +143,6 @@ "userName": "Nombre de usuario", "isAdmin": "Es administrador", "lastLoginAt": "Último inicio de sesión", - "lastAccessAt": "Último acceso", "updatedAt": "Actualizado el", "name": "Nombre", "password": "Contraseña", @@ -150,6 +151,7 @@ "currentPassword": "Contraseña actual", "newPassword": "Nueva contraseña", "token": "Token", + "lastAccessAt": "Último acceso", "libraries": "Bibliotecas" }, "helperTexts": { @@ -211,9 +213,9 @@ "selectPlaylist": "Seleccione una lista:", "addNewPlaylist": "Creada \"%{name}\"", "export": "Exportar", - "saveQueue": "Guardar la fila de reproducción en una playlist", "makePublic": "Hazla pública", "makePrivate": "Hazla privada", + "saveQueue": "Guardar la fila de reproducción en una playlist", "searchOrCreate": "Buscar listas de reproducción o escribe para crear una nueva…", "pressEnterToCreate": "Pulsa Enter para crear una nueva lista de reproducción", "removeFromSelection": "Quitar de la selección" @@ -244,7 +246,6 @@ "username": "Compartido por", "url": "URL", "description": "Descripción", - "downloadable": "¿Permitir descargas?", "contents": "Contenido", "expiresAt": "Caduca el", "lastVisitedAt": "Visitado por última vez el", @@ -252,14 +253,12 @@ "format": "Formato", "maxBitRate": "Tasa de bits Máx.", "updatedAt": "Actualizado el", - "createdAt": "Creado el" - }, - "notifications": {}, - "actions": {} + "createdAt": "Creado el", + "downloadable": "¿Permitir descargas?" + } }, "missing": { "name": "Fichero faltante |||| Ficheros faltantes", - "empty": "No faltan archivos", "fields": { "path": "Ruta", "size": "Tamaño", @@ -272,7 +271,8 @@ }, "notifications": { "removed": "Eliminado" - } + }, + "empty": "No faltan archivos" }, "library": { "name": "Biblioteca |||| Bibliotecas", @@ -302,20 +302,20 @@ }, "actions": { "scan": "Escanear biblioteca", - "quickScan": "Escaneo rápido", - "fullScan": "Escaneo completo", "manageUsers": "Gestionar el acceso de usarios", - "viewDetails": "Ver detalles" + "viewDetails": "Ver detalles", + "quickScan": "Escaneo rápido", + "fullScan": "Escaneo completo" }, "notifications": { "created": "La biblioteca se creó correctamente", "updated": "La biblioteca se actualizó correctamente", "deleted": "La biblioteca se eliminó correctamente", "scanStarted": "El escaneo de la biblioteca ha comenzado", + "scanCompleted": "El escaneo de la biblioteca se completó", "quickScanStarted": "Escaneo rápido ha comenzado", "fullScanStarted": "Escaneo completo ha comenzado", - "scanError": "Error al iniciar el escaneo. Revisa los registros", - "scanCompleted": "El escaneo de la biblioteca se completó" + "scanError": "Error al iniciar el escaneo. Revisa los registros" }, "validation": { "nameRequired": "El nombre de la biblioteca es obligatorio", @@ -396,7 +396,9 @@ "allLibrariesHelp": "Cuando se active, el plugin tendrá acceso a todas las bibliotecas, incluidas las que se creen en el futuro.", "noLibraries": "Ninguna biblioteca seleccionada", "librariesRequired": "Este plugin requiere acceso a la información de las bibliotecas. Selecciona a qué bibliotecas puede acceder el plugin, o activa 'Permitir todas las bibliotecas'.", - "requiredHosts": "Hosts requeridos" + "requiredHosts": "Hosts requeridos", + "configValidationError": "La validación de la configuración falló:", + "schemaRenderError": "No se pudo renderizar el formulario de configuración. Es posible que el esquema del complemento no sea válido." }, "placeholders": { "configKey": "clave", @@ -439,7 +441,6 @@ "add": "Añadir", "back": "Ir atrás", "bulk_actions": "1 elemento seleccionado |||| %{smart_count} elementos seleccionados", - "bulk_actions_mobile": "1 |||| %{smart_count}", "cancel": "Cancelar", "clear_input_value": "Limpiar valor", "clone": "Duplicar", @@ -463,6 +464,7 @@ "close_menu": "Cerrar menú", "unselect": "Deseleccionado", "skip": "Omitir", + "bulk_actions_mobile": "1 |||| %{smart_count}", "share": "Compartir", "download": "Descargar" }, @@ -554,47 +556,42 @@ "transcodingDisabled": "Cambiar la configuración de la transcodificación a través de la interfaz web esta deshabilitado por motivos de seguridad. Si quieres cambiar (editar o agregar) opciones de transcodificación, reinicia el servidor con la %{config} opción de configuración.", "transcodingEnabled": "Navidrom se esta ejecutando con %{config}, lo que hace posible ejecutar comandos de sistema desde el apartado de transcodificación en la interfaz web. Recomendamos deshabilitarlo por motivos de seguridad y solo habilitarlo cuando se este configurando opciones de transcodificación.", "songsAddedToPlaylist": "1 canción agregada a la lista |||| %{smart_count} canciones agregadas a la lista", - "noSimilarSongsFound": "No se encontraron canciones similares", - "noTopSongsFound": "No se encontraron canciones destacadas", "noPlaylistsAvailable": "Ninguna lista disponible", "delete_user_title": "Eliminar usuario '%{name}'", "delete_user_content": "¿Esta seguro de eliminar a este usuario y todos sus datos (incluyendo listas y preferencias)?", - "remove_missing_title": "Eliminar archivos faltantes", - "remove_missing_content": "¿Realmente desea eliminar los archivos faltantes seleccionados de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.", - "remove_all_missing_title": "Eliminar todos los archivos faltantes", - "remove_all_missing_content": "¿Realmente desea eliminar todos los archivos faltantes de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.", "notifications_blocked": "Las notificaciones de este sitio están bloqueadas en tu navegador", "notifications_not_available": "Este navegador no soporta notificaciones o no ingresaste a Navidrome usando https", "lastfmLinkSuccess": "Last.fm esta conectado y el scrobbling esta activado", "lastfmLinkFailure": "No se pudo conectar con Last.fm", "lastfmUnlinkSuccess": "Last.fm se ha desconectado y el scrobbling se desactivo", "lastfmUnlinkFailure": "No se pudo desconectar Last.fm", - "listenBrainzLinkSuccess": "Se ha conectado correctamente a ListenBrainz y se activó el scrobbling como el usuario: %{user}", - "listenBrainzLinkFailure": "No se pudo conectar con ListenBrainz: %{error}", - "listenBrainzUnlinkSuccess": "Se desconectó ListenBrainz y se desactivó el scrobbling", - "listenBrainzUnlinkFailure": "No se pudo desconectar ListenBrainz", "openIn": { "lastfm": "Ver en Last.fm", "musicbrainz": "Ver en MusicBrainz" }, "lastfmLink": "Leer más...", + "listenBrainzLinkSuccess": "Se ha conectado correctamente a ListenBrainz y se activó el scrobbling como el usuario: %{user}", + "listenBrainzLinkFailure": "No se pudo conectar con ListenBrainz: %{error}", + "listenBrainzUnlinkSuccess": "Se desconectó ListenBrainz y se desactivó el scrobbling", + "listenBrainzUnlinkFailure": "No se pudo desconectar ListenBrainz", + "downloadOriginalFormat": "Descargar formato original", "shareOriginalFormat": "Compartir formato original", "shareDialogTitle": "Compartir %{resource} '%{name}'", "shareBatchDialogTitle": "Compartir 1 %{resource} |||| Compartir %{smart_count} %{resource}", - "shareCopyToClipboard": "Copiar al portapapeles: Ctrl+C, Intro", "shareSuccess": "URL copiada al portapapeles: %{url}", "shareFailure": "Error al copiar la URL %{url} al portapapeles", "downloadDialogTitle": "Descargar %{resource} '%{name}' (%{size})", - "downloadOriginalFormat": "Descargar formato original" + "shareCopyToClipboard": "Copiar al portapapeles: Ctrl+C, Intro", + "remove_missing_title": "Eliminar archivos faltantes", + "remove_missing_content": "¿Realmente desea eliminar los archivos faltantes seleccionados de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.", + "remove_all_missing_title": "Eliminar todos los archivos faltantes", + "remove_all_missing_content": "¿Realmente desea eliminar todos los archivos faltantes de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.", + "noSimilarSongsFound": "No se encontraron canciones similares", + "noTopSongsFound": "No se encontraron canciones destacadas", + "startingInstantMix": "" }, "menu": { "library": "Biblioteca", - "librarySelector": { - "allLibraries": "Todas las bibliotecas (%{count})", - "multipleLibraries": "%{selected} de %{total} bibliotecas", - "selectLibraries": "Seleccionar bibliotecas", - "none": "Ninguno" - }, "settings": "Ajustes", "version": "Versión", "theme": "Tema", @@ -605,7 +602,6 @@ "language": "Idioma", "defaultView": "Vista por defecto", "desktop_notifications": "Notificaciones de escritorio", - "lastfmNotConfigured": "La clave API de Last.fm no está configurada", "lastfmScrobbling": "Scrobble a Last.fm", "listenBrainzScrobbling": "Scrobble a ListenBrainz", "replaygain": "Modo de ReplayGain", @@ -614,13 +610,20 @@ "none": "Desactivado", "album": "Ganancia del álbum", "track": "Ganancia de pista" - } + }, + "lastfmNotConfigured": "La clave API de Last.fm no está configurada" } }, "albumList": "Álbumes", + "about": "Acerca de", "playlists": "Playlists", "sharedPlaylists": "Playlists Compartidas", - "about": "Acerca de" + "librarySelector": { + "allLibraries": "Todas las bibliotecas (%{count})", + "multipleLibraries": "%{selected} de %{total} bibliotecas", + "selectLibraries": "Seleccionar bibliotecas", + "none": "Ninguno" + } }, "player": { "playListsText": "Fila de reproducción", @@ -679,17 +682,12 @@ "totalScanned": "Total de carpetas escaneadas", "quickScan": "Escaneo rápido", "fullScan": "Escaneo completo", - "selectiveScan": "Selectivo", "serverUptime": "Uptime del servidor", "serverDown": "OFFLINE", "scanType": "Tipo", "status": "Error de escaneo", - "elapsedTime": "Tiempo transcurrido" - }, - "nowPlaying": { - "title": "En reproducción", - "empty": "Nada en reproducción", - "minutesAgo": "Hace %{smart_count} minuto |||| Hace %{smart_count} minutos" + "elapsedTime": "Tiempo transcurrido", + "selectiveScan": "Selectivo" }, "help": { "title": "Atajos de teclado de Navidrome", @@ -699,10 +697,15 @@ "toggle_play": "Reproducir / Pausar", "prev_song": "Canción anterior", "next_song": "Siguiente canción", - "current_song": "Canción actual", "vol_up": "Subir volumen", "vol_down": "Bajar volumen", - "toggle_love": "Marca esta canción como favorita" + "toggle_love": "Marca esta canción como favorita", + "current_song": "Canción actual" } + }, + "nowPlaying": { + "title": "En reproducción", + "empty": "Nada en reproducción", + "minutesAgo": "Hace %{smart_count} minuto |||| Hace %{smart_count} minutos" } -} +} \ No newline at end of file diff --git a/resources/i18n/fi.json b/resources/i18n/fi.json index fc2793389..0d260fb44 100644 --- a/resources/i18n/fi.json +++ b/resources/i18n/fi.json @@ -36,7 +36,8 @@ "bitDepth": "Bittisyvyys", "sampleRate": "Näytteenottotaajuus", "missing": "Puuttuva", - "libraryName": "Kirjasto" + "libraryName": "Kirjasto", + "composer": "Säveltäjä" }, "actions": { "addToQueue": "Lisää jonoon", @@ -46,7 +47,8 @@ "download": "Lataa", "playNext": "Soita seuraavaksi", "info": "Info", - "showInPlaylist": "Näytä soittolistassa" + "showInPlaylist": "Näytä soittolistassa", + "instantMix": "Pikasekoitus" } }, "album": { @@ -328,6 +330,80 @@ "scanInProgress": "Skannaus käynnissä...", "noLibrariesAssigned": "Tälle käyttäjälle ei ole määritetty kirjastoja" } + }, + "plugin": { + "name": "Liitännäinen |||| Liitännäiset", + "fields": { + "id": "ID", + "name": "Nimi", + "description": "Kuvaus", + "version": "Versio", + "author": "Tekijä", + "website": "Verkkosivusto", + "permissions": "Oikeudet", + "enabled": "Käytössä", + "status": "Tila", + "path": "Polku", + "lastError": "Virhe", + "hasError": "Virhe", + "updatedAt": "Päivitetty", + "createdAt": "Asennettu", + "configKey": "Avain", + "configValue": "Arvo", + "allUsers": "Salli kaikki käyttäjät", + "selectedUsers": "Valitut käyttäjät", + "allLibraries": "Salli kaikki kirjastot", + "selectedLibraries": "Valitut kirjastot" + }, + "sections": { + "status": "Tila", + "info": "Lisäosan tiedot", + "configuration": "Määritykset", + "manifest": "Luettelo", + "usersPermission": "Käyttäjäoikeudet", + "libraryPermission": "Kirjaston oikeudet" + }, + "status": { + "enabled": "Käytössä", + "disabled": "Ei käytössä" + }, + "actions": { + "enable": "Ota käyttöön", + "disable": "Poista käytöstä", + "disabledDueToError": "Korjaa virhe ennen käyttöönottoa", + "disabledUsersRequired": "Valitse käyttäjät ennen käyttöönottoa", + "disabledLibrariesRequired": "Valitse kirjastot ennen käyttöönottoa", + "addConfig": "Lisää määritykset", + "rescan": "Skannaa uudelleen" + }, + "notifications": { + "enabled": "Lisäosa käytössä", + "disabled": "Lisäosa ei käytössä", + "updated": "Lisäosa päivitetty", + "error": "Virhe lisäosaa päivitettäessä" + }, + "validation": { + "invalidJson": "Määrityksen on oltava kelvollinen JSON" + }, + "messages": { + "configHelp": "Määritä lisäosa avain-arvo-parien avulla. Jätä tyhjäksi, jos lisäosa ei vaadi määrityksiä.", + "clickPermissions": "Napsauta käyttöoikeutta saadaksesi lisätietoja", + "noConfig": "Ei määritettyjä asetuksia", + "allUsersHelp": "Kun tämä on käytössä, laajennuksella on pääsy kaikkiin käyttäjiin, myös tulevaisuudessa luotaviin.", + "noUsers": "Ei valittuja käyttäjiä", + "permissionReason": "Syy", + "usersRequired": "Tämä laajennus vaatii pääsyn käyttäjätietoihin. Valitse käyttäjät, joihin laajennus voi päästä, tai ota käyttöön 'Salli kaikki käyttäjät'.", + "allLibrariesHelp": "Kun tämä on käytössä, laajennuksella on pääsy kaikkiin kirjastoihin, myös tulevaisuudessa luotaviin.", + "noLibraries": "Ei valittuja kirjastoja", + "librariesRequired": "Tämä laajennus vaatii pääsyn kirjastotietoihin. Valitse, mihin kirjastoihin laajennus voi käyttää, tai ota käyttöön 'Salli kaikki kirjastot'.", + "requiredHosts": "Vaaditut palvelimet", + "configValidationError": "Määrityksen validointi epäonnistui:", + "schemaRenderError": "Konfiguraatiolomaketta ei voi näyttää. Lisäosan skeema saattaa olla virheellinen." + }, + "placeholders": { + "configKey": "avain", + "configValue": "arvo" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Poista kaikki puuttuvat tiedostot", "remove_all_missing_content": "Haluatko varmasti poistaa kaikki puuttuvat tiedostot tietokannasta? Tämä poistaa pysyvästi kaikki viittaukset niihin, mukaan lukien toistomäärät ja arvostelut.", "noSimilarSongsFound": "Samankaltaisia kappaleita ei löytynyt", - "noTopSongsFound": "Suosituimpia kappaleita ei löytynyt" + "noTopSongsFound": "Suosituimpia kappaleita ei löytynyt", + "startingInstantMix": "Ladataan Pikasekoitus..." }, "menu": { "library": "Kirjasto", @@ -586,16 +663,16 @@ }, "tabs": { "about": "Tietoja", - "config": "Kokoonpano" + "config": "Määritykset" }, "config": { "configName": "Konfiguraation nimi", "environmentVariable": "Ympäristömuuttuja", "currentValue": "Nykyinen arvo", - "configurationFile": "Konfiguraatiotiedosto", - "exportToml": "Vie konfiguraatio (TOML)", - "exportSuccess": "Konfiguraatio viety leikepöydälle TOML-muodossa", - "exportFailed": "Konfiguraation kopiointi epäonnistui", + "configurationFile": "Määritystiedosto", + "exportToml": "Vie määritys (TOML)", + "exportSuccess": "Määritykset viety leikepöydälle TOML-muodossa", + "exportFailed": "Määritysten kopiointi epäonnistui", "devFlagsHeader": "Kehitysliput (voivat muuttua/poistua)", "devFlagsComment": "Nämä ovat kokeellisia asetuksia ja ne voidaan poistaa tulevissa versioissa" } diff --git a/resources/i18n/fr.json b/resources/i18n/fr.json index 070e63977..d3d0d5d57 100644 --- a/resources/i18n/fr.json +++ b/resources/i18n/fr.json @@ -36,7 +36,8 @@ "bitDepth": "Profondeur de bits", "sampleRate": "Fréquence d'échantillonnage", "missing": "Manquant", - "libraryName": "Bibliothèque" + "libraryName": "Bibliothèque", + "composer": "Compositeur·e" }, "actions": { "addToQueue": "Ajouter à la file", @@ -46,7 +47,8 @@ "download": "Télécharger", "playNext": "Jouer ensuite", "info": "Plus d'informations", - "showInPlaylist": "Montrer dans la playlist" + "showInPlaylist": "Montrer dans la playlist", + "instantMix": "" } }, "album": { @@ -328,6 +330,80 @@ "scanInProgress": "Scan en cours...", "noLibrariesAssigned": "Aucune bibliothèque pour cet utilisateur" } + }, + "plugin": { + "name": "Extension |||| Extensions", + "fields": { + "id": "ID", + "name": "Nom", + "description": "Description", + "version": "Version", + "author": "Auteur.e", + "website": "Site web", + "permissions": "Permissions", + "enabled": "Activée", + "status": "Statut", + "path": "Chemin", + "lastError": "Erreur", + "hasError": "Erreur", + "updatedAt": "Mise à jour", + "createdAt": "Installée", + "configKey": "Clef", + "configValue": "Valeur", + "allUsers": "Autoriser tous les utilisateur·rices", + "selectedUsers": "Utilisateur·rices sélectionné.e.s", + "allLibraries": "Autoriser toutes les bibliothèques", + "selectedLibraries": "Bibliothèques sélectionnées" + }, + "sections": { + "status": "Statut", + "info": "Informations de l'extension", + "configuration": "Configuration", + "manifest": "Manifeste", + "usersPermission": "Permissions utilisateur·ices", + "libraryPermission": "Permissions des bibliothèques" + }, + "status": { + "enabled": "Activées", + "disabled": "Désactivées" + }, + "actions": { + "enable": "Activer", + "disable": "Désactiver", + "disabledDueToError": "L'erreur doit être réglée avant de pouvoir activer la bibliothèque", + "disabledUsersRequired": "Sélectionner des utilisateur·ices avant d'activer la bibliothèque", + "disabledLibrariesRequired": "Sélectionner au moins une bibliothèque", + "addConfig": "Ajouter une configuration", + "rescan": "Rescanner" + }, + "notifications": { + "enabled": "Extension activée", + "disabled": "Extension désactivée", + "updated": "Extension mise à jour", + "error": "Erreur pendant la mise à jour de l'extension" + }, + "validation": { + "invalidJson": "La configuration doit être un JSON valide" + }, + "messages": { + "configHelp": "Configurer l'extension en utilisant des paires clef/valeurs. Laisser vide si l'extension ne requiert aucune configuration.", + "clickPermissions": "Cliquer sur une permission pour plus de détails", + "noConfig": "Aucune configuration", + "allUsersHelp": "Quand sélectionnée, l'extension aura accès à l'ensemble des utilisateur·rices, y compris ceux créé.e.s dans le future.", + "noUsers": "Aucun.e utilisateur·rice sélectionné.e", + "permissionReason": "Raison", + "usersRequired": "Cette extension nécessite un accès aux informations utilisateurs. Sélectionnez les utilisateur·rices autorisé.e.s ou sélectionnez 'Tout autoriser'.", + "allLibrariesHelp": "Quand sélectionnée, cette extension aura accès à l'ensemble des bibliothèques, y compris celles créées dans le futur.", + "noLibraries": "Aucune bibliothèque sélectionnée", + "librariesRequired": "Cette extension nécessite l'accès aux information de la bibliothèque. Sélectionnez à quelles bibliothèque cette extension a accès, ou sélectionnez 'Autoriser toutes les bibliothèques'.", + "requiredHosts": "Hôtes requis", + "configValidationError": "Erreur lors de la validation de la configuration", + "schemaRenderError": "Impossible de processer la configuration. Le schéma de l'extension n'est peut-être pas valide." + }, + "placeholders": { + "configKey": "clef", + "configValue": "valeur" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Supprimer tous les fichiers manquants", "remove_all_missing_content": "Êtes-vous sûr(e) de vouloir supprimer tous les fichiers manquants de la base de données ? Cette action est permanente et supprimera leurs nombres d'écoutes, leur notations et tout ce qui y fait référence.", "noSimilarSongsFound": "Aucun titre similaire n'a été trouvé", - "noTopSongsFound": "Aucun meilleur titre n'a été trouvé" + "noTopSongsFound": "Aucun meilleur titre n'a été trouvé", + "startingInstantMix": "" }, "menu": { "library": "Bibliothèque", diff --git a/resources/i18n/gl.json b/resources/i18n/gl.json index a5f7ce0ce..32d0d919f 100644 --- a/resources/i18n/gl.json +++ b/resources/i18n/gl.json @@ -36,7 +36,8 @@ "bitDepth": "Calidade de Bit", "sampleRate": "Taxa de mostra", "missing": "Falta", - "libraryName": "Biblioteca" + "libraryName": "Biblioteca", + "composer": "Composición" }, "actions": { "addToQueue": "Ao final da cola", @@ -46,7 +47,8 @@ "download": "Descargar", "playNext": "A continuación", "info": "Obter info", - "showInPlaylist": "Mostrar en Lista de reprodución" + "showInPlaylist": "Mostrar en Lista de reprodución", + "instantMix": "Mestura Súbita" } }, "album": { @@ -328,6 +330,80 @@ "scanInProgress": "Escaneo en progreso…", "noLibrariesAssigned": "Sen bibliotecas asignadas a esta usuaria" } + }, + "plugin": { + "name": "Complemento |||| Complementos", + "fields": { + "id": "ID", + "name": "Nome", + "description": "Descrición", + "version": "Versión", + "author": "Autoría", + "website": "Sitio web", + "permissions": "Permisos", + "enabled": "Activado", + "status": "Estado", + "path": "Ruta", + "lastError": "Erro", + "hasError": "Erro", + "updatedAt": "Actualizado", + "createdAt": "Instalado", + "configKey": "Clave", + "configValue": "Valor", + "allUsers": "Para todas as usuarias", + "selectedUsers": "Usuarias seleccionadas", + "allLibraries": "Permitir todas as bibliotecas", + "selectedLibraries": "Selecciona bibliotecas" + }, + "sections": { + "status": "Estado", + "info": "Info do complemento", + "configuration": "Configuración", + "manifest": "Manifesto", + "usersPermission": "Permiso sobre usuarias", + "libraryPermission": "Permiso sobre bibliotecas" + }, + "status": { + "enabled": "Activado", + "disabled": "Desactivado" + }, + "actions": { + "enable": "Activar", + "disable": "Desactivar", + "disabledDueToError": "Arranxar erro antes de activar", + "disabledUsersRequired": "Selección de usuarias antes de activar", + "disabledLibrariesRequired": "Selección de bibliotecas antes de activar", + "addConfig": "Engadir configuración", + "rescan": "Volver a escanear" + }, + "notifications": { + "enabled": "Complemento activado", + "disabled": "Complemento desactivado", + "updated": "Complemento actualizado", + "error": "Erro ao actualizar o complemento" + }, + "validation": { + "invalidJson": "A configuración debe ser un JSON válido" + }, + "messages": { + "configHelp": "Configura o complemento usando pares clave-valor. Deixa baleiro se o complemento non require configuración.", + "clickPermissions": "Preme nun permiso para ver detalles", + "noConfig": "Sen configuración establecida", + "allUsersHelp": "Ao activalo, o complemento terá acceso a todas as usuarias, incluíndo aquelas que se creen no futuro.", + "noUsers": "Sen usuarias seleccionadas", + "permissionReason": "Motivo", + "usersRequired": "O complemento precisa acceso á información sobre a usuaria. Selecciona as usuarias ás que pode acceder, ou activa 'Todas as usuarias'.", + "allLibrariesHelp": "Ao activalo, o complemento terá acceso a todas as bibliotecas, incluíndo aquelas que se creen no futuro.", + "noLibraries": "Sen bibliotecas seleccionadas", + "librariesRequired": "O complemento precisa acceso á información sobre a biblioteca. Selecciona as bibliotecas ás que pode acceder, ou activa 'Todas as bibliotecas'.", + "requiredHosts": "Servidores requeridos", + "configValidationError": "Fallou a comprobación da configuración:", + "schemaRenderError": "Non se puido aplicar a configuración. O esquema do complemento podería non ser válido." + }, + "placeholders": { + "configKey": "clave", + "configValue": "valor" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Retirar todos os ficheiros que faltan", "remove_all_missing_content": "Tes certeza de querer retirar da base de datos todos os ficheiros que faltan? Isto eliminará todas as referencias a eles, incluíndo o número de reproducións e valoracións.", "noSimilarSongsFound": "Sen cancións parecidas", - "noTopSongsFound": "Sen cancións destacadas" + "noTopSongsFound": "Sen cancións destacadas", + "startingInstantMix": "Cargando Mestura Súbita…" }, "menu": { "library": "Biblioteca", diff --git a/resources/i18n/nl.json b/resources/i18n/nl.json index 059d243cb..86793ee19 100644 --- a/resources/i18n/nl.json +++ b/resources/i18n/nl.json @@ -36,7 +36,8 @@ "bitDepth": "Bit diepte", "sampleRate": "Sample waarde", "missing": "Ontbrekend", - "libraryName": "Bibliotheek" + "libraryName": "Bibliotheek", + "composer": "" }, "actions": { "addToQueue": "Voeg toe aan wachtrij", @@ -46,7 +47,8 @@ "download": "Downloaden", "playNext": "Volgende", "info": "Meer info", - "showInPlaylist": "Toon in afspeellijst" + "showInPlaylist": "Toon in afspeellijst", + "instantMix": "" } }, "album": { @@ -328,6 +330,80 @@ "scanInProgress": "Scan is bezig...", "noLibrariesAssigned": "Geen bibliotheken aan deze gebruiker toegewezen" } + }, + "plugin": { + "name": "Plugin |||| Plugins", + "fields": { + "id": "ID", + "name": "Naam", + "description": "Omschrijving", + "version": "Versie", + "author": "Auteur", + "website": "Website", + "permissions": "Permissies", + "enabled": "Aangezet", + "status": "Status", + "path": "Pad", + "lastError": "Fout", + "hasError": "Fout", + "updatedAt": "Geupdate", + "createdAt": "Geinstalleerd", + "configKey": "Sleutel", + "configValue": "Waarde", + "allUsers": "Alle gebruikers toelaten", + "selectedUsers": "Geselecteerde gebruikers", + "allLibraries": "Alle bibliotheken toestaan", + "selectedLibraries": "Geselecteerde bibliotheken" + }, + "sections": { + "status": "Status", + "info": "Plugin informatie", + "configuration": "Configuratie", + "manifest": "Manifest", + "usersPermission": "Gebruikers permissie", + "libraryPermission": "Bibliotheekpermissie" + }, + "status": { + "enabled": "Aangezet", + "disabled": "Uitgezet" + }, + "actions": { + "enable": "Aanzetten", + "disable": "Uitzetten", + "disabledDueToError": "Herstel de fout voor aanzetten", + "disabledUsersRequired": "Selecteer gebruikers voor aanzetten", + "disabledLibrariesRequired": "Selecteer bibliotheek voor aanzetten", + "addConfig": "Configuratie toevoegen", + "rescan": "Opnieuw scannen" + }, + "notifications": { + "enabled": "Plugin actief", + "disabled": "Plugin niet actief", + "updated": "Plugin geupdate", + "error": "Fout bij updaten plugin" + }, + "validation": { + "invalidJson": "Configuratie moet geldige JSON zijn" + }, + "messages": { + "configHelp": "", + "clickPermissions": "Klik op permissie voor details", + "noConfig": "Geen configuratie ingesteld", + "allUsersHelp": "", + "noUsers": "Geen gebruikers geselecteerd", + "permissionReason": "Reden", + "usersRequired": "", + "allLibrariesHelp": "", + "noLibraries": "Geen bibliotheken geselecteerd", + "librariesRequired": "", + "requiredHosts": "Benodigde hosts", + "configValidationError": "", + "schemaRenderError": "" + }, + "placeholders": { + "configKey": "Sleutel", + "configValue": "Waarde" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Verwijder alle ontbrekende bestanden", "remove_all_missing_content": "Weet je zeker dat je alle ontbrekende bestanden van de database wil verwijderen? Dit wist permanent al hun referenties inclusief afspeel tellers en beoordelingen.", "noSimilarSongsFound": "Geen vergelijkbare nummers gevonden", - "noTopSongsFound": "Geen beste nummers gevonden" + "noTopSongsFound": "Geen beste nummers gevonden", + "startingInstantMix": "" }, "menu": { "library": "Bibliotheek", diff --git a/resources/i18n/pl.json b/resources/i18n/pl.json index a9d6db88f..f5aac031c 100644 --- a/resources/i18n/pl.json +++ b/resources/i18n/pl.json @@ -36,7 +36,8 @@ "bitDepth": "Głębokość próbkowania", "sampleRate": "Częstotliwość próbkowania", "missing": "Brak", - "libraryName": "Biblioteka" + "libraryName": "Biblioteka", + "composer": "Kompozytor" }, "actions": { "addToQueue": "Odtwarzaj Później", @@ -46,7 +47,8 @@ "download": "Pobierz", "playNext": "Odtwarzaj Następny", "info": "Zdobądź Informacje", - "showInPlaylist": "Pokaż w Liście Odtwarzania" + "showInPlaylist": "Pokaż w Liście Odtwarzania", + "instantMix": "" } }, "album": { @@ -328,6 +330,80 @@ "scanInProgress": "Skanowanie w trakcie...", "noLibrariesAssigned": "Brak bibliotek przypisanych do tego użytkownika" } + }, + "plugin": { + "name": "\nWtyczka |||| Wtyczki", + "fields": { + "id": "ID", + "name": "Nazwa", + "description": "Opis", + "version": "Wersja", + "author": "Autor", + "website": "Witryna", + "permissions": "Uprawnienia", + "enabled": "Aktywny", + "status": "Status", + "path": "Ścieżka", + "lastError": "Błąd", + "hasError": "Błąd", + "updatedAt": "Zaktualizowana", + "createdAt": "Zainstalowana", + "configKey": "Klucz", + "configValue": "Wartość", + "allUsers": "Zezwalaj wszystkim użytkownikom", + "selectedUsers": "Wybrani użytkownicy", + "allLibraries": "Zezwalaj dla wszystkich bibliotek", + "selectedLibraries": "Wybrane biblioteki" + }, + "sections": { + "status": "Status", + "info": "Informacje O Wtyczce", + "configuration": "Konfiguracja", + "manifest": "Manifest", + "usersPermission": "Uprawnienia Użytkowników", + "libraryPermission": "Uprawnienia Biblioteki" + }, + "status": { + "enabled": "Włączona", + "disabled": "Wyłączona" + }, + "actions": { + "enable": "Włącz", + "disable": "Wyłącz", + "disabledDueToError": "Napraw błąd przed włączeniem", + "disabledUsersRequired": "Wybierz użytkowników przed włączeniem", + "disabledLibrariesRequired": "Wybierz biblioteki przed włączaniem", + "addConfig": "Dodaj Konfigurację", + "rescan": "Przeskanuj Ponownie" + }, + "notifications": { + "enabled": "Wtyczka włączona", + "disabled": "Wtyczka wyłączona", + "updated": "Wtyczka zaktualizowana", + "error": "Błąd aktualizacji wtyczki" + }, + "validation": { + "invalidJson": "Konfiguracja musić być w poprawnym formacie JSON" + }, + "messages": { + "configHelp": "Użyj par klucz-wartość, aby skonfigurować wtyczkę. Pozostaw puste, jeśli wtyczka nie wymaga konfiguracji.", + "clickPermissions": "Kliknij uprawnienie, aby uzyskać szczegółowe informacje", + "noConfig": "Nie wybrano konfiguracji", + "allUsersHelp": "Po włączeniu wtyczka będzie miała dostęp do wszystkich użytkowników, także tych utworzonych w przyszłości.", + "noUsers": "Nie wybrano użytkowników", + "permissionReason": "Powód", + "usersRequired": "Ta wtyczka wymaga dostępu do informacji o użytkowniku. Wybierz użytkowników, do których wtyczka ma mieć dostęp, lub włącz opcję „Zezwól wszystkim użytkownikom”.", + "allLibrariesHelp": "Po włączeniu wtyczka będzie miała dostęp do wszystkich bibliotek, także tych utworzonych w przyszłości.", + "noLibraries": "Nie wybrano biblioteki", + "librariesRequired": "Wtyczka wymaga dostępu do informacji o bibliotece. Wybierz, dla której biblioteki zezwolić dostęp, lub włącz 'Zezwalaj dla wszystkich bibliotek'.", + "requiredHosts": "Wymagane hosty", + "configValidationError": "Weryfikacja konfiguracji nie powiodła się:", + "schemaRenderError": "Nie można wyrenderować formularza konfiguracji. Schemat wtyczki może być nieprawidłowy." + }, + "placeholders": { + "configKey": "klucz", + "configValue": "wartość" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Usuń wszystkie brakujące pliki", "remove_all_missing_content": "Czy chcesz usunąć wszystkie brakujące pliki z bazy danych? Spowoduje to trwałe usunięcie wszelkich odniesień do tych plików, takich jak liczba odtworzeń, czy oceny.", "noSimilarSongsFound": "Brak podobnych utworów", - "noTopSongsFound": "Brak najlepszych utworów" + "noTopSongsFound": "Brak najlepszych utworów", + "startingInstantMix": "" }, "menu": { "library": "Biblioteka", diff --git a/resources/i18n/pt-br.json b/resources/i18n/pt-br.json index 2697de622..8975254fe 100644 --- a/resources/i18n/pt-br.json +++ b/resources/i18n/pt-br.json @@ -12,7 +12,6 @@ "artist": "Artista", "album": "Álbum", "path": "Arquivo", - "libraryName": "Biblioteca", "genre": "Gênero", "compilation": "Coletânea", "year": "Ano", @@ -36,7 +35,9 @@ "rawTags": "Tags originais", "bitDepth": "Profundidade de bits", "sampleRate": "Taxa de amostragem", - "missing": "Ausente" + "missing": "Ausente", + "libraryName": "Biblioteca", + "composer": "Compositor" }, "actions": { "addToQueue": "Adicionar à fila", @@ -59,7 +60,6 @@ "songCount": "Músicas", "playCount": "Execuções", "name": "Nome", - "libraryName": "Biblioteca", "genre": "Gênero", "compilation": "Coletânea", "year": "Ano", @@ -79,7 +79,8 @@ "media": "Mídia", "mood": "Mood", "date": "Data de Lançamento", - "missing": "Ausente" + "missing": "Ausente", + "libraryName": "Biblioteca" }, "actions": { "playAll": "Tocar", @@ -131,9 +132,9 @@ "maincredit": "Artista do Álbum ou Artista |||| Artistas do Álbum ou Artistas" }, "actions": { - "topSongs": "Mais tocadas", "shuffle": "Aleatório", - "radio": "Rádio" + "radio": "Rádio", + "topSongs": "Mais tocadas" } }, "user": { @@ -162,14 +163,14 @@ "updated": "Usuário atualizado com sucesso", "deleted": "Usuário deletado com sucesso" }, - "validation": { - "librariesRequired": "Pelo menos uma biblioteca deve ser selecionada para usuários não-administradores" - }, "message": { "listenBrainzToken": "Entre seu token do ListenBrainz", "clickHereForToken": "Clique aqui para obter seu token", "selectAllLibraries": "Selecionar todas as bibliotecas", "adminAutoLibraries": "Usuários administradores têm acesso automático a todas as bibliotecas" + }, + "validation": { + "librariesRequired": "Pelo menos uma biblioteca deve ser selecionada para usuários não-administradores" } }, "player": { @@ -254,17 +255,15 @@ "updatedAt": "Últ. Atualização", "createdAt": "Data de Criação", "downloadable": "Permitir Baixar?" - }, - "notifications": {}, - "actions": {} + } }, "missing": { "name": "Arquivo ausente |||| Arquivos ausentes", "fields": { "path": "Caminho", "size": "Tamanho", - "libraryName": "Biblioteca", - "updatedAt": "Desaparecido em" + "updatedAt": "Desaparecido em", + "libraryName": "Biblioteca" }, "actions": { "remove": "Remover", @@ -303,20 +302,20 @@ }, "actions": { "scan": "Scanear Biblioteca", - "quickScan": "Scan Rápido", - "fullScan": "Scan Completo", "manageUsers": "Gerenciar Acesso do Usuário", - "viewDetails": "Ver Detalhes" + "viewDetails": "Ver Detalhes", + "quickScan": "Scan Rápido", + "fullScan": "Scan Completo" }, "notifications": { "created": "Biblioteca criada com sucesso", "updated": "Biblioteca atualizada com sucesso", "deleted": "Biblioteca excluída com sucesso", "scanStarted": "Scan da biblioteca iniciada", + "scanCompleted": "Scan da biblioteca concluída", "quickScanStarted": "Scan rápido iniciado", "fullScanStarted": "Scan completo iniciado", - "scanError": "Erro ao iniciar o scan. Verifique os logs", - "scanCompleted": "Scan da biblioteca concluída" + "scanError": "Erro ao iniciar o scan. Verifique os logs" }, "validation": { "nameRequired": "Nome da biblioteca é obrigatório", @@ -388,8 +387,6 @@ }, "messages": { "configHelp": "Configure o plugin usando pares chave-valor. Deixe vazio se o plugin não precisa de configuração.", - "configValidationError": "Falha na validação da configuração:", - "schemaRenderError": "Não foi possível renderizar o formulário de configuração. O schema do plugin pode estar inválido.", "clickPermissions": "Clique em uma permissão para ver detalhes", "noConfig": "Nenhuma configuração definida", "allUsersHelp": "Quando habilitado, o plugin terá acesso a todos os usuários, incluindo os criados no futuro.", @@ -399,7 +396,9 @@ "allLibrariesHelp": "Quando habilitado, o plugin terá acesso a todas as bibliotecas, incluindo as criadas no futuro.", "noLibraries": "Nenhuma biblioteca selecionada", "librariesRequired": "Este plugin requer acesso a informações de bibliotecas. Selecione quais bibliotecas o plugin pode acessar, ou habilite 'Permitir todas as bibliotecas'.", - "requiredHosts": "Hosts necessários" + "requiredHosts": "Hosts necessários", + "configValidationError": "Falha na validação da configuração:", + "schemaRenderError": "Não foi possível renderizar o formulário de configuração. O schema do plugin pode estar inválido." }, "placeholders": { "configKey": "chave", @@ -557,9 +556,6 @@ "transcodingDisabled": "Por questão de segurança, esta tela de configuração está desabilitada. Se você quiser alterar estas configurações, reinicie o servidor com a opção %{config}", "transcodingEnabled": "Navidrome está sendo executado com a opção %{config}. Isto permite que potencialmente se execute comandos do sistema pela interface Web. É recomendado que vc mantenha esta opção desabilitada, e só a habilite quando precisar configurar opções de Conversão", "songsAddedToPlaylist": "Música adicionada à playlist |||| %{smart_count} músicas adicionadas à playlist", - "noSimilarSongsFound": "Nenhuma música semelhante encontrada", - "startingInstantMix": "Carregando Mix Instantâneo...", - "noTopSongsFound": "Nenhuma música mais tocada encontrada", "noPlaylistsAvailable": "Nenhuma playlist", "delete_user_title": "Excluir usuário '%{name}'", "delete_user_content": "Você tem certeza que deseja excluir o usuário e todos os seus dados (incluindo suas playlists e preferências)?", @@ -589,16 +585,13 @@ "remove_missing_title": "Remover arquivos ausentes", "remove_missing_content": "Você tem certeza que deseja remover os arquivos selecionados do banco de dados? Isso removerá permanentemente qualquer referência a eles, incluindo suas contagens de reprodução e classificações.", "remove_all_missing_title": "Remover todos os arquivos ausentes", - "remove_all_missing_content": "Você tem certeza que deseja remover todos os arquivos ausentes do banco de dados? Isso removerá permanentemente qualquer referência a eles, incluindo suas contagens de reprodução e classificações." + "remove_all_missing_content": "Você tem certeza que deseja remover todos os arquivos ausentes do banco de dados? Isso removerá permanentemente qualquer referência a eles, incluindo suas contagens de reprodução e classificações.", + "noSimilarSongsFound": "Nenhuma música semelhante encontrada", + "noTopSongsFound": "Nenhuma música mais tocada encontrada", + "startingInstantMix": "Carregando Mix Instantâneo..." }, "menu": { "library": "Biblioteca", - "librarySelector": { - "allLibraries": "Todas as Bibliotecas (%{count})", - "multipleLibraries": "%{selected} de %{total} Bibliotecas", - "selectLibraries": "Selecionar Bibliotecas", - "none": "Nenhuma" - }, "settings": "Configurações", "version": "Versão", "theme": "Tema", @@ -624,7 +617,13 @@ "albumList": "Álbuns", "about": "Info", "playlists": "Playlists", - "sharedPlaylists": "Compartilhadas" + "sharedPlaylists": "Compartilhadas", + "librarySelector": { + "allLibraries": "Todas as Bibliotecas (%{count})", + "multipleLibraries": "%{selected} de %{total} Bibliotecas", + "selectLibraries": "Selecionar Bibliotecas", + "none": "Nenhuma" + } }, "player": { "playListsText": "Fila de Execução", @@ -683,17 +682,12 @@ "totalScanned": "Total de pastas scaneadas", "quickScan": "Rápido", "fullScan": "Completo", - "selectiveScan": "Seletivo", "serverUptime": "Uptime do servidor", "serverDown": "DESCONECTADO", "scanType": "Último Scan", "status": "Erro", - "elapsedTime": "Duração" - }, - "nowPlaying": { - "title": "Tocando agora", - "empty": "Nada tocando", - "minutesAgo": "%{smart_count} minuto atrás |||| %{smart_count} minutos atrás" + "elapsedTime": "Duração", + "selectiveScan": "Seletivo" }, "help": { "title": "Teclas de atalho", @@ -708,5 +702,10 @@ "toggle_love": "Marcar/desmarcar favorita", "current_song": "Vai para música atual" } + }, + "nowPlaying": { + "title": "Tocando agora", + "empty": "Nada tocando", + "minutesAgo": "%{smart_count} minuto atrás |||| %{smart_count} minutos atrás" } -} +} \ No newline at end of file diff --git a/resources/i18n/ru.json b/resources/i18n/ru.json index 2d7ffd249..5b20c3e19 100644 --- a/resources/i18n/ru.json +++ b/resources/i18n/ru.json @@ -36,7 +36,8 @@ "bitDepth": "Битовая глубина (Bit)", "sampleRate": "Частота дискретизации (Hz)", "missing": "Поле отсутствует", - "libraryName": "Библиотека" + "libraryName": "Библиотека", + "composer": "Композитор" }, "actions": { "addToQueue": "В очередь", @@ -46,7 +47,8 @@ "download": "Скачать", "playNext": "Следующий", "info": "Информация", - "showInPlaylist": "Показать в плейлисте" + "showInPlaylist": "Показать в плейлисте", + "instantMix": "Быстрый микс" } }, "album": { @@ -93,7 +95,7 @@ "lists": { "all": "Все", "random": "Случайные", - "recentlyAdded": "Свежие", + "recentlyAdded": "Новые", "recentlyPlayed": "Проигранные", "mostPlayed": "Популярные", "starred": "Избранные", @@ -328,6 +330,80 @@ "scanInProgress": "Сканирование продолжается...", "noLibrariesAssigned": "Нет библиотек, назначенных этому пользователю" } + }, + "plugin": { + "name": "Плагин |||| Плагины", + "fields": { + "id": "ID", + "name": "Имя", + "description": "Описание", + "version": "Версия", + "author": "Автор", + "website": "Вебсайт", + "permissions": "Разрешения", + "enabled": "Включено", + "status": "Статус", + "path": "Путь", + "lastError": "Ошибка", + "hasError": "Ошибка", + "updatedAt": "Обновлено", + "createdAt": "Установленный", + "configKey": "Ключ", + "configValue": "Значение", + "allUsers": "Разрешить всем пользователям", + "selectedUsers": "Выбранные пользователи", + "allLibraries": "Разрешить доступ ко всем библиотекам", + "selectedLibraries": "Избранные библиотеки" + }, + "sections": { + "status": "Статус", + "info": "Информация о плагине", + "configuration": "Конфигурация", + "manifest": "Манифест", + "usersPermission": "Разрешение пользователей", + "libraryPermission": "Разрешение на использование библиотеки" + }, + "status": { + "enabled": "Включено", + "disabled": "Отключить" + }, + "actions": { + "enable": "Включить", + "disable": "Отключить", + "disabledDueToError": "Исправьте ошибку перед включением", + "disabledUsersRequired": "Выберите пользователей перед включением", + "disabledLibrariesRequired": "Выберите библиотеки перед включением", + "addConfig": "Добавить конфигурацию", + "rescan": "Повторное сканирование" + }, + "notifications": { + "enabled": "Плагин включен", + "disabled": "Плагин отключен", + "updated": "Плагин обновлен", + "error": "Ошибка обновления плагина" + }, + "validation": { + "invalidJson": "Конфигурация должна быть в формате JSON, допустимом для всех пользователей" + }, + "messages": { + "configHelp": "Настройте плагин, используя пары ключ-значение. Оставьте поле пустым, если плагин не требует настройки.", + "clickPermissions": "Нажмите на разрешение для получения подробной информации", + "noConfig": "Конфигурация не задана", + "allUsersHelp": "При включении плагин получит доступ ко всем пользователям, включая тех, кто будет создан в будущем.", + "noUsers": "Не выбрано ни одного пользователя", + "permissionReason": "Причина", + "usersRequired": "Этому плагину требуется доступ к пользовательской информации. Выберите, к каким пользователям плагин может получить доступ, или включите \"Разрешить всем пользователям\".", + "allLibrariesHelp": "После включения плагин будет иметь доступ ко всем библиотекам, включая те, которые будут созданы в будущем.", + "noLibraries": "Библиотеки не выбраны", + "librariesRequired": "Этому плагину требуется доступ к библиотечной информации. Выберите, к каким библиотекам плагин может получить доступ, или включите \"Разрешить все библиотеки\".", + "requiredHosts": "Необходимые хосты", + "configValidationError": "Проверка конфигурации завершилась неудачей:", + "schemaRenderError": "Не удалось отобразить форму конфигурации. Возможно, схема плагина недействительна." + }, + "placeholders": { + "configKey": "ключ", + "configValue": "значение" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "Удалите все отсутствующие файлы", "remove_all_missing_content": "Вы уверены, что хотите удалить все отсутствующие файлы из базы данных? Это навсегда удалит все упоминания о них, включая количество игр и рейтинг.", "noSimilarSongsFound": "Похожих треков не найдено", - "noTopSongsFound": "Лучших треков не найдено" + "noTopSongsFound": "Лучших треков не найдено", + "startingInstantMix": "Загрузка быстрого микса" }, "menu": { "library": "Библиотека", @@ -538,7 +615,7 @@ } }, "albumList": "Альбомы", - "about": "О нас", + "about": "О программе", "playlists": "Плейлисты", "sharedPlaylists": "Поделиться плейлистом", "librarySelector": { diff --git a/resources/i18n/sl.json b/resources/i18n/sl.json index 80bd8e4a3..f499d6ad5 100644 --- a/resources/i18n/sl.json +++ b/resources/i18n/sl.json @@ -36,7 +36,8 @@ "bitDepth": "Bitna globina", "sampleRate": "Frekvenca vzorčenja", "missing": "Manjka", - "libraryName": "Knjižnica" + "libraryName": "Knjižnica", + "composer": "Skladatelj" }, "actions": { "addToQueue": "Predvajaj kasneje", @@ -46,7 +47,8 @@ "download": "Naloži", "playNext": "Naslednji", "info": "Več informacij", - "showInPlaylist": "Prikaži na seznamu predvajanja" + "showInPlaylist": "Prikaži na seznamu predvajanja", + "instantMix": "" } }, "album": { @@ -301,14 +303,19 @@ "actions": { "scan": "Skeniraj knjižnico", "manageUsers": "Upravljanje dostopa uporabnikov", - "viewDetails": "Ogled podrobnosti" + "viewDetails": "Ogled podrobnosti", + "quickScan": "Hitro skeniranje", + "fullScan": "Popolno skeniranje" }, "notifications": { "created": "Knjižnica je uspešno ustvarjena", "updated": "Knjižnica je bila uspešno posodobljena", "deleted": "Knjižnica je uspešno izbrisana", "scanStarted": "Skeniranje knjižnice se je začelo", - "scanCompleted": "Skeniranje knjižnice končano" + "scanCompleted": "Skeniranje knjižnice končano", + "quickScanStarted": "Hitro skeniranje se je začelo", + "fullScanStarted": "Popolno skeniranje se je začelo", + "scanError": "Napaka pri začetku skeniranja. Preverite dnevnike" }, "validation": { "nameRequired": "Ime knjižnice je obvezno", @@ -323,6 +330,80 @@ "scanInProgress": "Skeniranje v teku...", "noLibrariesAssigned": "Uporabnik nima dodeljenih knjižnic" } + }, + "plugin": { + "name": "Vtičnik |||| Vtičniki", + "fields": { + "id": "ID", + "name": "Ime", + "description": "Opis", + "version": "Verzija", + "author": "Avtor", + "website": "Spletna stran", + "permissions": "Dovoljenja", + "enabled": "Vključeno", + "status": "Status", + "path": "Pot", + "lastError": "Napaka", + "hasError": "Napaka", + "updatedAt": "Posodobljeno", + "createdAt": "Inštalirano", + "configKey": "Ključ", + "configValue": "Vrednost", + "allUsers": "Dovoli vsem uporabnikom", + "selectedUsers": "Izbrani uporabniki", + "allLibraries": "Dovoli vse knjižnice", + "selectedLibraries": "Izbrane knjižnice" + }, + "sections": { + "status": "Status", + "info": "Informacije o vtičniku", + "configuration": "Konfiguracija", + "manifest": "Manifest", + "usersPermission": "Uporabniška dovoljenja", + "libraryPermission": "Knjižnična dovoljenja" + }, + "status": { + "enabled": "Vključeno", + "disabled": "Izključeno" + }, + "actions": { + "enable": "Vključi", + "disable": "Izključi", + "disabledDueToError": "Popravi napako pred vključitvijo", + "disabledUsersRequired": "Izberi uporabnike pred vključitvijo", + "disabledLibrariesRequired": "Izberi knjižnice pred vključitvijo", + "addConfig": "Dodaj konfiguracijo", + "rescan": "Ponovi skeniranje" + }, + "notifications": { + "enabled": "Vtičnik vključen", + "disabled": "Vtičnik izključen", + "updated": "Vtičnik posodobljen", + "error": "Napaka pri posodobitvi vtičnika" + }, + "validation": { + "invalidJson": "Konfiguracija mora biti pravilen JSON" + }, + "messages": { + "configHelp": "Konfiguriraj vtičnik z uporabo key-value parov. Pusti prazno, če vtičnik ne potrebuje konfiguracije.", + "clickPermissions": "Klikni za dovoljenje o podrobnostih", + "noConfig": "Konfiguracija ni nastavljena", + "allUsersHelp": "Ko vključeno, bo vtičnik imel dostop do vseh uporabnikov, tudi prihodnjih.", + "noUsers": "Uporabniki niso izbrani", + "permissionReason": "Razlog", + "usersRequired": "Vtičnik potrebuje dostop do uporabnikovih informacij. Izberi uporabnike ali vključi dostop vsem uporabnikom.", + "allLibrariesHelp": "Ko vključeno, bo vtičnik imel dostop do vseh knjižnic, tudi prihodnjih.", + "noLibraries": "Ni izbranih knjižnic", + "librariesRequired": "Vtičnik zahteva dostop do knjižnih informacij. Izberi do katerih knjižnic lahko dostopa, ali vključi dostop do vseh knjižnic.", + "requiredHosts": "Zahtevani gostitelji", + "configValidationError": "", + "schemaRenderError": "" + }, + "placeholders": { + "configKey": "ključ", + "configValue": "vrednost" + } } }, "ra": { @@ -506,7 +587,8 @@ "remove_all_missing_title": "Odstrani vse manjkajoče datoteke", "remove_all_missing_content": "Ste prepričani, da želite odstraniti vse manjkajoče datoteke iz baze? Trajno boste odstranili vse reference nanje, vključno s številom predvajanj in ocenami.", "noSimilarSongsFound": "Ni najdenih podobnih pesmi", - "noTopSongsFound": "Ni najdenih najboljših pesmi" + "noTopSongsFound": "Ni najdenih najboljših pesmi", + "startingInstantMix": "" }, "menu": { "library": "Knjižnica", @@ -604,7 +686,8 @@ "serverDown": "NEPOVEZAN", "scanType": "Tip", "status": "Napaka pri skeniranju", - "elapsedTime": "Pretečeni čas" + "elapsedTime": "Pretečeni čas", + "selectiveScan": "Selektivno" }, "help": { "title": "Hitre tipke", diff --git a/resources/i18n/sv.json b/resources/i18n/sv.json index a93831079..5896b4ed9 100644 --- a/resources/i18n/sv.json +++ b/resources/i18n/sv.json @@ -10,7 +10,6 @@ "playCount": "Spelningar", "title": "Titel", "artist": "Artist", - "composer": "Kompositör", "album": "Album", "path": "Sökväg", "genre": "Genre", @@ -37,7 +36,8 @@ "bitDepth": "Bitdjup", "sampleRate": "Samplingsfrekvens", "missing": "Saknade", - "libraryName": "Bibliotek" + "libraryName": "Bibliotek", + "composer": "Kompositör" }, "actions": { "addToQueue": "Lägg till i kön", @@ -47,7 +47,8 @@ "download": "Ladda ner", "playNext": "Spela nästa", "info": "Mer information", - "showInPlaylist": "Visa i spellista" + "showInPlaylist": "Visa i spellista", + "instantMix": "Direktmix" } }, "album": { @@ -329,6 +330,80 @@ "scanInProgress": "Scanning pågår...", "noLibrariesAssigned": "Inga bibliotek har tilldelats den här användaren" } + }, + "plugin": { + "name": "Tillägg |||| Tillägg", + "fields": { + "id": "ID", + "name": "Namn", + "description": "Beskrivning", + "version": "Version", + "author": "Författare", + "website": "Website", + "permissions": "Behörigheter", + "enabled": "Aktiverad", + "status": "Status", + "path": "Sökväg", + "lastError": "Fel", + "hasError": "Fel", + "updatedAt": "Uppdaterad", + "createdAt": "Installerad", + "configKey": "Nyckel", + "configValue": "Värde", + "allUsers": "Tillåt alla användare", + "selectedUsers": "Valda användare", + "allLibraries": "Tillåt alla bibliotek", + "selectedLibraries": "Valda bibliotek" + }, + "sections": { + "status": "Status", + "info": "Tilläggsinformation", + "configuration": "Konfiguration", + "manifest": "Manifest", + "usersPermission": "Användarbehörigheter", + "libraryPermission": "Biblioteksbehörigheter" + }, + "status": { + "enabled": "Aktiverad", + "disabled": "Inaktiverad" + }, + "actions": { + "enable": "Aktivera", + "disable": "Inaktivera", + "disabledDueToError": "Åtgärda felet innan aktivering", + "disabledUsersRequired": "Välj användare före aktivering", + "disabledLibrariesRequired": "Välj bibliotek före aktivering", + "addConfig": "Lägg till konfiguration", + "rescan": "Scanna om" + }, + "notifications": { + "enabled": "Tillägg aktiverat", + "disabled": "Tillägg inaktiverat", + "updated": "Tillägg uppdaterat", + "error": "Fel vid uppdatering av tillägg" + }, + "validation": { + "invalidJson": "Konfigurationen måste vara giltig JSON" + }, + "messages": { + "configHelp": "Konfigurera tillägget med nyckel–värde-par. Lämna tomt om tillägget inte kräver någon konfiguration.", + "clickPermissions": "Klicka på en behörighet för mer information", + "noConfig": "Ingen konfiguration angiven", + "allUsersHelp": "När den är aktiverad får tillägget tillgång till alla användare, inklusive de som skapas i framtiden.", + "noUsers": "Inga användare valda", + "permissionReason": "Orsak", + "usersRequired": "Detta tillägg kräver åtkomst till användarinformation. Välj vilka användare insticksprogrammet ska ha åtkomst till, eller aktivera 'Tillåt alla användare'.", + "allLibrariesHelp": "När den är aktiverad får tillägget tillgång till alla bibliotek, inklusive de som skapas i framtiden.", + "noLibraries": "Inga bibliotek valda", + "librariesRequired": "Detta tillägg kräver tillgång till biblioteksinformation. Välj vilka bibliotek tillägget kan komma åt eller aktivera 'Tillåt alla bibliotek'.", + "requiredHosts": "Krävda värdar", + "configValidationError": "Validering av konfigurationen misslyckades:", + "schemaRenderError": "Kunde inte rendera konfigurationsformuläret. Tilläggets schema kan vara ogiltigt." + }, + "placeholders": { + "configKey": "nyckel", + "configValue": "värde" + } } }, "ra": { @@ -512,7 +587,8 @@ "remove_all_missing_title": "Ta bort alla saknade filer", "remove_all_missing_content": "Är du säker på att du vill ta bort alla saknade filer från databasen? Detta kommer permanent radera alla referenser till dem, inklusive antal spelningar och betyg.", "noSimilarSongsFound": "Hittade inga liknande låtar", - "noTopSongsFound": "Hittade inga topplåtar" + "noTopSongsFound": "Hittade inga topplåtar", + "startingInstantMix": "Laddar direktmix..." }, "menu": { "library": "Bibliotek", @@ -545,7 +621,7 @@ "librarySelector": { "allLibraries": "Alla bibliotek (%{count})", "multipleLibraries": "%{selected} av %{total} bibliotek", - "selectLibraries": "Valda bibliotek", + "selectLibraries": "Välj bibliotek", "none": "Inga" } }, diff --git a/resources/i18n/th.json b/resources/i18n/th.json index 833a68ab9..45a5e5f34 100644 --- a/resources/i18n/th.json +++ b/resources/i18n/th.json @@ -36,7 +36,8 @@ "bitDepth": "Bit depth", "sampleRate": "แซมเปิ้ลเรต", "missing": "หายไป", - "libraryName": "ห้องสมุด" + "libraryName": "ห้องสมุด", + "composer": "ผู้แต่ง" }, "actions": { "addToQueue": "เพิ่มในคิว", @@ -46,7 +47,8 @@ "download": "ดาวน์โหลด", "playNext": "เล่นถัดไป", "info": "ดูรายละเอียด", - "showInPlaylist": "แสดงในเพลย์ลิสต์" + "showInPlaylist": "แสดงในเพลย์ลิสต์", + "instantMix": "" } }, "album": { @@ -328,6 +330,80 @@ "scanInProgress": "กำลังสแกน...", "noLibrariesAssigned": "ไม่มีห้องสมุดสำหรับผู้ใช้นี้" } + }, + "plugin": { + "name": "ปลั๊กอิน |||| ปลั๊กอิน", + "fields": { + "id": "ID", + "name": "ชื่อ", + "description": "รายละเอียด", + "version": "เวอร์ชั่น", + "author": "ผู้สร้าง", + "website": "เว็บไซต์", + "permissions": "การอนุญาติ", + "enabled": "เปิดใช้", + "status": "สถานะ", + "path": "เส้นทาง", + "lastError": "ผิดพลาด", + "hasError": "ผิดพลาด", + "updatedAt": "อัพเดทแล้ว", + "createdAt": "ติดตั้งแล้ว", + "configKey": "คีย์", + "configValue": "ค่า", + "allUsers": "อนุญาติผู้ใช้ทั้งหมด", + "selectedUsers": "ผู้ใช้ถูกเลือก", + "allLibraries": "อนุญาติห้องสมุดเพลงทั้งหมด", + "selectedLibraries": "ห้องสมุดเพลงถูกเลือก" + }, + "sections": { + "status": "สถานะ", + "info": "ข้อมูลปลั๊กอิน", + "configuration": "การตั้งค่า", + "manifest": "แสดง", + "usersPermission": "สิทธิของผู้ใช้", + "libraryPermission": "สิทธิของห้องสมุดเพลง" + }, + "status": { + "enabled": "เปิดใช้งานแล้ว", + "disabled": "ปิดใช้งานแล้ว" + }, + "actions": { + "enable": "เปิดใช้งาน", + "disable": "ปิดใช้งาน", + "disabledDueToError": "แก้ไขข้อผิดพลาดก่อนเปิดใช้งาน", + "disabledUsersRequired": "เลือกผู้ใช้ที่จะเปิดใช้งาน", + "disabledLibrariesRequired": "เลือกห้องสมุดเพลงที่จะเปิดใช้งาน", + "addConfig": "เพิ่มการตั้งค่า", + "rescan": "สแกนซ้ำ" + }, + "notifications": { + "enabled": "เปิดใช้ปลั๊กอินแล้ว", + "disabled": "ปิดใช้ปลั๊กอินแล้ว", + "updated": "ปลั๊กอินอัพเดท", + "error": "อัพเดทผิดพลาด" + }, + "validation": { + "invalidJson": "ต้องตั้งค่าตามไวยากรณ์ JSON" + }, + "messages": { + "configHelp": "ใส่ค่าให้เข้าคู่กับคีย์ของปลั๊กอิน ปล่อยว่างถ้าปลั๊กอินไม่ต้องการใช้", + "clickPermissions": "กดดูรายละเอียดของการอนุญาติ", + "noConfig": "ไม่ได้ตั้งค่า", + "allUsersHelp": "เมื่อเปิดใช้ ปลั๊กอินจะใช้กับผู้ใช้ทุกคน รวมถึงผู้ใช้ใหม่ในอนาคต", + "noUsers": "ไม่ได้เลือกผู้ใช้", + "permissionReason": "เหตุผล", + "usersRequired": "ปลั๊กอินนี้ต้องการเข้าถึงข้อมูลผู้ใช้ เลือกผู้ใช้ที่ต้องการให้ปลั๊กอินเข้าถึงหรือเปิดใช้งานกับผู้ใช้ทั้งหมด", + "allLibrariesHelp": "เมื่อเปิดใช้งาน ปลั๊กอินจะเข้าถึงทุกห้องสมุดเพลง รวมถึงของผู้ใช้ใหม่ในอนาคต", + "noLibraries": "ไม่มีห้องสมุดเพลงถูกเลือก", + "librariesRequired": "ปลั๊กอินนี้ต้องการเข้าถึงข้อมูลห้องสมุดเพลง เลือกห้องสมุดเพลงที่ต้องการให้ปลั๊กอินเข้าถึงหรือเปิดใช้งานกับห้องสมุดเพลงทั้งหมด", + "requiredHosts": "ต้องการ Host", + "configValidationError": "การตั้งค่าเกิดความผิดพลาด", + "schemaRenderError": "ไม่สามารถแสดงหน้าจอการตั้งค่า อาจเกิดจากความผิดพลาดจากปลั๊กอิน" + }, + "placeholders": { + "configKey": "คีย์", + "configValue": "ค่า" + } } }, "ra": { @@ -511,7 +587,8 @@ "remove_all_missing_title": "เอารายการไฟล์ที่หายไปออกทั้งหมด", "remove_all_missing_content": "คุณแน่ใจว่าจะเอารายการไฟล์ที่หายไปออกจากดาต้าเบส นี่จะเป็นการลบข้อมูลอ้างอิงทั้งหมดของไฟล์ออกอย่างถาวร", "noSimilarSongsFound": "ไม่มีเพลงคล้ายกัน", - "noTopSongsFound": "ไม่พบเพลงยอดนิยม" + "noTopSongsFound": "ไม่พบเพลงยอดนิยม", + "startingInstantMix": "" }, "menu": { "library": "ห้องสมุดเพลง", From 948f6507c1c9652856b8f80b23b7cbf8029d3c2f Mon Sep 17 00:00:00 2001 From: York Date: Tue, 3 Feb 2026 04:03:34 +0800 Subject: [PATCH 22/82] fix(ui): update Traditional Chinese translation (#4961) --- resources/i18n/zh-Hant.json | 99 ++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 8 deletions(-) diff --git a/resources/i18n/zh-Hant.json b/resources/i18n/zh-Hant.json index 7d8ce2872..1bb59a8b1 100644 --- a/resources/i18n/zh-Hant.json +++ b/resources/i18n/zh-Hant.json @@ -10,6 +10,7 @@ "playCount": "播放次數", "title": "標題", "artist": "藝人", + "composer": "作曲者", "album": "專輯", "path": "檔案路徑", "libraryName": "媒體庫", @@ -46,7 +47,8 @@ "shuffleAll": "全部隨機播放", "download": "下載", "playNext": "下一首播放", - "info": "取得資訊" + "info": "取得資訊", + "instantMix": "即時混音" } }, "album": { @@ -302,6 +304,8 @@ }, "actions": { "scan": "掃描媒體庫", + "quickScan": "快速掃描", + "fullScan": "完整掃描", "manageUsers": "管理使用者權限", "viewDetails": "查看詳細資料" }, @@ -310,6 +314,9 @@ "updated": "成功更新媒體庫", "deleted": "成功刪除媒體庫", "scanStarted": "開始掃描媒體庫", + "quickScanStarted": "快速掃描已開始", + "fullScanStarted": "完整掃描已開始", + "scanError": "掃描啟動失敗，請檢查日誌", "scanCompleted": "媒體庫掃描完成" }, "validation": { @@ -325,6 +332,80 @@ "scanInProgress": "正在掃描...", "noLibrariesAssigned": "沒有為該使用者指派任何媒體庫" } + }, + "plugin": { + "name": "插件 |||| 插件", + "fields": { + "id": "ID", + "name": "名稱", + "description": "描述", + "version": "版本", + "author": "作者", + "website": "網站", + "permissions": "權限", + "enabled": "已啟用", + "status": "狀態", + "path": "路徑", + "lastError": "錯誤", + "hasError": "錯誤", + "updatedAt": "更新於", + "createdAt": "安裝於", + "configKey": "鍵", + "configValue": "值", + "allUsers": "允許所有使用者", + "selectedUsers": "選定的使用者", + "allLibraries": "允許所有媒體庫", + "selectedLibraries": "選定的媒體庫" + }, + "sections": { + "status": "狀態", + "info": "插件資訊", + "configuration": "設定", + "manifest": "資訊清單", + "usersPermission": "使用者權限", + "libraryPermission": "媒體庫權限" + }, + "status": { + "enabled": "已啟用", + "disabled": "已停用" + }, + "actions": { + "enable": "啟用", + "disable": "停用", + "disabledDueToError": "修復錯誤後才能啟用", + "disabledUsersRequired": "啟用前請先選擇使用者", + "disabledLibrariesRequired": "啟用前請先選擇媒體庫", + "addConfig": "新增設定", + "rescan": "重新掃描" + }, + "notifications": { + "enabled": "插件已啟用", + "disabled": "插件已停用", + "updated": "插件已更新", + "error": "更新插件時發生錯誤" + }, + "validation": { + "invalidJson": "設定必須是有效的 JSON" + }, + "messages": { + "configHelp": "使用鍵值對設定插件。若插件無需設定則留空。", + "configValidationError": "設定驗證失敗：", + "schemaRenderError": "無法顯示設定表單。插件的 schema 可能無效。", + "clickPermissions": "點擊權限以查看詳細資訊", + "noConfig": "無設定", + "allUsersHelp": "啟用後，插件將可存取所有使用者，包含未來建立的使用者。", + "noUsers": "未選擇使用者", + "permissionReason": "原因", + "usersRequired": "此插件需要存取使用者資訊。請選擇插件可存取的使用者，或啟用「允許所有使用者」。", + "allLibrariesHelp": "啟用後，插件將可存取所有媒體庫，包含未來建立的媒體庫。", + "noLibraries": "未選擇媒體庫", + "librariesRequired": "此插件需要存取媒體庫資訊。請選擇插件可存取的媒體庫，或啟用「允許所有媒體庫」。", + "requiredHosts": "必要的 Hosts" + }, + "placeholders": { + "configKey": "鍵", + "configValue": "值" + } } }, "ra": { @@ -474,10 +555,11 @@ }, "message": { "note": "注意", - "transcodingDisabled": "出於安全原因，已停用了從 Web 介面更改參數。要更改（編輯或新增）轉碼選項，請在啟用 %{config} 選項的情況下重新啟動伺服器。", + "transcodingDisabled": "出於安全原因，已禁用了從 Web 介面更改參數。要更改（編輯或新增）轉碼選項，請在啟用 %{config} 設定選項的情況下重新啟動伺服器。", "transcodingEnabled": "Navidrome 目前與 %{config} 一起使用，因此可以透過 Web 介面從轉碼設定中執行系統命令。出於安全考慮，我們建議停用此功能，並僅在設定轉碼選項時啟用。", "songsAddedToPlaylist": "已加入一首歌到播放清單 |||| 已新增 %{smart_count} 首歌到播放清單", "noSimilarSongsFound": "找不到相似歌曲", + "startingInstantMix": "正在載入即時混音...", "noTopSongsFound": "找不到熱門歌曲", "noPlaylistsAvailable": "沒有可用的播放清單", "delete_user_title": "刪除使用者「%{name}」", @@ -490,12 +572,12 @@ "notifications_not_available": "此瀏覽器不支援桌面通知，或您並非透過 HTTPS 存取 Navidrome", "lastfmLinkSuccess": "已成功連接 Last.fm 並開啟音樂記錄", "lastfmLinkFailure": "無法連接 Last.fm", - "lastfmUnlinkSuccess": "已取消 Last.fm 的連接並停用音樂記錄", - "lastfmUnlinkFailure": "無法取消 Last.fm 的連接", - "listenBrainzLinkSuccess": "已成功以 %{user} 身份連接 ListenBrainz 並開啟音樂記錄", + "lastfmUnlinkSuccess": "已取消與 Last.fm 的連接並停用音樂記錄", + "lastfmUnlinkFailure": "無法取消與 Last.fm 的連接", + "listenBrainzLinkSuccess": "已成功以 %{user} 的身份連接 ListenBrainz 並開啟音樂記錄", "listenBrainzLinkFailure": "無法連接 ListenBrainz：%{error}", - "listenBrainzUnlinkSuccess": "已取消 ListenBrainz 的連接並停用音樂記錄", - "listenBrainzUnlinkFailure": "無法取消 ListenBrainz 的連接", + "listenBrainzUnlinkSuccess": "已取消與 ListenBrainz 的連接並停用音樂記錄", + "listenBrainzUnlinkFailure": "無法取消與 ListenBrainz 的連接", "openIn": { "lastfm": "在 Last.fm 中開啟", "musicbrainz": "在 MusicBrainz 中開啟" @@ -556,7 +638,7 @@ "previousTrackText": "上一首", "reloadText": "重新載入", "volumeText": "音量", - "toggleLyricText": "切換歌詞", + "toggleLyricText": "歌詞顯示", "toggleMiniModeText": "最小化", "destroyText": "關閉", "downloadText": "下載", @@ -602,6 +684,7 @@ "totalScanned": "已掃描的資料夾總數", "quickScan": "快速掃描", "fullScan": "完全掃描", + "selectiveScan": "選擇性掃描", "serverUptime": "伺服器運作時間", "serverDown": "伺服器已離線", "scanType": "掃描類型", From 15526b25e5c3c6f4ce1e0951183645b3847cc0ee Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 2 Feb 2026 20:56:58 +0100 Subject: [PATCH 23/82] docs: fix gotaglib comment Signed-off-by: Deluan --- adapters/gotaglib/gotaglib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapters/gotaglib/gotaglib.go b/adapters/gotaglib/gotaglib.go index f68985a07..e5fb35427 100644 --- a/adapters/gotaglib/gotaglib.go +++ b/adapters/gotaglib/gotaglib.go @@ -6,7 +6,7 @@ // efficient access to format-specific tags (ID3v2 frames, MP4 atoms, ASF attributes) // through a single file open operation. // -// This extractor is registered under the name "gotaglib". It only works with a filesystem +// This extractor is registered under the name "taglib". It only works with a filesystem // (fs.FS) and does not support direct local file paths. Files returned by the filesystem // must implement io.ReadSeeker for go-taglib to read them. package gotaglib From 2068e7d413c93bb679e76f8a8247dbe11423e354 Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 3 Feb 2026 10:11:55 -0500 Subject: [PATCH 24/82] fix(plugins): don't recording metrics for not implemented plugin calls Signed-off-by: Deluan --- plugins/manager_call.go | 3 ++- plugins/manager_call_test.go | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/manager_call.go b/plugins/manager_call.go index 834f45425..b5c7536b6 100644 --- a/plugins/manager_call.go +++ b/plugins/manager_call.go @@ -73,7 +73,8 @@ func callPluginFunction[I any, O any](ctx context.Context, plugin *plugin, funcN if exit != 0 { if exit == notImplementedCode { log.Trace(ctx, "Plugin function not implemented", "plugin", plugin.name, "function", funcName, "pluginDuration", elapsed, "navidromeDuration", startCall.Sub(start)) - plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, true, elapsed.Milliseconds()) + // TODO Should we record metrics for not implemented calls? + //plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, true, elapsed.Milliseconds()) return result, fmt.Errorf("%w: %s", errNotImplemented, funcName) } plugin.metrics.RecordPluginRequest(ctx, plugin.name, funcName, false, elapsed.Milliseconds()) diff --git a/plugins/manager_call_test.go b/plugins/manager_call_test.go index 32e9df99f..8865e1266 100644 --- a/plugins/manager_call_test.go +++ b/plugins/manager_call_test.go @@ -106,7 +106,7 @@ var _ = Describe("callPluginFunction metrics", Ordered, func() { Expect(calls[0].ok).To(BeFalse()) }) - It("records metrics for not-implemented functions", func() { + It("does not record metrics for not-implemented functions", func() { // Use partial metadata agent that doesn't implement GetArtistMBID partialRecorder := &mockMetricsRecorder{} partialManager, _ := createTestManagerWithPluginsAndMetrics( @@ -123,9 +123,6 @@ var _ = Describe("callPluginFunction metrics", Ordered, func() { Expect(err).To(MatchError(errNotImplemented)) calls := partialRecorder.getCalls() - Expect(calls).To(HaveLen(1)) - Expect(calls[0].plugin).To(Equal("partial-metadata-agent")) - Expect(calls[0].method).To(Equal(FuncGetArtistMBID)) - Expect(calls[0].ok).To(BeTrue()) + Expect(calls).To(HaveLen(0)) }) }) From c3a4585c83d8ea94445bab6f5c7dfc7140d04c3f Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 3 Feb 2026 11:41:49 -0500 Subject: [PATCH 25/82] chore(plugins): move Discord Rich Presence plugin to its own repository: https://github.com/navidrome/discord-rich-presence-plugin --- plugins/README.md | 3 +- plugins/examples/README.md | 3 +- .../discord-rich-presence-rs/README.md | 2 +- .../examples/discord-rich-presence/README.md | 135 ------ plugins/examples/discord-rich-presence/go.mod | 32 -- plugins/examples/discord-rich-presence/go.sum | 73 ---- .../examples/discord-rich-presence/main.go | 219 ---------- .../discord-rich-presence/main_test.go | 227 ---------- .../discord-rich-presence/manifest.json | 102 ----- plugins/examples/discord-rich-presence/rpc.go | 400 ------------------ .../discord-rich-presence/rpc_test.go | 279 ------------ 11 files changed, 3 insertions(+), 1472 deletions(-) delete mode 100644 plugins/examples/discord-rich-presence/README.md delete mode 100644 plugins/examples/discord-rich-presence/go.mod delete mode 100644 plugins/examples/discord-rich-presence/go.sum delete mode 100644 plugins/examples/discord-rich-presence/main.go delete mode 100644 plugins/examples/discord-rich-presence/main_test.go delete mode 100644 plugins/examples/discord-rich-presence/manifest.json delete mode 100644 plugins/examples/discord-rich-presence/rpc.go delete mode 100644 plugins/examples/discord-rich-presence/rpc_test.go diff --git a/plugins/README.md b/plugins/README.md index c11dd2db0..e37a94d7a 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -1036,9 +1036,8 @@ See [examples/](examples/) for complete working plugins: | [coverartarchive-py](examples/coverartarchive-py/) | Python | MetadataAgent | HTTP | Cover Art Archive | | [webhook-rs](examples/webhook-rs/) | Rust | Scrobbler | HTTP | HTTP webhooks | | [nowplaying-py](examples/nowplaying-py/) | Python | Lifecycle | Scheduler, SubsonicAPI | Periodic now-playing logger | -| [library-inspector](examples/library-inspector-rs/) | Rust | Lifecycle | Library, Scheduler | Periodic library stats logging | +| [library-inspector](examples/library-inspector-rs/) | Rust | Lifecycle | Library, Scheduler | Periodic library stats logging | | [crypto-ticker](examples/crypto-ticker/) | Go | Lifecycle | WebSocket, Scheduler | Real-time crypto prices demo | -| [discord-rich-presence](examples/discord-rich-presence/) | Go | Scrobbler | HTTP, WebSocket, Cache, Scheduler, Artwork | Discord integration | | [discord-rich-presence-rs](examples/discord-rich-presence-rs/) | Rust | Scrobbler | HTTP, WebSocket, Cache, Scheduler, Artwork | Discord integration (Rust) | --- diff --git a/plugins/examples/README.md b/plugins/examples/README.md index 3b3a253cf..bce2b6762 100644 --- a/plugins/examples/README.md +++ b/plugins/examples/README.md @@ -9,7 +9,6 @@ This folder contains example plugins demonstrating various capabilities and lang | [minimal](minimal/) | Go | MetadataAgent | Basic plugin structure | | [wikimedia](wikimedia/) | Go | MetadataAgent | Wikidata/Wikipedia metadata | | [crypto-ticker](crypto-ticker/) | Go | Scheduler, WebSocket, Cache | Real-time crypto prices (demo) | -| [discord-rich-presence](discord-rich-presence/) | Go | Scrobbler, Scheduler, WebSocket, Cache, Artwork | Discord integration | | [coverartarchive-py](coverartarchive-py/) | Python | MetadataAgent | Cover Art Archive | | [nowplaying-py](nowplaying-py/) | Python | Scheduler, SubsonicAPI | Now playing logger | | [webhook-rs](webhook-rs/) | Rust | Scrobbler | HTTP webhook on scrobble | @@ -37,7 +36,7 @@ This creates `.ndp` package files for each plugin. ```bash make minimal.ndp make wikimedia.ndp -make discord-rich-presence.ndp +make discord-rich-presence-rs.ndp ``` ### Clean diff --git a/plugins/examples/discord-rich-presence-rs/README.md b/plugins/examples/discord-rich-presence-rs/README.md index 503d8ee92..5cd973af0 100644 --- a/plugins/examples/discord-rich-presence-rs/README.md +++ b/plugins/examples/discord-rich-presence-rs/README.md @@ -29,7 +29,7 @@ This plugin implements multiple capabilities to demonstrate the nd-pdk library: ## Configuration -Configure in the Navidrome UI (Settings → Plugins → discord-rich-presence): +Configure in the Navidrome UI (Settings → Plugins → discord-rich-presence-rs): | Key | Description | Example | |---------------|--------------------------------------|---------------------------| diff --git a/plugins/examples/discord-rich-presence/README.md b/plugins/examples/discord-rich-presence/README.md deleted file mode 100644 index bb4d1070a..000000000 --- a/plugins/examples/discord-rich-presence/README.md +++ /dev/null @@ -1,135 +0,0 @@ -# Discord Rich Presence Plugin - -This example plugin integrates Navidrome with Discord Rich Presence. It shows how a plugin can keep a real-time connection to an external service while remaining completely stateless. This plugin is based on the [Navicord](https://github.com/logixism/navicord) project, which provides similar functionality. - -**⚠️ WARNING: This plugin is for demonstration purposes only. It relies on the user's Discord token being stored in the Navidrome configuration file, which is not secure and may be against Discord's terms of service. Use it at your own risk.** - -## Overview - -The plugin exposes three capabilities: - -- **Scrobbler** – receives `NowPlaying` notifications from Navidrome -- **WebSocketCallback** – handles Discord gateway messages -- **SchedulerCallback** – used to clear presence and send periodic heartbeats - -It relies on several host services declared in the manifest: - -- `http` – queries Discord API endpoints -- `websocket` – maintains gateway connections -- `scheduler` – schedules heartbeats and presence cleanup -- `cache` – stores sequence numbers for heartbeats -- `artwork` – resolves track artwork URLs - -## Architecture - -The plugin registers capabilities using the PDK Register pattern: - -```go -import ( - "github.com/navidrome/navidrome/plugins/pdk/go/scrobbler" - "github.com/navidrome/navidrome/plugins/pdk/go/scheduler" - "github.com/navidrome/navidrome/plugins/pdk/go/websocket" -) - -type discordPlugin struct{} - -func init() { - scrobbler.Register(&discordPlugin{}) - scheduler.Register(&discordPlugin{}) - websocket.Register(&discordPlugin{}) -} -``` - -The PDK generates the appropriate export wrappers automatically. - -When `NowPlaying` is invoked the plugin: - -1. Loads `clientid` and user tokens from the configuration (because plugins are stateless). -2. Connects to Discord using `WebSocketService` if no connection exists. -3. Sends the activity payload with track details and artwork. -4. Schedules a one-time callback to clear the presence after the track finishes. - -Heartbeat messages are sent by a recurring scheduler job. Sequence numbers received from Discord are stored in `CacheService` to remain available across plugin instances. - -The scheduler callback uses the `payload` field to route to the appropriate handler: -- `"heartbeat"` – sends a heartbeat to Discord (recurring) -- `"clear-activity"` – clears the presence and disconnects (one-time) - -## Stateless Operation - -Navidrome plugins are completely stateless – each method call instantiates a new plugin instance and discards it afterwards. - -To work within this model the plugin stores no in-memory state. Connections are keyed by username inside the host services and any transient data (like Discord sequence numbers) is kept in the cache. Configuration is reloaded on every method call. - -## Configuration - -Configure in the Navidrome UI (Settings → Plugins → discord-rich-presence): - -| Key | Description | Example | -|---------------|-------------------------------------------|--------------------------------| -| `clientid` | Your Discord application ID | `123456789012345678` | -| `user.` | Discord token for the specified user | `user.alice` = `token123` | - -Each user is configured as a separate key with the `user.` prefix. - -## Building - -From the `plugins/examples/` directory: - -```sh -make discord-rich-presence.ndp -``` - -Or manually: - -```sh -cd discord-rich-presence -tinygo build -target wasip1 -buildmode=c-shared -o plugin.wasm . -zip -j discord-rich-presence.ndp manifest.json plugin.wasm -``` - -## Installation - -Place the resulting `discord-rich-presence.ndp` in your Navidrome plugins folder and enable plugins in your configuration: - -```toml -[Plugins] -Enabled = true -Folder = "/path/to/plugins" -``` - -## Files - -| File | Description | -|-----------|------------------------------------------------------------------| -| `main.go` | Plugin entry point, capability registration, and implementations | -| `rpc.go` | Discord gateway communication and RPC logic | -| `go.mod` | Go module file | - -## PDK - -This plugin imports the Navidrome PDK subpackages directly: - -```go -import ( - "github.com/navidrome/navidrome/plugins/pdk/go/host" - "github.com/navidrome/navidrome/plugins/pdk/go/scheduler" - "github.com/navidrome/navidrome/plugins/pdk/go/scrobbler" - "github.com/navidrome/navidrome/plugins/pdk/go/websocket" -) -``` - -The `go.mod` file uses `replace` directives to point to the local packages for development. - -## Host Services Used - -| Service | Purpose | -|-----------|------------------------------------------------------------------| -| Cache | Store Discord sequence numbers and processed image URLs | -| Scheduler | Schedule heartbeats (recurring) and activity clearing (one-time) | -| WebSocket | Maintain persistent connection to Discord gateway | -| Artwork | Get track artwork URLs for rich presence display | - -## Implementation Details - -See `main.go` and `rpc.go` for the complete implementation. diff --git a/plugins/examples/discord-rich-presence/go.mod b/plugins/examples/discord-rich-presence/go.mod deleted file mode 100644 index 59f36ad06..000000000 --- a/plugins/examples/discord-rich-presence/go.mod +++ /dev/null @@ -1,32 +0,0 @@ -module discord-rich-presence - -go 1.25 - -require ( - github.com/navidrome/navidrome/plugins/pdk/go v0.0.0 - github.com/onsi/ginkgo/v2 v2.27.3 - github.com/onsi/gomega v1.38.3 - github.com/stretchr/testify v1.11.1 -) - -require ( - github.com/Masterminds/semver/v3 v3.4.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/extism/go-pdk v1.1.3 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-task/slim-sprig/v3 v3.0.0 // indirect - github.com/google/go-cmp v0.7.0 // indirect - github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.5.2 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.27.0 // indirect - golang.org/x/net v0.43.0 // indirect - golang.org/x/sync v0.16.0 // indirect - golang.org/x/sys v0.35.0 // indirect - golang.org/x/text v0.28.0 // indirect - golang.org/x/tools v0.36.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) - -replace github.com/navidrome/navidrome/plugins/pdk/go => ../../pdk/go diff --git a/plugins/examples/discord-rich-presence/go.sum b/plugins/examples/discord-rich-presence/go.sum deleted file mode 100644 index 3e12b44fb..000000000 --- a/plugins/examples/discord-rich-presence/go.sum +++ /dev/null @@ -1,73 +0,0 @@ -github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= -github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/extism/go-pdk v1.1.3 h1:hfViMPWrqjN6u67cIYRALZTZLk/enSPpNKa+rZ9X2SQ= -github.com/extism/go-pdk v1.1.3/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4= -github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs= -github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo= -github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M= -github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6OPYerdAAS9tk= -github.com/gkampitakis/go-snaps v0.5.15 h1:amyJrvM1D33cPHwVrjo9jQxX8g/7E2wYdZ+01KS3zGE= -github.com/gkampitakis/go-snaps v0.5.15/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= -github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= -github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= -github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= -github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= -github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8= -github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= -github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE= -github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo= -github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg= -github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE= -github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A= -github.com/onsi/ginkgo/v2 v2.27.3 h1:ICsZJ8JoYafeXFFlFAG75a7CxMsJHwgKwtO+82SE9L8= -github.com/onsi/ginkgo/v2 v2.27.3/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= -github.com/onsi/gomega v1.38.3 h1:eTX+W6dobAYfFeGC2PV6RwXRu/MyT+cQguijutvkpSM= -github.com/onsi/gomega v1.38.3/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= -github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= -github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= -github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= -github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= -github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= -golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= -golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= -google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= -google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/plugins/examples/discord-rich-presence/main.go b/plugins/examples/discord-rich-presence/main.go deleted file mode 100644 index abd628abb..000000000 --- a/plugins/examples/discord-rich-presence/main.go +++ /dev/null @@ -1,219 +0,0 @@ -// Discord Rich Presence Plugin for Navidrome -// -// This plugin integrates Navidrome with Discord Rich Presence. It shows how a plugin can -// keep a real-time connection to an external service while remaining completely stateless. -// -// Capabilities: Scrobbler, SchedulerCallback, WebSocketCallback -// -// NOTE: This plugin is for demonstration purposes only. It relies on the user's Discord -// token being stored in the Navidrome configuration file, which is not secure and may be -// against Discord's terms of service. Use it at your own risk. -package main - -import ( - "encoding/json" - "fmt" - "strings" - "time" - - "github.com/navidrome/navidrome/plugins/pdk/go/host" - "github.com/navidrome/navidrome/plugins/pdk/go/pdk" - "github.com/navidrome/navidrome/plugins/pdk/go/scheduler" - "github.com/navidrome/navidrome/plugins/pdk/go/scrobbler" - "github.com/navidrome/navidrome/plugins/pdk/go/websocket" -) - -// Configuration keys -const ( - clientIDKey = "clientid" - usersKey = "users" -) - -// userToken represents a user-token mapping from the config -type userToken struct { - Username string `json:"username"` - Token string `json:"token"` -} - -// discordPlugin implements the scrobbler and scheduler interfaces. -type discordPlugin struct{} - -// rpc handles Discord gateway communication (via websockets). -var rpc = &discordRPC{} - -// init registers the plugin capabilities -func init() { - scrobbler.Register(&discordPlugin{}) - scheduler.Register(&discordPlugin{}) - websocket.Register(rpc) -} - -// getConfig loads the plugin configuration. -func getConfig() (clientID string, users map[string]string, err error) { - clientID, ok := pdk.GetConfig(clientIDKey) - if !ok || clientID == "" { - pdk.Log(pdk.LogWarn, "missing ClientID in configuration") - return "", nil, nil - } - - // Get the users array from config - usersJSON, ok := pdk.GetConfig(usersKey) - if !ok || usersJSON == "" { - pdk.Log(pdk.LogWarn, "no users configured") - return clientID, nil, nil - } - - // Parse the JSON array - var userTokens []userToken - if err := json.Unmarshal([]byte(usersJSON), &userTokens); err != nil { - pdk.Log(pdk.LogError, fmt.Sprintf("failed to parse users config: %v", err)) - return clientID, nil, nil - } - - if len(userTokens) == 0 { - pdk.Log(pdk.LogWarn, "no users configured") - return clientID, nil, nil - } - - // Build the users map - users = make(map[string]string) - for _, ut := range userTokens { - if ut.Username != "" && ut.Token != "" { - users[ut.Username] = ut.Token - } - } - - if len(users) == 0 { - pdk.Log(pdk.LogWarn, "no valid users configured") - return clientID, nil, nil - } - - return clientID, users, nil -} - -// getImageURL retrieves the track artwork URL. -func getImageURL(trackID string) string { - artworkURL, err := host.ArtworkGetTrackUrl(trackID, 300) - if err != nil { - pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to get artwork URL: %v", err)) - return "" - } - - // Don't use localhost URLs - if strings.HasPrefix(artworkURL, "http://localhost") { - return "" - } - return artworkURL -} - -// ============================================================================ -// Scrobbler Implementation -// ============================================================================ - -// IsAuthorized checks if a user is authorized for Discord Rich Presence. -func (p *discordPlugin) IsAuthorized(input scrobbler.IsAuthorizedRequest) (bool, error) { - _, users, err := getConfig() - if err != nil { - return false, fmt.Errorf("failed to check user authorization: %w", err) - } - - _, authorized := users[input.Username] - pdk.Log(pdk.LogInfo, fmt.Sprintf("IsAuthorized for user %s: %v", input.Username, authorized)) - return authorized, nil -} - -// NowPlaying sends a now playing notification to Discord. -func (p *discordPlugin) NowPlaying(input scrobbler.NowPlayingRequest) error { - pdk.Log(pdk.LogInfo, fmt.Sprintf("Setting presence for user %s, track: %s", input.Username, input.Track.Title)) - - // Load configuration - clientID, users, err := getConfig() - if err != nil { - return fmt.Errorf("%w: failed to get config: %v", scrobbler.ScrobblerErrorRetryLater, err) - } - - // Check authorization - userToken, authorized := users[input.Username] - if !authorized { - return fmt.Errorf("%w: user '%s' not authorized", scrobbler.ScrobblerErrorNotAuthorized, input.Username) - } - - // Connect to Discord - if err := rpc.connect(input.Username, userToken); err != nil { - return fmt.Errorf("%w: failed to connect to Discord: %v", scrobbler.ScrobblerErrorRetryLater, err) - } - - // Cancel any existing completion schedule - _ = host.SchedulerCancelSchedule(fmt.Sprintf("%s-clear", input.Username)) - - // Calculate timestamps - now := time.Now().Unix() - startTime := (now - int64(input.Position)) * 1000 - endTime := startTime + int64(input.Track.Duration)*1000 - - // Send activity update - if err := rpc.sendActivity(clientID, input.Username, userToken, activity{ - Application: clientID, - Name: "Navidrome", - Type: 2, // Listening - Details: input.Track.Title, - State: input.Track.Artist, - Timestamps: activityTimestamps{ - Start: startTime, - End: endTime, - }, - Assets: activityAssets{ - LargeImage: getImageURL(input.Track.ID), - LargeText: input.Track.Album, - }, - }); err != nil { - return fmt.Errorf("%w: failed to send activity: %v", scrobbler.ScrobblerErrorRetryLater, err) - } - - // Schedule a timer to clear the activity after the track completes - remainingSeconds := int32(input.Track.Duration) - input.Position + 5 - _, err = host.SchedulerScheduleOneTime(remainingSeconds, payloadClearActivity, fmt.Sprintf("%s-clear", input.Username)) - if err != nil { - pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to schedule completion timer: %v", err)) - } - - return nil -} - -// Scrobble handles scrobble requests (no-op for Discord). -func (p *discordPlugin) Scrobble(_ scrobbler.ScrobbleRequest) error { - // Discord Rich Presence doesn't need scrobble events - return nil -} - -// ============================================================================ -// Scheduler Callback Implementation -// ============================================================================ - -// OnCallback handles scheduler callbacks. -func (p *discordPlugin) OnCallback(input scheduler.SchedulerCallbackRequest) error { - pdk.Log(pdk.LogDebug, fmt.Sprintf("Scheduler callback: id=%s, payload=%s, recurring=%v", input.ScheduleID, input.Payload, input.IsRecurring)) - - // Route based on payload - switch input.Payload { - case payloadHeartbeat: - // Heartbeat callback - scheduleId is the username - if err := rpc.handleHeartbeatCallback(input.ScheduleID); err != nil { - return err - } - - case payloadClearActivity: - // Clear activity callback - scheduleId is "username-clear" - username := strings.TrimSuffix(input.ScheduleID, "-clear") - if err := rpc.handleClearActivityCallback(username); err != nil { - return err - } - - default: - pdk.Log(pdk.LogWarn, fmt.Sprintf("Unknown scheduler callback payload: %s", input.Payload)) - } - - return nil -} - -func main() {} diff --git a/plugins/examples/discord-rich-presence/main_test.go b/plugins/examples/discord-rich-presence/main_test.go deleted file mode 100644 index fd35ad929..000000000 --- a/plugins/examples/discord-rich-presence/main_test.go +++ /dev/null @@ -1,227 +0,0 @@ -package main - -import ( - "errors" - "strings" - "testing" - - "github.com/navidrome/navidrome/plugins/pdk/go/host" - "github.com/navidrome/navidrome/plugins/pdk/go/pdk" - "github.com/navidrome/navidrome/plugins/pdk/go/scheduler" - "github.com/navidrome/navidrome/plugins/pdk/go/scrobbler" - "github.com/stretchr/testify/mock" - - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" -) - -func TestDiscordPlugin(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "Discord Plugin Main Suite") -} - -var _ = Describe("discordPlugin", func() { - var plugin discordPlugin - - BeforeEach(func() { - plugin = discordPlugin{} - pdk.ResetMock() - host.CacheMock.ExpectedCalls = nil - host.CacheMock.Calls = nil - host.ConfigMock.ExpectedCalls = nil - host.ConfigMock.Calls = nil - host.WebSocketMock.ExpectedCalls = nil - host.WebSocketMock.Calls = nil - host.SchedulerMock.ExpectedCalls = nil - host.SchedulerMock.Calls = nil - host.ArtworkMock.ExpectedCalls = nil - host.ArtworkMock.Calls = nil - }) - - Describe("getConfig", func() { - It("returns config values when properly set", func() { - pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true) - host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.user1", "user.user2"}) - host.ConfigMock.On("Get", "user.user1").Return("token1", true) - host.ConfigMock.On("Get", "user.user2").Return("token2", true) - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - - clientID, users, err := getConfig() - Expect(err).ToNot(HaveOccurred()) - Expect(clientID).To(Equal("test-client-id")) - Expect(users).To(HaveLen(2)) - Expect(users["user1"]).To(Equal("token1")) - Expect(users["user2"]).To(Equal("token2")) - }) - - It("returns empty client ID when not set", func() { - pdk.PDKMock.On("GetConfig", clientIDKey).Return("", false) - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - - clientID, users, err := getConfig() - Expect(err).ToNot(HaveOccurred()) - Expect(clientID).To(BeEmpty()) - Expect(users).To(BeNil()) - }) - - It("returns nil users when users not configured", func() { - pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true) - host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{}) - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - - clientID, users, err := getConfig() - Expect(err).ToNot(HaveOccurred()) - Expect(clientID).To(Equal("test-client-id")) - Expect(users).To(BeNil()) - }) - }) - - Describe("IsAuthorized", func() { - BeforeEach(func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - }) - - It("returns true for authorized user", func() { - pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true) - host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.testuser"}) - host.ConfigMock.On("Get", "user.testuser").Return("token123", true) - - authorized, err := plugin.IsAuthorized(scrobbler.IsAuthorizedRequest{ - Username: "testuser", - }) - Expect(err).ToNot(HaveOccurred()) - Expect(authorized).To(BeTrue()) - }) - - It("returns false for unauthorized user", func() { - pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true) - host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.otheruser"}) - host.ConfigMock.On("Get", "user.otheruser").Return("token123", true) - - authorized, err := plugin.IsAuthorized(scrobbler.IsAuthorizedRequest{ - Username: "testuser", - }) - Expect(err).ToNot(HaveOccurred()) - Expect(authorized).To(BeFalse()) - }) - }) - - Describe("NowPlaying", func() { - BeforeEach(func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - }) - - It("returns not authorized error when user not in config", func() { - pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true) - host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.otheruser"}) - host.ConfigMock.On("Get", "user.otheruser").Return("token", true) - - err := plugin.NowPlaying(scrobbler.NowPlayingRequest{ - Username: "testuser", - Track: scrobbler.TrackInfo{Title: "Test Song"}, - }) - Expect(err).To(HaveOccurred()) - Expect(errors.Is(err, scrobbler.ScrobblerErrorNotAuthorized)).To(BeTrue()) - }) - - It("successfully sends now playing update", func() { - pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true) - host.ConfigMock.On("Keys", userKeyPrefix).Return([]string{"user.testuser"}) - host.ConfigMock.On("Get", "user.testuser").Return("test-token", true) - - // Connect mocks (isConnected check via heartbeat) - host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("not found")) - - // Mock HTTP GET request for gateway discovery - gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`) - gatewayReq := &pdk.HTTPRequest{} - pdk.PDKMock.On("NewHTTPRequest", pdk.MethodGet, "https://discord.com/api/gateway").Return(gatewayReq).Once() - pdk.PDKMock.On("Send", gatewayReq).Return(pdk.NewStubHTTPResponse(200, nil, gatewayResp)).Once() - - // Mock WebSocket connection - host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool { - return strings.Contains(url, "gateway.discord.gg") - }), mock.Anything, "testuser").Return("testuser", nil) - host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil) - host.SchedulerMock.On("ScheduleRecurring", mock.Anything, payloadHeartbeat, "testuser").Return("testuser", nil) - - // Cancel existing clear schedule (may or may not exist) - host.SchedulerMock.On("CancelSchedule", "testuser-clear").Return(nil) - - // Image mocks - cache miss, will make HTTP request to Discord - host.CacheMock.On("GetString", mock.MatchedBy(func(key string) bool { - return strings.HasPrefix(key, "discord.image.") - })).Return("", false, nil) - host.CacheMock.On("SetString", mock.Anything, mock.Anything, mock.Anything).Return(nil) - host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("https://example.com/art.jpg", nil) - - // Mock HTTP request for Discord external assets API - assetsReq := &pdk.HTTPRequest{} - pdk.PDKMock.On("NewHTTPRequest", pdk.MethodPost, mock.MatchedBy(func(url string) bool { - return strings.Contains(url, "external-assets") - })).Return(assetsReq) - pdk.PDKMock.On("Send", assetsReq).Return(pdk.NewStubHTTPResponse(200, nil, []byte(`{"key":"test-key"}`))) - - // Schedule clear activity callback - host.SchedulerMock.On("ScheduleOneTime", mock.Anything, payloadClearActivity, "testuser-clear").Return("testuser-clear", nil) - - err := plugin.NowPlaying(scrobbler.NowPlayingRequest{ - Username: "testuser", - Position: 10, - Track: scrobbler.TrackInfo{ - ID: "track1", - Title: "Test Song", - Artist: "Test Artist", - Album: "Test Album", - Duration: 180, - }, - }) - Expect(err).ToNot(HaveOccurred()) - }) - }) - - Describe("Scrobble", func() { - It("does nothing (returns nil)", func() { - err := plugin.Scrobble(scrobbler.ScrobbleRequest{}) - Expect(err).ToNot(HaveOccurred()) - }) - }) - - Describe("OnCallback", func() { - BeforeEach(func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - }) - - It("handles heartbeat callback", func() { - host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(42), true, nil) - host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil) - - err := plugin.OnCallback(scheduler.SchedulerCallbackRequest{ - ScheduleID: "testuser", - Payload: payloadHeartbeat, - IsRecurring: true, - }) - Expect(err).ToNot(HaveOccurred()) - }) - - It("handles clearActivity callback", func() { - host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil) - host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil) - host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Navidrome disconnect").Return(nil) - - err := plugin.OnCallback(scheduler.SchedulerCallbackRequest{ - ScheduleID: "testuser-clear", - Payload: payloadClearActivity, - }) - Expect(err).ToNot(HaveOccurred()) - }) - - It("logs warning for unknown payload", func() { - err := plugin.OnCallback(scheduler.SchedulerCallbackRequest{ - ScheduleID: "testuser", - Payload: "unknown", - }) - Expect(err).ToNot(HaveOccurred()) - }) - }) -}) diff --git a/plugins/examples/discord-rich-presence/manifest.json b/plugins/examples/discord-rich-presence/manifest.json deleted file mode 100644 index ac8eec010..000000000 --- a/plugins/examples/discord-rich-presence/manifest.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "name": "Discord Rich Presence", - "author": "Navidrome Team", - "version": "1.0.0", - "description": "Discord Rich Presence integration for Navidrome", - "website": "https://github.com/navidrome/navidrome/tree/master/plugins/examples/discord-rich-presence", - "permissions": { - "users": { - "reason": "To process scrobbles on behalf of users" - }, - "http": { - "reason": "To communicate with Discord API for gateway discovery and image uploads", - "requiredHosts": [ - "discord.com" - ] - }, - "websocket": { - "reason": "To maintain real-time connection with Discord gateway", - "requiredHosts": [ - "gateway.discord.gg" - ] - }, - "cache": { - "reason": "To store connection state and sequence numbers" - }, - "scheduler": { - "reason": "To schedule heartbeat messages and activity clearing" - }, - "artwork": { - "reason": "To get track artwork URLs for rich presence display" - } - }, - "config": { - "schema": { - "type": "object", - "properties": { - "clientid": { - "type": "string", - "title": "Discord Application Client ID", - "description": "The Client ID from your Discord Developer Application. Create one at https://discord.com/developers/applications", - "minLength": 17, - "maxLength": 20, - "pattern": "^[0-9]+$" - }, - "users": { - "type": "array", - "title": "User Tokens", - "description": "Discord tokens for each Navidrome user. WARNING: Store tokens securely!", - "minItems": 1, - "items": { - "type": "object", - "properties": { - "username": { - "type": "string", - "title": "Navidrome Username", - "description": "The Navidrome username to associate with this Discord token", - "minLength": 1 - }, - "token": { - "type": "string", - "title": "Discord Token", - "description": "The user's Discord token (keep this secret!)", - "minLength": 1 - } - }, - "required": ["username", "token"] - } - } - }, - "required": ["clientid", "users"] - }, - "uiSchema": { - "type": "VerticalLayout", - "elements": [ - { - "type": "Control", - "scope": "#/properties/clientid" - }, - { - "type": "Control", - "scope": "#/properties/users", - "options": { - "elementLabelProp": "username", - "detail": { - "type": "HorizontalLayout", - "elements": [ - { - "type": "Control", - "scope": "#/properties/username" - }, - { - "type": "Control", - "scope": "#/properties/token" - } - ] - } - } - } - ] - } - } -} diff --git a/plugins/examples/discord-rich-presence/rpc.go b/plugins/examples/discord-rich-presence/rpc.go deleted file mode 100644 index 229bc0f22..000000000 --- a/plugins/examples/discord-rich-presence/rpc.go +++ /dev/null @@ -1,400 +0,0 @@ -// Discord Rich Presence Plugin - RPC Communication -// -// This file handles all Discord gateway communication including WebSocket connections, -// presence updates, and heartbeat management. The discordRPC struct implements WebSocket -// callback interfaces and encapsulates all Discord communication logic. -package main - -import ( - "encoding/json" - "fmt" - "strings" - - "github.com/navidrome/navidrome/plugins/pdk/go/host" - "github.com/navidrome/navidrome/plugins/pdk/go/pdk" - "github.com/navidrome/navidrome/plugins/pdk/go/websocket" -) - -// Discord WebSocket Gateway constants -const ( - heartbeatOpCode = 1 // Heartbeat operation code - gateOpCode = 2 // Identify operation code - presenceOpCode = 3 // Presence update operation code -) - -const ( - heartbeatInterval = 41 // Heartbeat interval in seconds - defaultImage = "https://i.imgur.com/hb3XPzA.png" -) - -// Scheduler callback payloads for routing -const ( - payloadHeartbeat = "heartbeat" - payloadClearActivity = "clear-activity" -) - -// discordRPC handles Discord gateway communication and implements WebSocket callbacks. -type discordRPC struct{} - -// ============================================================================ -// WebSocket Callback Implementation -// ============================================================================ - -// OnTextMessage handles incoming WebSocket text messages. -func (r *discordRPC) OnTextMessage(input websocket.OnTextMessageRequest) error { - return r.handleWebSocketMessage(input.ConnectionID, input.Message) -} - -// OnBinaryMessage handles incoming WebSocket binary messages. -func (r *discordRPC) OnBinaryMessage(input websocket.OnBinaryMessageRequest) error { - pdk.Log(pdk.LogDebug, fmt.Sprintf("Received unexpected binary message for connection '%s'", input.ConnectionID)) - return nil -} - -// OnError handles WebSocket errors. -func (r *discordRPC) OnError(input websocket.OnErrorRequest) error { - pdk.Log(pdk.LogWarn, fmt.Sprintf("WebSocket error for connection '%s': %s", input.ConnectionID, input.Error)) - return nil -} - -// OnClose handles WebSocket connection closure. -func (r *discordRPC) OnClose(input websocket.OnCloseRequest) error { - pdk.Log(pdk.LogInfo, fmt.Sprintf("WebSocket connection '%s' closed with code %d: %s", input.ConnectionID, input.Code, input.Reason)) - return nil -} - -// activity represents a Discord activity. -type activity struct { - Name string `json:"name"` - Type int `json:"type"` - Details string `json:"details"` - State string `json:"state"` - Application string `json:"application_id"` - Timestamps activityTimestamps `json:"timestamps"` - Assets activityAssets `json:"assets"` -} - -type activityTimestamps struct { - Start int64 `json:"start"` - End int64 `json:"end"` -} - -type activityAssets struct { - LargeImage string `json:"large_image"` - LargeText string `json:"large_text"` -} - -// presencePayload represents a Discord presence update. -type presencePayload struct { - Activities []activity `json:"activities"` - Since int64 `json:"since"` - Status string `json:"status"` - Afk bool `json:"afk"` -} - -// identifyPayload represents a Discord identify payload. -type identifyPayload struct { - Token string `json:"token"` - Intents int `json:"intents"` - Properties identifyProperties `json:"properties"` -} - -type identifyProperties struct { - OS string `json:"os"` - Browser string `json:"browser"` - Device string `json:"device"` -} - -// ============================================================================ -// Image Processing -// ============================================================================ - -// processImage processes an image URL for Discord, with fallback to default image. -func (r *discordRPC) processImage(imageURL, clientID, token string, isDefaultImage bool) (string, error) { - if imageURL == "" { - if isDefaultImage { - return "", fmt.Errorf("default image URL is empty") - } - return r.processImage(defaultImage, clientID, token, true) - } - - if strings.HasPrefix(imageURL, "mp:") { - return imageURL, nil - } - - // Check cache first - cacheKey := fmt.Sprintf("discord.image.%x", imageURL) - cachedValue, exists, err := host.CacheGetString(cacheKey) - if err == nil && exists { - pdk.Log(pdk.LogDebug, fmt.Sprintf("Cache hit for image URL: %s", imageURL)) - return cachedValue, nil - } - - // Process via Discord API - body := fmt.Sprintf(`{"urls":[%q]}`, imageURL) - req := pdk.NewHTTPRequest(pdk.MethodPost, fmt.Sprintf("https://discord.com/api/v9/applications/%s/external-assets", clientID)) - req.SetHeader("Authorization", token) - req.SetHeader("Content-Type", "application/json") - req.SetBody([]byte(body)) - - resp := req.Send() - if resp.Status() >= 400 { - if isDefaultImage { - return "", fmt.Errorf("failed to process default image: HTTP %d", resp.Status()) - } - return r.processImage(defaultImage, clientID, token, true) - } - - var data []map[string]string - if err := json.Unmarshal(resp.Body(), &data); err != nil { - if isDefaultImage { - return "", fmt.Errorf("failed to unmarshal default image response: %w", err) - } - return r.processImage(defaultImage, clientID, token, true) - } - - if len(data) == 0 { - if isDefaultImage { - return "", fmt.Errorf("no data returned for default image") - } - return r.processImage(defaultImage, clientID, token, true) - } - - image := data[0]["external_asset_path"] - if image == "" { - if isDefaultImage { - return "", fmt.Errorf("empty external_asset_path for default image") - } - return r.processImage(defaultImage, clientID, token, true) - } - - processedImage := fmt.Sprintf("mp:%s", image) - - // Cache the processed image URL - var ttl int64 = 4 * 60 * 60 // 4 hours for regular images - if isDefaultImage { - ttl = 48 * 60 * 60 // 48 hours for default image - } - - _ = host.CacheSetString(cacheKey, processedImage, ttl) - pdk.Log(pdk.LogDebug, fmt.Sprintf("Cached processed image URL for %s (TTL: %ds)", imageURL, ttl)) - - return processedImage, nil -} - -// ============================================================================ -// Activity Management -// ============================================================================ - -// sendActivity sends an activity update to Discord. -func (r *discordRPC) sendActivity(clientID, username, token string, data activity) error { - pdk.Log(pdk.LogInfo, fmt.Sprintf("Sending activity for user %s: %s - %s", username, data.Details, data.State)) - - processedImage, err := r.processImage(data.Assets.LargeImage, clientID, token, false) - if err != nil { - pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to process image for user %s, continuing without image: %v", username, err)) - data.Assets.LargeImage = "" - } else { - data.Assets.LargeImage = processedImage - } - - presence := presencePayload{ - Activities: []activity{data}, - Status: "dnd", - Afk: false, - } - return r.sendMessage(username, presenceOpCode, presence) -} - -// clearActivity clears the Discord activity for a user. -func (r *discordRPC) clearActivity(username string) error { - pdk.Log(pdk.LogInfo, fmt.Sprintf("Clearing activity for user %s", username)) - return r.sendMessage(username, presenceOpCode, presencePayload{}) -} - -// ============================================================================ -// Low-level Communication -// ============================================================================ - -// sendMessage sends a message over the WebSocket connection. -func (r *discordRPC) sendMessage(username string, opCode int, payload any) error { - message := map[string]any{ - "op": opCode, - "d": payload, - } - b, err := json.Marshal(message) - if err != nil { - return fmt.Errorf("failed to marshal message: %w", err) - } - - err = host.WebSocketSendText(username, string(b)) - if err != nil { - return fmt.Errorf("failed to send message: %w", err) - } - return nil -} - -// getDiscordGateway retrieves the Discord gateway URL. -func (r *discordRPC) getDiscordGateway() (string, error) { - req := pdk.NewHTTPRequest(pdk.MethodGet, "https://discord.com/api/gateway") - resp := req.Send() - if resp.Status() != 200 { - return "", fmt.Errorf("failed to get Discord gateway: HTTP %d", resp.Status()) - } - - var result map[string]string - if err := json.Unmarshal(resp.Body(), &result); err != nil { - return "", fmt.Errorf("failed to parse Discord gateway response: %w", err) - } - return result["url"], nil -} - -// sendHeartbeat sends a heartbeat to Discord. -func (r *discordRPC) sendHeartbeat(username string) error { - seqNum, _, err := host.CacheGetInt(fmt.Sprintf("discord.seq.%s", username)) - if err != nil { - return fmt.Errorf("failed to get sequence number: %w", err) - } - - pdk.Log(pdk.LogDebug, fmt.Sprintf("Sending heartbeat for user %s: %d", username, seqNum)) - return r.sendMessage(username, heartbeatOpCode, seqNum) -} - -// cleanupFailedConnection cleans up a failed Discord connection. -func (r *discordRPC) cleanupFailedConnection(username string) { - pdk.Log(pdk.LogInfo, fmt.Sprintf("Cleaning up failed connection for user %s", username)) - - // Cancel the heartbeat schedule - if err := host.SchedulerCancelSchedule(username); err != nil { - pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to cancel heartbeat schedule for user %s: %v", username, err)) - } - - // Close the WebSocket connection - if err := host.WebSocketCloseConnection(username, 1000, "Connection lost"); err != nil { - pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to close WebSocket connection for user %s: %v", username, err)) - } - - // Clean up cache entries - _ = host.CacheRemove(fmt.Sprintf("discord.seq.%s", username)) - - pdk.Log(pdk.LogInfo, fmt.Sprintf("Cleaned up connection for user %s", username)) -} - -// isConnected checks if a user is connected to Discord by testing the heartbeat. -func (r *discordRPC) isConnected(username string) bool { - err := r.sendHeartbeat(username) - if err != nil { - pdk.Log(pdk.LogDebug, fmt.Sprintf("Heartbeat test failed for user %s: %v", username, err)) - return false - } - return true -} - -// connect establishes a connection to Discord for a user. -func (r *discordRPC) connect(username, token string) error { - if r.isConnected(username) { - pdk.Log(pdk.LogInfo, fmt.Sprintf("Reusing existing connection for user %s", username)) - return nil - } - pdk.Log(pdk.LogInfo, fmt.Sprintf("Creating new connection for user %s", username)) - - // Get Discord Gateway URL - gateway, err := r.getDiscordGateway() - if err != nil { - return fmt.Errorf("failed to get Discord gateway: %w", err) - } - pdk.Log(pdk.LogDebug, fmt.Sprintf("Using gateway: %s", gateway)) - - // Connect to Discord Gateway - _, err = host.WebSocketConnect(gateway, nil, username) - if err != nil { - return fmt.Errorf("failed to connect to WebSocket: %w", err) - } - - // Send identify payload - payload := identifyPayload{ - Token: token, - Intents: 0, - Properties: identifyProperties{ - OS: "Windows 10", - Browser: "Discord Client", - Device: "Discord Client", - }, - } - if err := r.sendMessage(username, gateOpCode, payload); err != nil { - return fmt.Errorf("failed to send identify payload: %w", err) - } - - // Schedule heartbeats for this user/connection - cronExpr := fmt.Sprintf("@every %ds", heartbeatInterval) - scheduleID, err := host.SchedulerScheduleRecurring(cronExpr, payloadHeartbeat, username) - if err != nil { - return fmt.Errorf("failed to schedule heartbeat: %w", err) - } - pdk.Log(pdk.LogInfo, fmt.Sprintf("Scheduled heartbeat for user %s with ID %s", username, scheduleID)) - - pdk.Log(pdk.LogInfo, fmt.Sprintf("Successfully authenticated user %s", username)) - return nil -} - -// disconnect closes the Discord connection for a user. -func (r *discordRPC) disconnect(username string) error { - if err := host.SchedulerCancelSchedule(username); err != nil { - return fmt.Errorf("failed to cancel schedule: %w", err) - } - - if err := host.WebSocketCloseConnection(username, 1000, "Navidrome disconnect"); err != nil { - return fmt.Errorf("failed to close WebSocket connection: %w", err) - } - return nil -} - -// handleWebSocketMessage processes incoming WebSocket messages from Discord. -func (r *discordRPC) handleWebSocketMessage(connectionID, message string) error { - if len(message) < 1024 { - pdk.Log(pdk.LogTrace, fmt.Sprintf("Received WebSocket message for connection '%s': %s", connectionID, message)) - } else { - pdk.Log(pdk.LogTrace, fmt.Sprintf("Received WebSocket message for connection '%s' (truncated): %s...", connectionID, message[:1021])) - } - - // Parse the message - var msg map[string]any - if err := json.Unmarshal([]byte(message), &msg); err != nil { - return fmt.Errorf("failed to parse WebSocket message: %w", err) - } - - // Store sequence number if present - if v := msg["s"]; v != nil { - seq := int64(v.(float64)) - pdk.Log(pdk.LogTrace, fmt.Sprintf("Received sequence number for connection '%s': %d", connectionID, seq)) - if err := host.CacheSetInt(fmt.Sprintf("discord.seq.%s", connectionID), seq, int64(heartbeatInterval*2)); err != nil { - return fmt.Errorf("failed to store sequence number for user %s: %w", connectionID, err) - } - } - return nil -} - -// handleHeartbeatCallback processes heartbeat scheduler callbacks. -func (r *discordRPC) handleHeartbeatCallback(username string) error { - if err := r.sendHeartbeat(username); err != nil { - // On first heartbeat failure, immediately clean up the connection - pdk.Log(pdk.LogWarn, fmt.Sprintf("Heartbeat failed for user %s, cleaning up connection: %v", username, err)) - r.cleanupFailedConnection(username) - return fmt.Errorf("heartbeat failed, connection cleaned up: %w", err) - } - return nil -} - -// handleClearActivityCallback processes clear activity scheduler callbacks. -func (r *discordRPC) handleClearActivityCallback(username string) error { - pdk.Log(pdk.LogInfo, fmt.Sprintf("Removing presence for user %s", username)) - if err := r.clearActivity(username); err != nil { - return fmt.Errorf("failed to clear activity: %w", err) - } - - pdk.Log(pdk.LogInfo, fmt.Sprintf("Disconnecting user %s", username)) - if err := r.disconnect(username); err != nil { - return fmt.Errorf("failed to disconnect from Discord: %w", err) - } - return nil -} diff --git a/plugins/examples/discord-rich-presence/rpc_test.go b/plugins/examples/discord-rich-presence/rpc_test.go deleted file mode 100644 index b85c27ee5..000000000 --- a/plugins/examples/discord-rich-presence/rpc_test.go +++ /dev/null @@ -1,279 +0,0 @@ -package main - -import ( - "errors" - "strings" - - "github.com/navidrome/navidrome/plugins/pdk/go/host" - "github.com/navidrome/navidrome/plugins/pdk/go/pdk" - "github.com/navidrome/navidrome/plugins/pdk/go/websocket" - "github.com/stretchr/testify/mock" - - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" -) - -var _ = Describe("discordRPC", func() { - var r *discordRPC - - BeforeEach(func() { - r = &discordRPC{} - pdk.ResetMock() - host.CacheMock.ExpectedCalls = nil - host.CacheMock.Calls = nil - host.WebSocketMock.ExpectedCalls = nil - host.WebSocketMock.Calls = nil - host.SchedulerMock.ExpectedCalls = nil - host.SchedulerMock.Calls = nil - }) - - Describe("sendMessage", func() { - It("sends JSON message over WebSocket", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool { - return strings.Contains(msg, `"op":3`) - })).Return(nil) - - err := r.sendMessage("testuser", presenceOpCode, map[string]string{"status": "online"}) - Expect(err).ToNot(HaveOccurred()) - host.WebSocketMock.AssertExpectations(GinkgoT()) - }) - - It("returns error when WebSocket send fails", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.WebSocketMock.On("SendText", mock.Anything, mock.Anything). - Return(errors.New("connection closed")) - - err := r.sendMessage("testuser", presenceOpCode, map[string]string{}) - Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("connection closed")) - }) - }) - - Describe("sendHeartbeat", func() { - It("retrieves sequence number from cache and sends heartbeat", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(123), true, nil) - host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool { - return strings.Contains(msg, `"op":1`) && strings.Contains(msg, "123") - })).Return(nil) - - err := r.sendHeartbeat("testuser") - Expect(err).ToNot(HaveOccurred()) - host.CacheMock.AssertExpectations(GinkgoT()) - host.WebSocketMock.AssertExpectations(GinkgoT()) - }) - - It("returns error when cache get fails", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("cache error")) - - err := r.sendHeartbeat("testuser") - Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("cache error")) - }) - }) - - Describe("connect", func() { - It("establishes WebSocket connection and sends identify payload", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("not found")) - - // Mock HTTP GET request for gateway discovery - gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`) - httpReq := &pdk.HTTPRequest{} - pdk.PDKMock.On("NewHTTPRequest", pdk.MethodGet, "https://discord.com/api/gateway").Return(httpReq) - pdk.PDKMock.On("Send", mock.Anything).Return(pdk.NewStubHTTPResponse(200, nil, gatewayResp)) - - // Mock WebSocket connection - host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool { - return strings.Contains(url, "gateway.discord.gg") - }), mock.Anything, "testuser").Return("testuser", nil) - host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool { - return strings.Contains(msg, `"op":2`) && strings.Contains(msg, "test-token") - })).Return(nil) - host.SchedulerMock.On("ScheduleRecurring", "@every 41s", payloadHeartbeat, "testuser"). - Return("testuser", nil) - - err := r.connect("testuser", "test-token") - Expect(err).ToNot(HaveOccurred()) - }) - - It("reuses existing connection if connected", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(42), true, nil) - host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil) - - err := r.connect("testuser", "test-token") - Expect(err).ToNot(HaveOccurred()) - host.WebSocketMock.AssertNotCalled(GinkgoT(), "Connect", mock.Anything, mock.Anything, mock.Anything) - }) - }) - - Describe("disconnect", func() { - It("cancels schedule and closes WebSocket connection", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil) - host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Navidrome disconnect").Return(nil) - - err := r.disconnect("testuser") - Expect(err).ToNot(HaveOccurred()) - host.SchedulerMock.AssertExpectations(GinkgoT()) - host.WebSocketMock.AssertExpectations(GinkgoT()) - }) - }) - - Describe("cleanupFailedConnection", func() { - It("cancels schedule, closes WebSocket, and clears cache", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil) - host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Connection lost").Return(nil) - host.CacheMock.On("Remove", "discord.seq.testuser").Return(nil) - - r.cleanupFailedConnection("testuser") - - host.SchedulerMock.AssertExpectations(GinkgoT()) - host.WebSocketMock.AssertExpectations(GinkgoT()) - }) - }) - - Describe("handleHeartbeatCallback", func() { - It("sends heartbeat successfully", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(42), true, nil) - host.WebSocketMock.On("SendText", "testuser", mock.Anything).Return(nil) - - err := r.handleHeartbeatCallback("testuser") - Expect(err).ToNot(HaveOccurred()) - }) - - It("cleans up connection on heartbeat failure", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("cache miss")) - host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil) - host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Connection lost").Return(nil) - host.CacheMock.On("Remove", "discord.seq.testuser").Return(nil) - - err := r.handleHeartbeatCallback("testuser") - Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("connection cleaned up")) - }) - }) - - Describe("handleClearActivityCallback", func() { - It("clears activity and disconnects", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool { - return strings.Contains(msg, `"op":3`) && strings.Contains(msg, `"activities":null`) - })).Return(nil) - host.SchedulerMock.On("CancelSchedule", "testuser").Return(nil) - host.WebSocketMock.On("CloseConnection", "testuser", int32(1000), "Navidrome disconnect").Return(nil) - - err := r.handleClearActivityCallback("testuser") - Expect(err).ToNot(HaveOccurred()) - }) - }) - - Describe("WebSocket callbacks", func() { - Describe("OnTextMessage", func() { - It("handles valid JSON message", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.CacheMock.On("SetInt", mock.Anything, mock.Anything, mock.Anything).Return(nil) - - err := r.OnTextMessage(websocket.OnTextMessageRequest{ - ConnectionID: "testuser", - Message: `{"s":42}`, - }) - Expect(err).ToNot(HaveOccurred()) - }) - - It("returns error for invalid JSON", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - err := r.OnTextMessage(websocket.OnTextMessageRequest{ - ConnectionID: "testuser", - Message: `not json`, - }) - Expect(err).To(HaveOccurred()) - }) - }) - - Describe("OnBinaryMessage", func() { - It("handles binary message without error", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - err := r.OnBinaryMessage(websocket.OnBinaryMessageRequest{ - ConnectionID: "testuser", - Data: "AQID", // base64 encoded [0x01, 0x02, 0x03] - }) - Expect(err).ToNot(HaveOccurred()) - }) - }) - - Describe("OnError", func() { - It("handles error without returning error", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - err := r.OnError(websocket.OnErrorRequest{ - ConnectionID: "testuser", - Error: "test error", - }) - Expect(err).ToNot(HaveOccurred()) - }) - }) - - Describe("OnClose", func() { - It("handles close without returning error", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - err := r.OnClose(websocket.OnCloseRequest{ - ConnectionID: "testuser", - Code: 1000, - Reason: "normal close", - }) - Expect(err).ToNot(HaveOccurred()) - }) - }) - }) - - Describe("sendActivity", func() { - BeforeEach(func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.CacheMock.On("GetString", mock.MatchedBy(func(key string) bool { - return strings.HasPrefix(key, "discord.image.") - })).Return("", false, nil) - host.CacheMock.On("SetString", mock.Anything, mock.Anything, mock.Anything).Return(nil) - - // Mock HTTP request for Discord external assets API (image processing) - // When processImage is called, it makes an HTTP request - httpReq := &pdk.HTTPRequest{} - pdk.PDKMock.On("NewHTTPRequest", pdk.MethodPost, mock.Anything).Return(httpReq) - pdk.PDKMock.On("Send", mock.Anything).Return(pdk.NewStubHTTPResponse(200, nil, []byte(`{"key":"test-key"}`))) - }) - - It("sends activity update to Discord", func() { - host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool { - return strings.Contains(msg, `"op":3`) && - strings.Contains(msg, `"name":"Test Song"`) && - strings.Contains(msg, `"state":"Test Artist"`) - })).Return(nil) - - err := r.sendActivity("client123", "testuser", "token123", activity{ - Application: "client123", - Name: "Test Song", - Type: 2, - State: "Test Artist", - Details: "Test Album", - }) - Expect(err).ToNot(HaveOccurred()) - }) - }) - - Describe("clearActivity", func() { - It("sends presence update with nil activities", func() { - pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe() - host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool { - return strings.Contains(msg, `"op":3`) && strings.Contains(msg, `"activities":null`) - })).Return(nil) - - err := r.clearActivity("testuser") - Expect(err).ToNot(HaveOccurred()) - }) - }) -}) From d7ec7355c9036d5be659d6ac555c334bb5848ba6 Mon Sep 17 00:00:00 2001 From: Alex Gustafsson Date: Tue, 3 Feb 2026 18:22:57 +0100 Subject: [PATCH 26/82] Merge commit from fork * Rework frontend code interacting directly with DOM Rework frontend code that uses user-supplied data to render things like comments and notes. In places where using React's built-in sanitization is possible, the feature is used. In other places, where some markup might be necessary, DOMPurify is used to sanitize the HTML before rendering it. Solves: GHSA-rh3r-8pxm-hg4w * Remove test post DOM rework * fixup! Rework frontend code interacting directly with DOM --- ui/package-lock.json | 57 +++++++++++++++++++++-- ui/package.json | 1 + ui/src/album/AlbumDetails.jsx | 8 ++-- ui/src/artist/ArtistShow.jsx | 18 ++----- ui/src/artist/DesktopArtistDetails.jsx | 3 +- ui/src/artist/MobileArtistDetails.jsx | 3 +- ui/src/common/Linkify.jsx | 7 +-- ui/src/common/MultiLineTextField.jsx | 12 +---- ui/src/common/MultiLineTextField.test.jsx | 28 ----------- ui/src/common/SafeHTML.jsx | 29 ++++++++++++ ui/src/layout/Login.jsx | 2 + 11 files changed, 99 insertions(+), 69 deletions(-) delete mode 100644 ui/src/common/MultiLineTextField.test.jsx create mode 100644 ui/src/common/SafeHTML.jsx diff --git a/ui/package-lock.json b/ui/package-lock.json index 86d0a4bfb..7dd0a54af 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -18,6 +18,7 @@ "clsx": "^2.1.1", "connected-react-router": "^6.9.3", "deepmerge": "^4.3.1", + "dompurify": "^3.3.1", "history": "^4.10.1", "inflection": "^3.0.2", "jwt-decode": "^4.0.0", @@ -128,6 +129,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz", "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==", "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.28.6", "@babel/generator": "^7.28.6", @@ -1742,6 +1744,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -1765,6 +1768,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -2572,6 +2576,7 @@ "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-2.5.2.tgz", "integrity": "sha512-tl64cLC2dUrGvu2nTHRDEA5Yv3RfwzMCIlVaoSUSq44LakKLGJdkPl8j/fb07llpFqz0a7gEAmy/8gLdmwgaLQ==", "license": "MIT", + "peer": true, "dependencies": { "@types/json-schema": "^7.0.3", "ajv": "^6.10.2", @@ -2625,6 +2630,7 @@ "resolved": "https://registry.npmjs.org/@jsonforms/react/-/react-2.5.2.tgz", "integrity": "sha512-kZf2fq4urIBlFTCiBX95eKg8uojkyJj7FVDtIV739aVkJjE5+ihn1+kG1qLxYSxlGC7S24i12BZJzRetSRihBQ==", "license": "MIT", + "peer": true, "dependencies": { "lodash": "^4.17.15", "object-hash": "^2.0.0" @@ -2640,6 +2646,7 @@ "integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==", "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.4.4", "@material-ui/styles": "^4.11.5", @@ -2686,6 +2693,7 @@ "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz", "integrity": "sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.4.4" }, @@ -3409,6 +3417,7 @@ "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz", "integrity": "sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==", "license": "MIT", + "peer": true, "dependencies": { "hoist-non-react-statics": "^3.3.0" }, @@ -3461,6 +3470,7 @@ "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -3482,6 +3492,7 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.90.tgz", "integrity": "sha512-P9beVR/x06U9rCJzSxtENnOr4BrbJ6VrsrDTc+73TtHv9XHhryXKbjGRB+6oooB2r0G/pQkD/S4dHo/7jUfwFw==", "license": "MIT", + "peer": true, "dependencies": { "@types/prop-types": "*", "@types/scheduler": "^0.16", @@ -3651,6 +3662,7 @@ "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", "dev": true, "license": "BSD-2-Clause", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "6.21.0", "@typescript-eslint/types": "6.21.0", @@ -3982,6 +3994,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4663,6 +4676,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -5038,6 +5052,7 @@ "resolved": "https://registry.npmjs.org/connected-react-router/-/connected-react-router-6.9.3.tgz", "integrity": "sha512-4ThxysOiv/R2Dc4Cke1eJwjKwH1Y51VDwlOrOfs1LjpdYOVvCNjNkZDayo7+sx42EeGJPQUNchWkjAIJdXGIOQ==", "license": "MIT", + "peer": true, "dependencies": { "lodash.isequalwith": "^4.4.0", "prop-types": "^15.7.2" @@ -5502,10 +5517,13 @@ "license": "MIT" }, "node_modules/dompurify": { - "version": "2.5.8", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.8.tgz", - "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==", - "license": "(MPL-2.0 OR Apache-2.0)" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz", + "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==", + "license": "(MPL-2.0 OR Apache-2.0)", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } }, "node_modules/dot-prop": { "version": "9.0.0", @@ -5919,6 +5937,7 @@ "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -6502,6 +6521,7 @@ "resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.10.tgz", "integrity": "sha512-TL48Pi1oNHeMOHrKv1bCJUrWZDcD3DIG6AGYVNOnyZPr7Bd/pStN0pL+lfzF5BNoj/FclaoiaLenk4XUIFVYng==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.10.0" }, @@ -6518,6 +6538,7 @@ "resolved": "https://registry.npmjs.org/final-form-arrays/-/final-form-arrays-3.1.0.tgz", "integrity": "sha512-TWBvun+AopgBLw9zfTFHBllnKMVNEwCEyDawphPuBGGqNsuhGzhT7yewHys64KFFwzIs6KEteGLpKOwvTQEscQ==", "license": "MIT", + "peer": true, "peerDependencies": { "final-form": "^4.20.8" } @@ -6932,6 +6953,7 @@ "integrity": "sha512-hM9gltmtQLfmWPqoPreUtRdP3nZCSzQEw7l/JC+up5CxquDykhYFKzIzoFFeVev3AGFEULNvsbE8fpZPgxUYEQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/node": ">=20.0.0", "@types/whatwg-mimetype": "^3.0.2", @@ -7045,6 +7067,7 @@ "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.1.2", "loose-envify": "^1.2.0", @@ -8653,6 +8676,7 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "license": "MIT", + "peer": true, "engines": { "node": "*" } @@ -9372,6 +9396,7 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -9463,6 +9488,7 @@ "resolved": "https://registry.npmjs.org/ra-core/-/ra-core-3.19.12.tgz", "integrity": "sha512-E0cM6OjEUtccaR+dR5mL1MLiVVYML0Yf7aPhpLEq4iue73X3+CKcLztInoBhWgeevPbFQwgAtsXhlpedeyrNNg==", "license": "MIT", + "peer": true, "dependencies": { "classnames": "~2.3.1", "date-fns": "^1.29.0", @@ -9677,6 +9703,12 @@ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==", "license": "MIT" }, + "node_modules/ra-ui-materialui/node_modules/dompurify": { + "version": "2.5.8", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.8.tgz", + "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==", + "license": "(MPL-2.0 OR Apache-2.0)" + }, "node_modules/ra-ui-materialui/node_modules/inflection": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz", @@ -9852,6 +9884,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -9933,6 +9966,7 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz", "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -10005,6 +10039,7 @@ "resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.9.tgz", "integrity": "sha512-x3XYvozolECp3nIjly+4QqxdjSSWfcnpGEL5K8OBT6xmGrq5kBqbA6+/tOqoom9NwqIPPbxPNsOViFlbKgowbA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.15.4" }, @@ -10022,6 +10057,7 @@ "resolved": "https://registry.npmjs.org/react-final-form-arrays/-/react-final-form-arrays-3.1.4.tgz", "integrity": "sha512-siVFAolUAe29rMR6u8VwepoysUcUdh6MLV2OWnCtKpsPRUdT9VUgECjAPaVMAH2GROZNiVB9On1H9MMrm9gdpg==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.19.4" }, @@ -10127,6 +10163,7 @@ "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.15.4", "@types/react-redux": "^7.1.20", @@ -10162,6 +10199,7 @@ "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz", "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", @@ -10182,6 +10220,7 @@ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz", "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", @@ -10363,6 +10402,7 @@ "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.9.2" } @@ -10372,6 +10412,7 @@ "resolved": "https://registry.npmjs.org/redux-saga/-/redux-saga-1.4.2.tgz", "integrity": "sha512-QLIn/q+7MX/B+MkGJ/K6R3//60eJ4QNy65eqPsJrfGezbxdh1Jx+37VRKE2K4PsJnNET5JufJtgWdT30WBa+6w==", "license": "MIT", + "peer": true, "dependencies": { "@redux-saga/core": "^1.4.2" } @@ -10625,6 +10666,7 @@ "integrity": "sha512-oWKZLjYwTihnTeINcNenxIIDfeotkQ2GAjFJPe7aYsMONrwDwQQXcAl3Qv0qON7Hdc8RTsFomq22zotm/i6VVQ==", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "1.0.8" }, @@ -11585,6 +11627,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -11806,6 +11849,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -12050,6 +12094,7 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -12174,6 +12219,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -12187,6 +12233,7 @@ "integrity": "sha512-FQMeF0DJdWY0iOnbv466n/0BudNdKj1l5jYgl5JVTwjSsZSlqyXFt/9+1sEyhR6CLowbZpV7O1sCHrzBhucKKg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/expect": "4.0.17", "@vitest/mocker": "4.0.17", @@ -12703,6 +12750,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -12790,6 +12838,7 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz", "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==", "license": "MIT", + "peer": true, "bin": { "rollup": "dist/bin/rollup" }, diff --git a/ui/package.json b/ui/package.json index 6f9cc6c15..54062c1ac 100644 --- a/ui/package.json +++ b/ui/package.json @@ -27,6 +27,7 @@ "clsx": "^2.1.1", "connected-react-router": "^6.9.3", "deepmerge": "^4.3.1", + "dompurify": "^3.3.1", "history": "^4.10.1", "inflection": "^3.0.2", "jwt-decode": "^4.0.0", diff --git a/ui/src/album/AlbumDetails.jsx b/ui/src/album/AlbumDetails.jsx index 7b38e53da..3263fd55e 100644 --- a/ui/src/album/AlbumDetails.jsx +++ b/ui/src/album/AlbumDetails.jsx @@ -33,6 +33,7 @@ import { import config from '../config' import { formatFullDate, intersperse } from '../utils' import AlbumExternalLinks from './AlbumExternalLinks' +import { SafeHTML } from '../common/SafeHTML' const useStyles = makeStyles( (theme) => ({ @@ -225,8 +226,7 @@ const AlbumDetails = (props) => { const [imageLoading, setImageLoading] = useState(false) const [imageError, setImageError] = useState(false) - let notes = - albumInfo?.notes?.replace(new RegExp('<.*>', 'g'), '') || record.notes + let notes = albumInfo?.notes || record.notes if (notes) { notes += '..' @@ -351,7 +351,7 @@ const AlbumDetails = (props) => { variant={'body1'} onClick={() => setExpanded(!expanded)} > - + {notes} )} @@ -371,7 +371,7 @@ const AlbumDetails = (props) => { variant={'body1'} onClick={() => setExpanded(!expanded)} > - + {notes}
diff --git a/ui/src/artist/ArtistShow.jsx b/ui/src/artist/ArtistShow.jsx index c6dc832c1..668e07212 100644 --- a/ui/src/artist/ArtistShow.jsx +++ b/ui/src/artist/ArtistShow.jsx @@ -1,4 +1,4 @@ -import React, { useState, createElement, useEffect } from 'react' +import { useState, useEffect } from 'react' import { useMediaQuery, withWidth } from '@material-ui/core' import { useShowController, @@ -53,9 +53,7 @@ const ArtistDetails = (props) => { const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('sm')) const [artistInfo, setArtistInfo] = useState() - const biography = - artistInfo?.biography?.replace(new RegExp('<.*>', 'g'), '') || - record.biography + const biography = artistInfo?.biography || record.biography useEffect(() => { subsonic @@ -72,16 +70,8 @@ const ArtistDetails = (props) => { }) }, [record.id]) - const component = isDesktop ? DesktopArtistDetails : MobileArtistDetails - return ( - <> - {createElement(component, { - artistInfo, - record, - biography, - })} - - ) + const Component = isDesktop ? DesktopArtistDetails : MobileArtistDetails + return } const ArtistShowLayout = (props) => { diff --git a/ui/src/artist/DesktopArtistDetails.jsx b/ui/src/artist/DesktopArtistDetails.jsx index bff2c0906..f999b02ff 100644 --- a/ui/src/artist/DesktopArtistDetails.jsx +++ b/ui/src/artist/DesktopArtistDetails.jsx @@ -11,6 +11,7 @@ import Lightbox from 'react-image-lightbox' import ExpandInfoDialog from '../dialogs/ExpandInfoDialog' import AlbumInfo from '../album/AlbumInfo' import subsonic from '../subsonic' +import { SafeHTML } from '../common/SafeHTML' const useStyles = makeStyles( (theme) => ({ @@ -172,7 +173,7 @@ const DesktopArtistDetails = ({ artistInfo, record, biography }) => { variant={'body1'} onClick={() => setExpanded(!expanded)} > - + {biography} diff --git a/ui/src/artist/MobileArtistDetails.jsx b/ui/src/artist/MobileArtistDetails.jsx index 9d0450a66..de9b3867a 100644 --- a/ui/src/artist/MobileArtistDetails.jsx +++ b/ui/src/artist/MobileArtistDetails.jsx @@ -7,6 +7,7 @@ import config from '../config' import { LoveButton, RatingField } from '../common' import Lightbox from 'react-image-lightbox' import subsonic from '../subsonic' +import { SafeHTML } from '../common/SafeHTML' const useStyles = makeStyles( (theme) => ({ @@ -168,7 +169,7 @@ const MobileArtistDetails = ({ artistInfo, biography, record }) => {
setExpanded(!expanded)}> - + {biography}
diff --git a/ui/src/common/Linkify.jsx b/ui/src/common/Linkify.jsx index 0a09e0d76..f1c8b28c9 100644 --- a/ui/src/common/Linkify.jsx +++ b/ui/src/common/Linkify.jsx @@ -53,12 +53,7 @@ const Linkify = ({ text, ...rest }) => { // Push remaining text if (text.length > lastIndex) { - elements.push( - , - ) + elements.push(text.substring(lastIndex)) } return elements.length === 1 ? elements[0] : elements diff --git a/ui/src/common/MultiLineTextField.jsx b/ui/src/common/MultiLineTextField.jsx index f2a07ff86..d95def2f8 100644 --- a/ui/src/common/MultiLineTextField.jsx +++ b/ui/src/common/MultiLineTextField.jsx @@ -30,17 +30,7 @@ export const MultiLineTextField = memo( > {lines.length === 0 && emptyText ? emptyText - : lines.map((line, idx) => - line === '' ? ( -
- ) : ( -
- ), - )} + : lines} ) }, diff --git a/ui/src/common/MultiLineTextField.test.jsx b/ui/src/common/MultiLineTextField.test.jsx deleted file mode 100644 index 8f29166a3..000000000 --- a/ui/src/common/MultiLineTextField.test.jsx +++ /dev/null @@ -1,28 +0,0 @@ -import * as React from 'react' -import { render, cleanup, screen } from '@testing-library/react' -import { MultiLineTextField } from './MultiLineTextField' - -describe('', () => { - afterEach(cleanup) - - it('should render each line in a separated div', () => { - const record = { comment: 'line1\nline2' } - render() - expect(screen.queryByTestId('comment.0').textContent).toBe('line1') - expect(screen.queryByTestId('comment.1').textContent).toBe('line2') - }) - - it.each([null, undefined])( - 'should render the emptyText when value is %s', - (body) => { - render( - , - ) - expect(screen.getByText('NA')).toBeInTheDocument() - }, - ) -}) diff --git a/ui/src/common/SafeHTML.jsx b/ui/src/common/SafeHTML.jsx new file mode 100644 index 000000000..7d73e17fe --- /dev/null +++ b/ui/src/common/SafeHTML.jsx @@ -0,0 +1,29 @@ +import DOMPurify from 'dompurify' +import { Fragment, useMemo } from 'react' + +export const SafeHTML = ({ + children, +}) => { + const purified = useMemo(() => { + const purify = DOMPurify() + + purify.addHook('afterSanitizeElements', async (node) => { + if (node instanceof HTMLElement) { + // Set referrer-policy for elements with src + switch (node.tagName.toLowerCase()) { + case 'a': + case 'area': + case 'img': + case 'video': + case 'iframe': + case 'script': + node.setAttribute('referrer-policy', 'no-referrer') + } + } + }) + + return purify.sanitize(children, { ADD_ATTR: ['referrer-policy'] }) + }, [children]) + + return +} diff --git a/ui/src/layout/Login.jsx b/ui/src/layout/Login.jsx index 2244f4dfd..91f56b273 100644 --- a/ui/src/layout/Login.jsx +++ b/ui/src/layout/Login.jsx @@ -136,6 +136,8 @@ const FormLogin = ({ loading, handleSubmit, validate }) => { {config.welcomeMessage && (
)} From ddff5db14a04f9fa692f2e378095fa0ceee34f99 Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 3 Feb 2026 12:44:42 -0500 Subject: [PATCH 27/82] chore: format JSX components Signed-off-by: Deluan --- ui/src/album/AlbumDetails.jsx | 8 ++++++-- ui/src/artist/ArtistShow.jsx | 4 +++- ui/src/artist/DesktopArtistDetails.jsx | 4 +++- ui/src/artist/MobileArtistDetails.jsx | 4 +++- ui/src/common/MultiLineTextField.jsx | 4 +--- ui/src/common/SafeHTML.jsx | 4 +--- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ui/src/album/AlbumDetails.jsx b/ui/src/album/AlbumDetails.jsx index 3263fd55e..bd6a41523 100644 --- a/ui/src/album/AlbumDetails.jsx +++ b/ui/src/album/AlbumDetails.jsx @@ -351,7 +351,9 @@ const AlbumDetails = (props) => { variant={'body1'} onClick={() => setExpanded(!expanded)} > - {notes} + + {notes} + )} @@ -371,7 +373,9 @@ const AlbumDetails = (props) => { variant={'body1'} onClick={() => setExpanded(!expanded)} > - {notes} + + {notes} +
diff --git a/ui/src/artist/ArtistShow.jsx b/ui/src/artist/ArtistShow.jsx index 668e07212..ba8586d06 100644 --- a/ui/src/artist/ArtistShow.jsx +++ b/ui/src/artist/ArtistShow.jsx @@ -71,7 +71,9 @@ const ArtistDetails = (props) => { }, [record.id]) const Component = isDesktop ? DesktopArtistDetails : MobileArtistDetails - return + return ( + + ) } const ArtistShowLayout = (props) => { diff --git a/ui/src/artist/DesktopArtistDetails.jsx b/ui/src/artist/DesktopArtistDetails.jsx index f999b02ff..1e074ce4e 100644 --- a/ui/src/artist/DesktopArtistDetails.jsx +++ b/ui/src/artist/DesktopArtistDetails.jsx @@ -173,7 +173,9 @@ const DesktopArtistDetails = ({ artistInfo, record, biography }) => { variant={'body1'} onClick={() => setExpanded(!expanded)} > - {biography} + + {biography} + diff --git a/ui/src/artist/MobileArtistDetails.jsx b/ui/src/artist/MobileArtistDetails.jsx index de9b3867a..e8c044d66 100644 --- a/ui/src/artist/MobileArtistDetails.jsx +++ b/ui/src/artist/MobileArtistDetails.jsx @@ -169,7 +169,9 @@ const MobileArtistDetails = ({ artistInfo, biography, record }) => {
setExpanded(!expanded)}> - {biography} + + {biography} +
diff --git a/ui/src/common/MultiLineTextField.jsx b/ui/src/common/MultiLineTextField.jsx index d95def2f8..1218d4bd6 100644 --- a/ui/src/common/MultiLineTextField.jsx +++ b/ui/src/common/MultiLineTextField.jsx @@ -28,9 +28,7 @@ export const MultiLineTextField = memo( component="span" {...sanitizeFieldRestProps(rest)} > - {lines.length === 0 && emptyText - ? emptyText - : lines} + {lines.length === 0 && emptyText ? emptyText : lines} ) }, diff --git a/ui/src/common/SafeHTML.jsx b/ui/src/common/SafeHTML.jsx index 7d73e17fe..643b538b8 100644 --- a/ui/src/common/SafeHTML.jsx +++ b/ui/src/common/SafeHTML.jsx @@ -1,9 +1,7 @@ import DOMPurify from 'dompurify' import { Fragment, useMemo } from 'react' -export const SafeHTML = ({ - children, -}) => { +export const SafeHTML = ({ children }) => { const purified = useMemo(() => { const purify = DOMPurify() From 2829cec0cebcbe295921fded3c92936134757a8b Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 3 Feb 2026 12:07:02 -0500 Subject: [PATCH 28/82] fix(subsonic): add SubMusic to default MinimalClients list Signed-off-by: Deluan --- conf/configuration.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/configuration.go b/conf/configuration.go index aa1056f75..ad7bb2d0b 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -643,7 +643,8 @@ func setViperDefaults() { viper.SetDefault("subsonic.artistparticipations", false) viper.SetDefault("subsonic.defaultreportrealpath", false) viper.SetDefault("subsonic.enableaveragerating", true) - viper.SetDefault("subsonic.legacyclients", "DSub,SubMusic") + viper.SetDefault("subsonic.legacyclients", "DSub") + viper.SetDefault("subsonic.minimalclients", "SubMusic") viper.SetDefault("agents", "lastfm,spotify,deezer") viper.SetDefault("lastfm.enabled", true) viper.SetDefault("lastfm.language", consts.DefaultInfoLanguage) From a1036e75a980c5659ea07b99f504dcdbe2ce0571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Tue, 3 Feb 2026 18:50:16 +0100 Subject: [PATCH 29/82] fix(ui): update Catalan, German, Spanish, French, Indonesian, Polish translations from POEditor (#4960) Co-authored-by: navidrome-bot --- resources/i18n/ca.json | 14 +++---- resources/i18n/de.json | 4 +- resources/i18n/es.json | 4 +- resources/i18n/fr.json | 4 +- resources/i18n/id.json | 95 +++++++++++++++++++++++++++++++++++++++--- resources/i18n/pl.json | 4 +- 6 files changed, 104 insertions(+), 21 deletions(-) diff --git a/resources/i18n/ca.json b/resources/i18n/ca.json index a7244b5bd..264a76639 100644 --- a/resources/i18n/ca.json +++ b/resources/i18n/ca.json @@ -95,11 +95,11 @@ "lists": { "all": "Tot", "random": "Aleatori", - "recentlyAdded": "Afegit fa poc", - "recentlyPlayed": "Reproduït fa poc", - "mostPlayed": "Més reproduït", + "recentlyAdded": "Afegits recentment", + "recentlyPlayed": "Reproduïts recentment", + "mostPlayed": "Més reproduïts", "starred": "Preferits", - "topRated": "Més ben valorades" + "topRated": "Més ben valorats" } }, "artist": { @@ -119,7 +119,7 @@ "albumartist": "Artista de l'Àlbum |||| Artistes de l'Àlbum", "artist": "Artista |||| Artistes", "composer": "Compositor |||| Compositors", - "conductor": "Conductor |||| Conductors", + "conductor": "Director |||| Directors", "lyricist": "Lletrista |||| Lletristes", "arranger": "Arranjador |||| Arranjadors", "producer": "Productor |||| Productors", @@ -127,7 +127,7 @@ "engineer": "Enginyer |||| Enginyers", "mixer": "Mesclador |||| Mescladors", "remixer": "Remesclador |||| Remescladors", - "djmixer": "DJ Mesclador |||| DJ Mescladors", + "djmixer": "Mesclador DJ |||| Mescladors DJ", "performer": "Intèrpret |||| Intèrprets", "maincredit": "Artista de l'àlbum or Artista |||| Artistes de l'àlbum or Artistes" }, @@ -654,7 +654,7 @@ "links": { "homepage": "Inici", "source": "Codi font", - "featureRequests": "Sol·licitud de funcionalitats", + "featureRequests": "Sol·licita funcionalitats", "lastInsightsCollection": "Última recolecció d'informació", "insights": { "disabled": "Desactivada", diff --git a/resources/i18n/de.json b/resources/i18n/de.json index 972debb37..568c65c51 100644 --- a/resources/i18n/de.json +++ b/resources/i18n/de.json @@ -48,7 +48,7 @@ "playNext": "Als nächstes abspielen", "info": "Mehr Informationen", "showInPlaylist": "In Wiedergabeliste anzeigen", - "instantMix": "" + "instantMix": "Sofort-Mix" } }, "album": { @@ -588,7 +588,7 @@ "remove_all_missing_content": "Möchtest du wirklich alle Fehlenden Dateien aus der Datenbank entfernen? Alle Referenzen zu den Dateien wie Anzahl Wiedergaben und Bewertungen werden permanent gelöscht.", "noSimilarSongsFound": "Keine ähnlichen Titel gefunden", "noTopSongsFound": "Keine beliebten Titel gefunden", - "startingInstantMix": "" + "startingInstantMix": "Lade Sofort-Mix..." }, "menu": { "library": "Bibliothek", diff --git a/resources/i18n/es.json b/resources/i18n/es.json index 4e9e13e57..38c1379c9 100644 --- a/resources/i18n/es.json +++ b/resources/i18n/es.json @@ -48,7 +48,7 @@ "playNext": "Siguiente", "info": "Obtener información", "showInPlaylist": "Mostrar en la lista de reproducción", - "instantMix": "" + "instantMix": "Mezcla instantánea" } }, "album": { @@ -588,7 +588,7 @@ "remove_all_missing_content": "¿Realmente desea eliminar todos los archivos faltantes de la base de datos? Esto eliminará permanentemente cualquier referencia a ellos, incluidas sus reproducciones y valoraciones.", "noSimilarSongsFound": "No se encontraron canciones similares", "noTopSongsFound": "No se encontraron canciones destacadas", - "startingInstantMix": "" + "startingInstantMix": "Cargando la mezcla instantánea..." }, "menu": { "library": "Biblioteca", diff --git a/resources/i18n/fr.json b/resources/i18n/fr.json index d3d0d5d57..66bd454cc 100644 --- a/resources/i18n/fr.json +++ b/resources/i18n/fr.json @@ -48,7 +48,7 @@ "playNext": "Jouer ensuite", "info": "Plus d'informations", "showInPlaylist": "Montrer dans la playlist", - "instantMix": "" + "instantMix": "Mix instantanné" } }, "album": { @@ -588,7 +588,7 @@ "remove_all_missing_content": "Êtes-vous sûr(e) de vouloir supprimer tous les fichiers manquants de la base de données ? Cette action est permanente et supprimera leurs nombres d'écoutes, leur notations et tout ce qui y fait référence.", "noSimilarSongsFound": "Aucun titre similaire n'a été trouvé", "noTopSongsFound": "Aucun meilleur titre n'a été trouvé", - "startingInstantMix": "" + "startingInstantMix": "Chargement du mix instantanné..." }, "menu": { "library": "Bibliothèque", diff --git a/resources/i18n/id.json b/resources/i18n/id.json index 38ee2fff9..cdba66663 100644 --- a/resources/i18n/id.json +++ b/resources/i18n/id.json @@ -36,7 +36,8 @@ "bitDepth": "Bit depth", "sampleRate": "Sample rate", "missing": "Hilang", - "libraryName": "Pustaka" + "libraryName": "Pustaka", + "composer": "Komposer" }, "actions": { "addToQueue": "Tambah ke antrean", @@ -46,7 +47,8 @@ "download": "Unduh", "playNext": "Putar Berikutnya", "info": "Lihat Info", - "showInPlaylist": "Tampilkan di Playlist" + "showInPlaylist": "Tampilkan di Playlist", + "instantMix": "Mix Instan" } }, "album": { @@ -301,14 +303,19 @@ "actions": { "scan": "Pindai Pustaka", "manageUsers": "Kelola Akses Pengguna", - "viewDetails": "Lihat Detail" + "viewDetails": "Lihat Detail", + "quickScan": "Pindai Cepat", + "fullScan": "Pindai Keseluruhan" }, "notifications": { "created": "Pustaka berhasil dibuat", "updated": "Pustaka berhasil dibuat", "deleted": "Berhasil menghapus pustaka", "scanStarted": "Memindai pustaka dimulai", - "scanCompleted": "Memindai pustaka selesai" + "scanCompleted": "Memindai pustaka selesai", + "quickScanStarted": "Pemindaian cepat dimulai", + "fullScanStarted": "Pemindaian keseluruhan dimulai", + "scanError": "Kesalahan saat memulai pemindaian. Periksa log" }, "validation": { "nameRequired": "Nama pustaka diperlukan", @@ -323,6 +330,80 @@ "scanInProgress": "Pemindaian sedang berlangsung...", "noLibrariesAssigned": "Tidak ada pustaka yang ditugaskan ke pengguna ini" } + }, + "plugin": { + "name": "Plugin |||| Plugin", + "fields": { + "id": "ID", + "name": "Nama", + "description": "Deskripsi", + "version": "Versi", + "author": "Pembuat", + "website": "Situs Web", + "permissions": "Perizinan", + "enabled": "Diaktifkan", + "status": "Status", + "path": "Jalur", + "lastError": "Kesalahan", + "hasError": "Kesalahan", + "updatedAt": "Diperbarui", + "createdAt": "Terinstal", + "configKey": "Key", + "configValue": "Value", + "allUsers": "Izinkan semua pengguna", + "selectedUsers": "Pengguna yang dipilih", + "allLibraries": "Izinkan semua pustaka", + "selectedLibraries": "Pustaka dipilih" + }, + "sections": { + "status": "Status", + "info": "Informasi plugin", + "configuration": "Konfigurasi", + "manifest": "Manifes", + "usersPermission": "Pengguna yang Diizinkan", + "libraryPermission": "Pustaka yang Diizinkan" + }, + "status": { + "enabled": "Diaktifkan", + "disabled": "Dinonaktifkan" + }, + "actions": { + "enable": "Aktifkan", + "disable": "Nonaktifkan", + "disabledDueToError": "Perbaiki kesalahan sebelum diaktifkan", + "disabledUsersRequired": "Pilih pengguna sebelum diaktifkan", + "disabledLibrariesRequired": "Pilih pustaka sebelum diaktifkan", + "addConfig": "Tambahkan Konfigurasi", + "rescan": "Pindai ulang" + }, + "notifications": { + "enabled": "Plugin diaktifkan", + "disabled": "Plugin dinonaktifkan", + "updated": "Plugin diperbarui", + "error": "Kesalahan saat memperbarui plugin" + }, + "validation": { + "invalidJson": "Konfigurasi harus berupa JSON yang valid" + }, + "messages": { + "configHelp": "Konfigurasikan plugin menggunakan key-value pairs. Biarkan kosong jika plugin tidak membutuhkan konfigurasi.", + "clickPermissions": "Klik perizinan untuk detail", + "noConfig": "Konfigurasi tidak diatur", + "allUsersHelp": "Ketika diaktifkan, plugin akan mengakses untuk semua pengguna, termasuk yang akan dibuat di masa depan.", + "noUsers": "Tidak ada pengguna yang dipilih", + "permissionReason": "Alasan", + "usersRequired": "Plugin ini membutuhkan akses ke informasi pengguna. Pilih pengguna yang bisa mengakses plugin, atau aktifkan 'Izinkan semua pengguna'.", + "allLibrariesHelp": "Ketika diaktifkan, plugin akan memiliki akses ke semua pustaka, termasuk yang dibuat di masa depan.", + "noLibraries": "Tidak ada pustaka yang dipilih", + "librariesRequired": "Plugin ini membutuhkan akses ke informasi pustaka. Pilih beberapa pustaka yang bisa diakses, atau aktifkan 'Izinkan semua pustaka'.", + "requiredHosts": "Hosts diperlukan", + "configValidationError": "Validasi konfigurasi gagal:", + "schemaRenderError": "Tidak dapat menampilkan form konfigurasi. Skema plugin mungkin tidak valid." + }, + "placeholders": { + "configKey": "key", + "configValue": "value" + } } }, "ra": { @@ -506,7 +587,8 @@ "remove_all_missing_title": "Hapus semua file yang hilang", "remove_all_missing_content": "Apa kamu yakin ingin menghapus semua file dari database? Ini akan menghapus permanen dan apapun referensi ke mereka, termasuk hitungan pemutaran dan rating mereka.", "noSimilarSongsFound": "Tidak ada lagu yang serupa ditemukan", - "noTopSongsFound": "Tidak ada lagu teratas ditemukan" + "noTopSongsFound": "Tidak ada lagu teratas ditemukan", + "startingInstantMix": "Memuat Mix Instan..." }, "menu": { "library": "Pustaka", @@ -604,7 +686,8 @@ "serverDown": "LURING", "scanType": "Tipe", "status": "Kesalahan Memindai", - "elapsedTime": "Waktu Berakhir" + "elapsedTime": "Waktu Berakhir", + "selectiveScan": "Selektif" }, "help": { "title": "Tombol Pintasan Navidrome", diff --git a/resources/i18n/pl.json b/resources/i18n/pl.json index f5aac031c..6229798e9 100644 --- a/resources/i18n/pl.json +++ b/resources/i18n/pl.json @@ -48,7 +48,7 @@ "playNext": "Odtwarzaj Następny", "info": "Zdobądź Informacje", "showInPlaylist": "Pokaż w Liście Odtwarzania", - "instantMix": "" + "instantMix": "Natychmiastowy Miks" } }, "album": { @@ -588,7 +588,7 @@ "remove_all_missing_content": "Czy chcesz usunąć wszystkie brakujące pliki z bazy danych? Spowoduje to trwałe usunięcie wszelkich odniesień do tych plików, takich jak liczba odtworzeń, czy oceny.", "noSimilarSongsFound": "Brak podobnych utworów", "noTopSongsFound": "Brak najlepszych utworów", - "startingInstantMix": "" + "startingInstantMix": "Ładowanie Natychmiastowego Miksu..." }, "menu": { "library": "Biblioteka", From 0c8f2a559c9b1c659fd78701d482ca1f34ff2f6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Feb 2026 13:12:53 -0500 Subject: [PATCH 30/82] chore(deps): bump lodash from 4.17.21 to 4.17.23 in /ui (#4922) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [lodash](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.17.23 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Deluan Quintão --- ui/package-lock.json | 45 +++----------------------------------------- 1 file changed, 3 insertions(+), 42 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 7dd0a54af..ed93a5ecb 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -129,7 +129,6 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz", "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==", "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.28.6", "@babel/generator": "^7.28.6", @@ -1744,7 +1743,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=18" }, @@ -1768,7 +1766,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=18" } @@ -2576,7 +2573,6 @@ "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-2.5.2.tgz", "integrity": "sha512-tl64cLC2dUrGvu2nTHRDEA5Yv3RfwzMCIlVaoSUSq44LakKLGJdkPl8j/fb07llpFqz0a7gEAmy/8gLdmwgaLQ==", "license": "MIT", - "peer": true, "dependencies": { "@types/json-schema": "^7.0.3", "ajv": "^6.10.2", @@ -2630,7 +2626,6 @@ "resolved": "https://registry.npmjs.org/@jsonforms/react/-/react-2.5.2.tgz", "integrity": "sha512-kZf2fq4urIBlFTCiBX95eKg8uojkyJj7FVDtIV739aVkJjE5+ihn1+kG1qLxYSxlGC7S24i12BZJzRetSRihBQ==", "license": "MIT", - "peer": true, "dependencies": { "lodash": "^4.17.15", "object-hash": "^2.0.0" @@ -2646,7 +2641,6 @@ "integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==", "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.4.4", "@material-ui/styles": "^4.11.5", @@ -2693,7 +2687,6 @@ "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz", "integrity": "sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.4.4" }, @@ -3417,7 +3410,6 @@ "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz", "integrity": "sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==", "license": "MIT", - "peer": true, "dependencies": { "hoist-non-react-statics": "^3.3.0" }, @@ -3470,7 +3462,6 @@ "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==", "devOptional": true, "license": "MIT", - "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -3492,7 +3483,6 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.90.tgz", "integrity": "sha512-P9beVR/x06U9rCJzSxtENnOr4BrbJ6VrsrDTc+73TtHv9XHhryXKbjGRB+6oooB2r0G/pQkD/S4dHo/7jUfwFw==", "license": "MIT", - "peer": true, "dependencies": { "@types/prop-types": "*", "@types/scheduler": "^0.16", @@ -3662,7 +3652,6 @@ "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", "dev": true, "license": "BSD-2-Clause", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "6.21.0", "@typescript-eslint/types": "6.21.0", @@ -3994,7 +3983,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4676,7 +4664,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -5052,7 +5039,6 @@ "resolved": "https://registry.npmjs.org/connected-react-router/-/connected-react-router-6.9.3.tgz", "integrity": "sha512-4ThxysOiv/R2Dc4Cke1eJwjKwH1Y51VDwlOrOfs1LjpdYOVvCNjNkZDayo7+sx42EeGJPQUNchWkjAIJdXGIOQ==", "license": "MIT", - "peer": true, "dependencies": { "lodash.isequalwith": "^4.4.0", "prop-types": "^15.7.2" @@ -5937,7 +5923,6 @@ "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -6521,7 +6506,6 @@ "resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.10.tgz", "integrity": "sha512-TL48Pi1oNHeMOHrKv1bCJUrWZDcD3DIG6AGYVNOnyZPr7Bd/pStN0pL+lfzF5BNoj/FclaoiaLenk4XUIFVYng==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.10.0" }, @@ -6538,7 +6522,6 @@ "resolved": "https://registry.npmjs.org/final-form-arrays/-/final-form-arrays-3.1.0.tgz", "integrity": "sha512-TWBvun+AopgBLw9zfTFHBllnKMVNEwCEyDawphPuBGGqNsuhGzhT7yewHys64KFFwzIs6KEteGLpKOwvTQEscQ==", "license": "MIT", - "peer": true, "peerDependencies": { "final-form": "^4.20.8" } @@ -6953,7 +6936,6 @@ "integrity": "sha512-hM9gltmtQLfmWPqoPreUtRdP3nZCSzQEw7l/JC+up5CxquDykhYFKzIzoFFeVev3AGFEULNvsbE8fpZPgxUYEQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/node": ">=20.0.0", "@types/whatwg-mimetype": "^3.0.2", @@ -7067,7 +7049,6 @@ "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.1.2", "loose-envify": "^1.2.0", @@ -8402,9 +8383,9 @@ } }, "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "version": "4.17.23", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", + "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", "license": "MIT" }, "node_modules/lodash.debounce": { @@ -8676,7 +8657,6 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "license": "MIT", - "peer": true, "engines": { "node": "*" } @@ -9396,7 +9376,6 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "license": "MIT", - "peer": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -9488,7 +9467,6 @@ "resolved": "https://registry.npmjs.org/ra-core/-/ra-core-3.19.12.tgz", "integrity": "sha512-E0cM6OjEUtccaR+dR5mL1MLiVVYML0Yf7aPhpLEq4iue73X3+CKcLztInoBhWgeevPbFQwgAtsXhlpedeyrNNg==", "license": "MIT", - "peer": true, "dependencies": { "classnames": "~2.3.1", "date-fns": "^1.29.0", @@ -9884,7 +9862,6 @@ "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", "license": "MIT", - "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -9966,7 +9943,6 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz", "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==", "license": "MIT", - "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -10039,7 +10015,6 @@ "resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.9.tgz", "integrity": "sha512-x3XYvozolECp3nIjly+4QqxdjSSWfcnpGEL5K8OBT6xmGrq5kBqbA6+/tOqoom9NwqIPPbxPNsOViFlbKgowbA==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.15.4" }, @@ -10057,7 +10032,6 @@ "resolved": "https://registry.npmjs.org/react-final-form-arrays/-/react-final-form-arrays-3.1.4.tgz", "integrity": "sha512-siVFAolUAe29rMR6u8VwepoysUcUdh6MLV2OWnCtKpsPRUdT9VUgECjAPaVMAH2GROZNiVB9On1H9MMrm9gdpg==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.19.4" }, @@ -10163,7 +10137,6 @@ "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.15.4", "@types/react-redux": "^7.1.20", @@ -10199,7 +10172,6 @@ "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz", "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", @@ -10220,7 +10192,6 @@ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz", "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", @@ -10402,7 +10373,6 @@ "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.9.2" } @@ -10412,7 +10382,6 @@ "resolved": "https://registry.npmjs.org/redux-saga/-/redux-saga-1.4.2.tgz", "integrity": "sha512-QLIn/q+7MX/B+MkGJ/K6R3//60eJ4QNy65eqPsJrfGezbxdh1Jx+37VRKE2K4PsJnNET5JufJtgWdT30WBa+6w==", "license": "MIT", - "peer": true, "dependencies": { "@redux-saga/core": "^1.4.2" } @@ -10666,7 +10635,6 @@ "integrity": "sha512-oWKZLjYwTihnTeINcNenxIIDfeotkQ2GAjFJPe7aYsMONrwDwQQXcAl3Qv0qON7Hdc8RTsFomq22zotm/i6VVQ==", "devOptional": true, "license": "MIT", - "peer": true, "dependencies": { "@types/estree": "1.0.8" }, @@ -11627,7 +11595,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -11849,7 +11816,6 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -12094,7 +12060,6 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -12219,7 +12184,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -12233,7 +12197,6 @@ "integrity": "sha512-FQMeF0DJdWY0iOnbv466n/0BudNdKj1l5jYgl5JVTwjSsZSlqyXFt/9+1sEyhR6CLowbZpV7O1sCHrzBhucKKg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@vitest/expect": "4.0.17", "@vitest/mocker": "4.0.17", @@ -12750,7 +12713,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -12838,7 +12800,6 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz", "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==", "license": "MIT", - "peer": true, "bin": { "rollup": "dist/bin/rollup" }, From 4e720ee9313941fb3c8f9c210d693517d19de340 Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 3 Feb 2026 22:56:47 -0500 Subject: [PATCH 31/82] fix: handle WASM runtime panics in gotaglib openFile function. see #4977 Signed-off-by: Deluan --- adapters/gotaglib/gotaglib.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/adapters/gotaglib/gotaglib.go b/adapters/gotaglib/gotaglib.go index e5fb35427..7c98aa248 100644 --- a/adapters/gotaglib/gotaglib.go +++ b/adapters/gotaglib/gotaglib.go @@ -13,12 +13,15 @@ package gotaglib import ( "errors" + "fmt" "io" "io/fs" + "runtime/debug" "strings" "time" "github.com/navidrome/navidrome/core/storage/local" + "github.com/navidrome/navidrome/log" "github.com/navidrome/navidrome/model/metadata" "go.senan.xyz/taglib" ) @@ -94,7 +97,17 @@ func (e extractor) extractMetadata(filePath string) (*metadata.Info, error) { // openFile opens the file at filePath using the extractor's filesystem. // It returns a TagLib File handle and a cleanup function to close resources. -func (e extractor) openFile(filePath string) (*taglib.File, func(), error) { +func (e extractor) openFile(filePath string) (f *taglib.File, closeFunc func(), err error) { + // Recover from panics in the WASM runtime (e.g., wazero failing to mmap executable memory + // on hardened systems like NixOS with MemoryDenyWriteExecute=true) + debug.SetPanicOnFault(true) + defer func() { + if r := recover(); r != nil { + log.Error("WASM runtime panic: This may be caused by a hardened system that blocks executable memory mapping.", "file", filePath, "panic", r) + err = fmt.Errorf("WASM runtime panic (hardened system?): %v", r) + } + }() + // Open the file from the filesystem file, err := e.fs.Open(filePath) if err != nil { @@ -105,12 +118,12 @@ func (e extractor) openFile(filePath string) (*taglib.File, func(), error) { file.Close() return nil, nil, errors.New("file is not seekable") } - f, err := taglib.OpenStream(rs, taglib.WithReadStyle(taglib.ReadStyleFast)) + f, err = taglib.OpenStream(rs, taglib.WithReadStyle(taglib.ReadStyleFast)) if err != nil { file.Close() return nil, nil, err } - closeFunc := func() { + closeFunc = func() { f.Close() file.Close() } From 338853468fa905dbcea8b7cf2f46a03fa0b7bddc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Feb 2026 10:11:37 -0500 Subject: [PATCH 32/82] chore(deps): bump bytes in /plugins/pdk/rust/nd-pdk-host (#4973) Bumps [bytes](https://github.com/tokio-rs/bytes) from 1.11.0 to 1.11.1. - [Release notes](https://github.com/tokio-rs/bytes/releases) - [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/bytes/compare/v1.11.0...v1.11.1) --- updated-dependencies: - dependency-name: bytes dependency-version: 1.11.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- plugins/pdk/rust/nd-pdk-host/Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/pdk/rust/nd-pdk-host/Cargo.lock b/plugins/pdk/rust/nd-pdk-host/Cargo.lock index b0a639ba3..b4d9042d0 100644 --- a/plugins/pdk/rust/nd-pdk-host/Cargo.lock +++ b/plugins/pdk/rust/nd-pdk-host/Cargo.lock @@ -28,9 +28,9 @@ checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" [[package]] name = "bytes" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "either" @@ -171,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] -name = "nd-host" +name = "nd-pdk-host" version = "0.1.0" dependencies = [ "extism-pdk", From 19ea338bed0bf123aba82ea3655c718dddc73960 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Feb 2026 10:12:00 -0500 Subject: [PATCH 33/82] chore(deps): bump @isaacs/brace-expansion from 5.0.0 to 5.0.1 in /ui (#4974) Bumps @isaacs/brace-expansion from 5.0.0 to 5.0.1. --- updated-dependencies: - dependency-name: "@isaacs/brace-expansion" dependency-version: 5.0.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- ui/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index ed93a5ecb..e9ef2aaa4 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -2395,9 +2395,9 @@ } }, "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz", + "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==", "license": "MIT", "dependencies": { "@isaacs/balanced-match": "^4.0.1" From e8863ed1476476708371a720d2c2ad5ae6757c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Wed, 4 Feb 2026 15:48:08 -0500 Subject: [PATCH 34/82] feat(plugins): add SubsonicAPI CallRaw, with support for raw=true binary response for host functions (#4982) * feat: implement raw binary framing for host function responses Signed-off-by: Deluan * feat: add CallRaw method for Subsonic API to handle binary responses Signed-off-by: Deluan * test: add tests for raw=true methods and binary framing generation Signed-off-by: Deluan * fix: improve error message for malformed raw responses to indicate incomplete header Signed-off-by: Deluan * fix: add wasm_import_module attribute for raw methods and improve content-type handling Signed-off-by: Deluan --------- Signed-off-by: Deluan --- plugins/cmd/ndpgen/integration_test.go | 3 + plugins/cmd/ndpgen/internal/generator_test.go | 242 ++++++++++++++++++ plugins/cmd/ndpgen/internal/parser.go | 8 + plugins/cmd/ndpgen/internal/parser_test.go | 113 ++++++++ .../ndpgen/internal/templates/client.go.tmpl | 27 +- .../ndpgen/internal/templates/client.py.tmpl | 34 ++- .../ndpgen/internal/templates/client.rs.tmpl | 78 ++++++ .../ndpgen/internal/templates/host.go.tmpl | 74 +++++- plugins/cmd/ndpgen/internal/types.go | 11 + .../testdata/raw_client_expected.go.txt | 66 +++++ .../ndpgen/testdata/raw_client_expected.py | 63 +++++ .../ndpgen/testdata/raw_client_expected.rs | 73 ++++++ .../cmd/ndpgen/testdata/raw_service.go.txt | 10 + plugins/host/subsonicapi.go | 6 + plugins/host/subsonicapi_gen.go | 62 +++++ plugins/host_subsonicapi.go | 39 ++- plugins/host_subsonicapi_test.go | 142 +++++++++- plugins/pdk/go/go.mod | 7 - plugins/pdk/go/host/nd_host_subsonicapi.go | 53 ++++ .../pdk/go/host/nd_host_subsonicapi_stub.go | 14 + .../pdk/python/host/nd_host_subsonicapi.py | 48 +++- .../nd-pdk-host/src/nd_host_subsonicapi.rs | 64 +++++ .../testdata/test-subsonicapi-plugin/main.go | 26 ++ 23 files changed, 1223 insertions(+), 40 deletions(-) create mode 100644 plugins/cmd/ndpgen/testdata/raw_client_expected.go.txt create mode 100644 plugins/cmd/ndpgen/testdata/raw_client_expected.py create mode 100644 plugins/cmd/ndpgen/testdata/raw_client_expected.rs create mode 100644 plugins/cmd/ndpgen/testdata/raw_service.go.txt diff --git a/plugins/cmd/ndpgen/integration_test.go b/plugins/cmd/ndpgen/integration_test.go index db500c1fc..13ebe14a4 100644 --- a/plugins/cmd/ndpgen/integration_test.go +++ b/plugins/cmd/ndpgen/integration_test.go @@ -282,6 +282,9 @@ type ServiceB interface { Entry("option pattern (value, exists bool)", "config_service.go.txt", "config_client_expected.go.txt", "config_client_expected.py", "config_client_expected.rs"), + + Entry("raw=true binary response", + "raw_service.go.txt", "raw_client_expected.go.txt", "raw_client_expected.py", "raw_client_expected.rs"), ) It("generates compilable client code for comprehensive service", func() { diff --git a/plugins/cmd/ndpgen/internal/generator_test.go b/plugins/cmd/ndpgen/internal/generator_test.go index 4a189ddd2..ed15f174b 100644 --- a/plugins/cmd/ndpgen/internal/generator_test.go +++ b/plugins/cmd/ndpgen/internal/generator_test.go @@ -264,6 +264,96 @@ var _ = Describe("Generator", func() { Expect(codeStr).To(ContainSubstring(`extism "github.com/extism/go-sdk"`)) }) + It("should generate binary framing for raw=true methods", func() { + svc := Service{ + Name: "Stream", + Permission: "stream", + Interface: "StreamService", + Methods: []Method{ + { + Name: "GetStream", + HasError: true, + Raw: true, + Params: []Param{NewParam("uri", "string")}, + Returns: []Param{ + NewParam("contentType", "string"), + NewParam("data", "[]byte"), + }, + }, + }, + } + + code, err := GenerateHost(svc, "host") + Expect(err).NotTo(HaveOccurred()) + + _, err = format.Source(code) + Expect(err).NotTo(HaveOccurred()) + + codeStr := string(code) + + // Should include encoding/binary import for raw methods + Expect(codeStr).To(ContainSubstring(`"encoding/binary"`)) + + // Should NOT generate a response type for raw methods + Expect(codeStr).NotTo(ContainSubstring("type StreamGetStreamResponse struct")) + + // Should generate request type (request is still JSON) + Expect(codeStr).To(ContainSubstring("type StreamGetStreamRequest struct")) + + // Should build binary frame [0x00][4-byte CT len][CT][data] + Expect(codeStr).To(ContainSubstring("frame[0] = 0x00")) + Expect(codeStr).To(ContainSubstring("binary.BigEndian.PutUint32")) + + // Should have writeRawError helper + Expect(codeStr).To(ContainSubstring("streamWriteRawError")) + + // Should use writeRawError instead of writeError for raw methods + Expect(codeStr).To(ContainSubstring("streamWriteRawError(p, stack")) + }) + + It("should generate both writeError and writeRawError for mixed services", func() { + svc := Service{ + Name: "API", + Permission: "api", + Interface: "APIService", + Methods: []Method{ + { + Name: "Call", + HasError: true, + Params: []Param{NewParam("uri", "string")}, + Returns: []Param{NewParam("response", "string")}, + }, + { + Name: "CallRaw", + HasError: true, + Raw: true, + Params: []Param{NewParam("uri", "string")}, + Returns: []Param{ + NewParam("contentType", "string"), + NewParam("data", "[]byte"), + }, + }, + }, + } + + code, err := GenerateHost(svc, "host") + Expect(err).NotTo(HaveOccurred()) + + _, err = format.Source(code) + Expect(err).NotTo(HaveOccurred()) + + codeStr := string(code) + + // Should have both helpers + Expect(codeStr).To(ContainSubstring("apiWriteResponse")) + Expect(codeStr).To(ContainSubstring("apiWriteError")) + Expect(codeStr).To(ContainSubstring("apiWriteRawError")) + + // Should generate response type for non-raw method only + Expect(codeStr).To(ContainSubstring("type APICallResponse struct")) + Expect(codeStr).NotTo(ContainSubstring("type APICallRawResponse struct")) + }) + It("should always include json import for JSON protocol", func() { // All services use JSON protocol, so json import is always needed svc := Service{ @@ -626,6 +716,72 @@ var _ = Describe("Generator", func() { Expect(codeStr).To(ContainSubstring(`response.get("floatVal", 0.0)`)) Expect(codeStr).To(ContainSubstring(`response.get("boolVal", False)`)) }) + + It("should generate binary frame parsing for raw methods", func() { + svc := Service{ + Name: "Stream", + Permission: "stream", + Interface: "StreamService", + Methods: []Method{ + { + Name: "GetStream", + HasError: true, + Raw: true, + Params: []Param{NewParam("uri", "string")}, + Returns: []Param{ + NewParam("contentType", "string"), + NewParam("data", "[]byte"), + }, + Doc: "GetStream returns raw binary stream data.", + }, + }, + } + + code, err := GenerateClientPython(svc) + Expect(err).NotTo(HaveOccurred()) + + codeStr := string(code) + + // Should import Tuple and struct for raw methods + Expect(codeStr).To(ContainSubstring("from typing import Any, Tuple")) + Expect(codeStr).To(ContainSubstring("import struct")) + + // Should return Tuple[str, bytes] + Expect(codeStr).To(ContainSubstring("-> Tuple[str, bytes]:")) + + // Should parse binary frame instead of JSON + Expect(codeStr).To(ContainSubstring("response_bytes = response_mem.bytes()")) + Expect(codeStr).To(ContainSubstring("response_bytes[0] == 0x01")) + Expect(codeStr).To(ContainSubstring("struct.unpack")) + Expect(codeStr).To(ContainSubstring("return content_type, data")) + + // Should NOT use json.loads for response + Expect(codeStr).NotTo(ContainSubstring("json.loads(extism.memory.string(response_mem))")) + }) + + It("should not import Tuple or struct for non-raw services", func() { + svc := Service{ + Name: "Test", + Permission: "test", + Interface: "TestService", + Methods: []Method{ + { + Name: "Call", + HasError: true, + Params: []Param{NewParam("uri", "string")}, + Returns: []Param{NewParam("response", "string")}, + }, + }, + } + + code, err := GenerateClientPython(svc) + Expect(err).NotTo(HaveOccurred()) + + codeStr := string(code) + + Expect(codeStr).NotTo(ContainSubstring("Tuple")) + Expect(codeStr).NotTo(ContainSubstring("import struct")) + }) }) Describe("GenerateGoDoc", func() { @@ -782,6 +938,47 @@ var _ = Describe("Generator", func() { // Check for PDK import Expect(codeStr).To(ContainSubstring("github.com/navidrome/navidrome/plugins/pdk/go/pdk")) }) + + It("should include encoding/binary import for raw methods", func() { + svc := Service{ + Name: "Stream", + Permission: "stream", + Interface: "StreamService", + Methods: []Method{ + { + Name: "GetStream", + HasError: true, + Raw: true, + Params: []Param{NewParam("uri", "string")}, + Returns: []Param{ + NewParam("contentType", "string"), + NewParam("data", "[]byte"), + }, + }, + }, + } + + code, err := GenerateClientGo(svc, "host") + Expect(err).NotTo(HaveOccurred()) + + codeStr := string(code) + + // Should include encoding/binary for raw binary frame parsing + Expect(codeStr).To(ContainSubstring(`"encoding/binary"`)) + + // Should NOT generate response type struct for raw methods + Expect(codeStr).NotTo(ContainSubstring("streamGetStreamResponse struct")) + + // Should still generate request type + Expect(codeStr).To(ContainSubstring("streamGetStreamRequest struct")) + + // Should parse binary frame + Expect(codeStr).To(ContainSubstring("responseBytes[0] == 0x01")) + Expect(codeStr).To(ContainSubstring("binary.BigEndian.Uint32")) + + // Should return (string, []byte, error) + Expect(codeStr).To(ContainSubstring("func StreamGetStream(uri string) (string, []byte, error)")) + }) }) Describe("GenerateClientGoStub", func() { @@ -1550,6 +1747,51 @@ var _ = Describe("Rust Generation", func() { Expect(codeStr).To(ContainSubstring("Result")) Expect(codeStr).NotTo(ContainSubstring("Option")) }) + + It("should generate raw extern C import and binary frame parsing for raw methods", func() { + svc := Service{ + Name: "Stream", + Permission: "stream", + Interface: "StreamService", + Methods: []Method{ + { + Name: "GetStream", + HasError: true, + Raw: true, + Params: []Param{NewParam("uri", "string")}, + Returns: []Param{ + NewParam("contentType", "string"), + NewParam("data", "[]byte"), + }, + Doc: "GetStream returns raw binary stream data.", + }, + }, + } + + code, err := GenerateClientRust(svc) + Expect(err).NotTo(HaveOccurred()) + + codeStr := string(code) + + // Should use extern "C" with wasm_import_module for raw methods, not #[host_fn] extern "ExtismHost" + Expect(codeStr).To(ContainSubstring(`#[link(wasm_import_module = "extism:host/user")]`)) + Expect(codeStr).To(ContainSubstring(`extern "C"`)) + Expect(codeStr).To(ContainSubstring("fn stream_getstream(offset: u64) -> u64")) + + // Should NOT generate response type for raw methods + Expect(codeStr).NotTo(ContainSubstring("StreamGetStreamResponse")) + + // Should generate request type (request is still JSON) + Expect(codeStr).To(ContainSubstring("struct StreamGetStreamRequest")) + + // Should return Result<(String, Vec), Error> + Expect(codeStr).To(ContainSubstring("Result<(String, Vec), Error>")) + + // Should parse binary frame + Expect(codeStr).To(ContainSubstring("response_bytes[0] == 0x01")) + Expect(codeStr).To(ContainSubstring("u32::from_be_bytes")) + Expect(codeStr).To(ContainSubstring("String::from_utf8_lossy")) + }) }) }) diff --git a/plugins/cmd/ndpgen/internal/parser.go b/plugins/cmd/ndpgen/internal/parser.go index 4cb28f8d4..c2d571779 100644 --- a/plugins/cmd/ndpgen/internal/parser.go +++ b/plugins/cmd/ndpgen/internal/parser.go @@ -761,6 +761,7 @@ func parseMethod(name string, funcType *ast.FuncType, annotation map[string]stri m := Method{ Name: name, ExportName: annotation["name"], + Raw: annotation["raw"] == "true", Doc: doc, } @@ -799,6 +800,13 @@ func parseMethod(name string, funcType *ast.FuncType, annotation map[string]stri } } + // Validate raw=true methods: must return exactly (string, []byte, error) + if m.Raw { + if !m.HasError || len(m.Returns) != 2 || m.Returns[0].Type != "string" || m.Returns[1].Type != "[]byte" { + return m, fmt.Errorf("raw=true method %s must return (string, []byte, error) — content-type, data, error", name) + } + } + return m, nil } diff --git a/plugins/cmd/ndpgen/internal/parser_test.go b/plugins/cmd/ndpgen/internal/parser_test.go index f43578397..f2bdbeded 100644 --- a/plugins/cmd/ndpgen/internal/parser_test.go +++ b/plugins/cmd/ndpgen/internal/parser_test.go @@ -122,6 +122,119 @@ type TestService interface { Expect(services[0].Methods[0].Name).To(Equal("Exported")) }) + It("should parse raw=true annotation", func() { + src := `package host + +import "context" + +//nd:hostservice name=Stream permission=stream +type StreamService interface { + //nd:hostfunc raw=true + GetStream(ctx context.Context, uri string) (contentType string, data []byte, err error) +} +` + err := os.WriteFile(filepath.Join(tmpDir, "stream.go"), []byte(src), 0600) + Expect(err).NotTo(HaveOccurred()) + + services, err := ParseDirectory(tmpDir) + Expect(err).NotTo(HaveOccurred()) + Expect(services).To(HaveLen(1)) + + m := services[0].Methods[0] + Expect(m.Name).To(Equal("GetStream")) + Expect(m.Raw).To(BeTrue()) + Expect(m.HasError).To(BeTrue()) + Expect(m.Returns).To(HaveLen(2)) + Expect(m.Returns[0].Name).To(Equal("contentType")) + Expect(m.Returns[0].Type).To(Equal("string")) + Expect(m.Returns[1].Name).To(Equal("data")) + Expect(m.Returns[1].Type).To(Equal("[]byte")) + }) + + It("should set Raw=false when raw annotation is absent", func() { + src := `package host + +import "context" + +//nd:hostservice name=Test permission=test +type TestService interface { + //nd:hostfunc + Call(ctx context.Context, uri string) (response string, err error) +} +` + err := os.WriteFile(filepath.Join(tmpDir, "test.go"), []byte(src), 0600) + Expect(err).NotTo(HaveOccurred()) + + services, err := ParseDirectory(tmpDir) + Expect(err).NotTo(HaveOccurred()) + Expect(services[0].Methods[0].Raw).To(BeFalse()) + }) + + It("should reject raw=true with invalid return signature", func() { + src := `package host + +import "context" + +//nd:hostservice name=Test permission=test +type TestService interface { + //nd:hostfunc raw=true + BadRaw(ctx context.Context, uri string) (result string, err error) +} +` + err := os.WriteFile(filepath.Join(tmpDir, "test.go"), []byte(src), 0600) + Expect(err).NotTo(HaveOccurred()) + + _, err = ParseDirectory(tmpDir) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("raw=true")) + Expect(err.Error()).To(ContainSubstring("must return (string, []byte, error)")) + }) + + It("should reject raw=true without error return", func() { + src := `package host + +import "context" + +//nd:hostservice name=Test permission=test +type TestService interface { + //nd:hostfunc raw=true + BadRaw(ctx context.Context, uri string) (contentType string, data []byte) +} +` + err := os.WriteFile(filepath.Join(tmpDir, "test.go"), []byte(src), 0600) + Expect(err).NotTo(HaveOccurred()) + + _, err = ParseDirectory(tmpDir) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("raw=true")) + }) + + It("should parse mixed raw and non-raw methods", func() { + src := `package host + +import "context" + +//nd:hostservice name=API permission=api +type APIService interface { + //nd:hostfunc + Call(ctx context.Context, uri string) (responseJSON string, err error) + + //nd:hostfunc raw=true + CallRaw(ctx context.Context, uri string) (contentType string, data []byte, err error) +} +` + err := os.WriteFile(filepath.Join(tmpDir, "api.go"), []byte(src), 0600) + Expect(err).NotTo(HaveOccurred()) + + services, err := ParseDirectory(tmpDir) + Expect(err).NotTo(HaveOccurred()) + Expect(services).To(HaveLen(1)) + Expect(services[0].Methods).To(HaveLen(2)) + Expect(services[0].Methods[0].Raw).To(BeFalse()) + Expect(services[0].Methods[1].Raw).To(BeTrue()) + Expect(services[0].HasRawMethods()).To(BeTrue()) + }) + It("should handle custom export name", func() { src := `package host diff --git a/plugins/cmd/ndpgen/internal/templates/client.go.tmpl b/plugins/cmd/ndpgen/internal/templates/client.go.tmpl index a6ee04446..971ae394a 100644 --- a/plugins/cmd/ndpgen/internal/templates/client.go.tmpl +++ b/plugins/cmd/ndpgen/internal/templates/client.go.tmpl @@ -8,6 +8,9 @@ package {{.Package}} import ( +{{- if .Service.HasRawMethods}} + "encoding/binary" +{{- end}} "encoding/json" {{- if .Service.HasErrors}} "errors" @@ -49,7 +52,7 @@ type {{requestType .}} struct { {{- end}} } {{- end}} -{{- if not .IsErrorOnly}} +{{- if and (not .IsErrorOnly) (not .Raw)}} type {{responseType .}} struct { {{- range .Returns}} @@ -95,7 +98,27 @@ func {{$.Service.Name}}{{.Name}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{ // Read the response from memory responseMem := pdk.FindMemory(responsePtr) responseBytes := responseMem.ReadBytes() -{{- if .IsErrorOnly}} +{{- if .Raw}} + + // Parse binary-framed response + if len(responseBytes) == 0 { + return "", nil, errors.New("empty response from host") + } + if responseBytes[0] == 0x01 { // error + return "", nil, errors.New(string(responseBytes[1:])) + } + if responseBytes[0] != 0x00 { + return "", nil, errors.New("unknown response status") + } + if len(responseBytes) < 5 { + return "", nil, errors.New("malformed raw response: incomplete header") + } + ctLen := binary.BigEndian.Uint32(responseBytes[1:5]) + if uint32(len(responseBytes)) < 5+ctLen { + return "", nil, errors.New("malformed raw response: content-type overflow") + } + return string(responseBytes[5 : 5+ctLen]), responseBytes[5+ctLen:], nil +{{- else if .IsErrorOnly}} // Parse error-only response var response struct { diff --git a/plugins/cmd/ndpgen/internal/templates/client.py.tmpl b/plugins/cmd/ndpgen/internal/templates/client.py.tmpl index 99c5be51b..84bff4abe 100644 --- a/plugins/cmd/ndpgen/internal/templates/client.py.tmpl +++ b/plugins/cmd/ndpgen/internal/templates/client.py.tmpl @@ -8,10 +8,13 @@ # main __init__.py file. Copy the needed functions from this file into your plugin. from dataclasses import dataclass -from typing import Any +from typing import Any{{- if .Service.HasRawMethods}}, Tuple{{end}} import extism import json +{{- if .Service.HasRawMethods}} +import struct +{{- end}} class HostFunctionError(Exception): @@ -29,7 +32,7 @@ def _{{exportName .}}(offset: int) -> int: {{- end}} {{- /* Generate dataclasses for multi-value returns */ -}} {{range .Service.Methods}} -{{- if .NeedsResultClass}} +{{- if and .NeedsResultClass (not .Raw)}} @dataclass @@ -44,7 +47,7 @@ class {{pythonResultType .}}: {{range .Service.Methods}} -def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonName}}: {{$p.PythonType}}{{end}}){{if .NeedsResultClass}} -> {{pythonResultType .}}{{else if .HasReturns}} -> {{(index .Returns 0).PythonType}}{{else}} -> None{{end}}: +def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonName}}: {{$p.PythonType}}{{end}}){{if .Raw}} -> Tuple[str, bytes]{{else if .NeedsResultClass}} -> {{pythonResultType .}}{{else if .HasReturns}} -> {{(index .Returns 0).PythonType}}{{else}} -> None{{end}}: """{{if .Doc}}{{.Doc}}{{else}}Call the {{exportName .}} host function.{{end}} {{- if .HasParams}} @@ -53,7 +56,11 @@ def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonNam {{.PythonName}}: {{.PythonType}} parameter. {{- end}} {{- end}} -{{- if .HasReturns}} +{{- if .Raw}} + + Returns: + Tuple of (content_type, data) with the raw binary response. +{{- else if .HasReturns}} Returns: {{- if .NeedsResultClass}} @@ -79,6 +86,24 @@ def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonNam request_mem = extism.memory.alloc(request_bytes) response_offset = _{{exportName .}}(request_mem.offset) response_mem = extism.memory.find(response_offset) +{{- if .Raw}} + response_bytes = response_mem.bytes() + + if len(response_bytes) == 0: + raise HostFunctionError("empty response from host") + if response_bytes[0] == 0x01: + raise HostFunctionError(response_bytes[1:].decode("utf-8")) + if response_bytes[0] != 0x00: + raise HostFunctionError("unknown response status") + if len(response_bytes) < 5: + raise HostFunctionError("malformed raw response: incomplete header") + ct_len = struct.unpack(">I", response_bytes[1:5])[0] + if len(response_bytes) < 5 + ct_len: + raise HostFunctionError("malformed raw response: content-type overflow") + content_type = response_bytes[5:5 + ct_len].decode("utf-8") + data = response_bytes[5 + ct_len:] + return content_type, data +{{- else}} response = json.loads(extism.memory.string(response_mem)) {{if .HasError}} if response.get("error"): @@ -94,3 +119,4 @@ def {{pythonFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.PythonNam return response.get("{{(index .Returns 0).JSONName}}"{{pythonDefault (index .Returns 0)}}) {{- end}} {{- end}} +{{- end}} diff --git a/plugins/cmd/ndpgen/internal/templates/client.rs.tmpl b/plugins/cmd/ndpgen/internal/templates/client.rs.tmpl index 6dea8098e..2fb368bf1 100644 --- a/plugins/cmd/ndpgen/internal/templates/client.rs.tmpl +++ b/plugins/cmd/ndpgen/internal/templates/client.rs.tmpl @@ -33,6 +33,7 @@ struct {{requestType .}} { {{- end}} } {{- end}} +{{- if not .Raw}} #[derive(Debug, Clone, Deserialize)] #[serde(rename_all = "camelCase")] @@ -47,16 +48,92 @@ struct {{responseType .}} { {{- end}} } {{- end}} +{{- end}} #[host_fn] extern "ExtismHost" { {{- range .Service.Methods}} +{{- if not .Raw}} fn {{exportName .}}(input: Json<{{if .HasParams}}{{requestType .}}{{else}}serde_json::Value{{end}}>) -> Json<{{responseType .}}>; {{- end}} +{{- end}} } +{{- /* Declare raw extern "C" imports for raw methods */ -}} +{{- range .Service.Methods}} +{{- if .Raw}} + +#[link(wasm_import_module = "extism:host/user")] +extern "C" { + fn {{exportName .}}(offset: u64) -> u64; +} +{{- end}} +{{- end}} {{- /* Generate wrapper functions */ -}} {{range .Service.Methods}} +{{- if .Raw}} + +{{if .Doc}}{{rustDocComment .Doc}}{{else}}/// Calls the {{exportName .}} host function.{{end}} +{{- if .HasParams}} +/// +/// # Arguments +{{- range .Params}} +/// * `{{.RustName}}` - {{rustType .}} parameter. +{{- end}} +{{- end}} +/// +/// # Returns +/// A tuple of (content_type, data) with the raw binary response. +/// +/// # Errors +/// Returns an error if the host function call fails. +pub fn {{rustFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.RustName}}: {{rustParamType $p}}{{end}}) -> Result<(String, Vec), Error> { +{{- if .HasParams}} + let req = {{requestType .}} { +{{- range .Params}} + {{.RustName}}: {{.RustName}}{{if .NeedsToOwned}}.to_owned(){{end}}, +{{- end}} + }; + let input_bytes = serde_json::to_vec(&req).map_err(|e| Error::msg(e.to_string()))?; +{{- else}} + let input_bytes = b"{}".to_vec(); +{{- end}} + let input_mem = Memory::from_bytes(&input_bytes).map_err(|e| Error::msg(e.to_string()))?; + + let response_offset = unsafe { {{exportName .}}(input_mem.offset()) }; + + let response_mem = Memory::find(response_offset) + .ok_or_else(|| Error::msg("empty response from host"))?; + let response_bytes = response_mem.to_vec(); + + if response_bytes.is_empty() { + return Err(Error::msg("empty response from host")); + } + if response_bytes[0] == 0x01 { + let msg = String::from_utf8_lossy(&response_bytes[1..]).to_string(); + return Err(Error::msg(msg)); + } + if response_bytes[0] != 0x00 { + return Err(Error::msg("unknown response status")); + } + if response_bytes.len() < 5 { + return Err(Error::msg("malformed raw response: incomplete header")); + } + let ct_len = u32::from_be_bytes([ + response_bytes[1], + response_bytes[2], + response_bytes[3], + response_bytes[4], + ]) as usize; + if ct_len > response_bytes.len() - 5 { + return Err(Error::msg("malformed raw response: content-type overflow")); + } + let ct_end = 5 + ct_len; + let content_type = String::from_utf8_lossy(&response_bytes[5..ct_end]).to_string(); + let data = response_bytes[ct_end..].to_vec(); + Ok((content_type, data)) +} +{{- else}} {{if .Doc}}{{rustDocComment .Doc}}{{else}}/// Calls the {{exportName .}} host function.{{end}} {{- if .HasParams}} @@ -132,3 +209,4 @@ pub fn {{rustFunc .}}({{range $i, $p := .Params}}{{if $i}}, {{end}}{{$p.RustName } {{- end}} {{- end}} +{{- end}} diff --git a/plugins/cmd/ndpgen/internal/templates/host.go.tmpl b/plugins/cmd/ndpgen/internal/templates/host.go.tmpl index d10c01ee4..12dd20475 100644 --- a/plugins/cmd/ndpgen/internal/templates/host.go.tmpl +++ b/plugins/cmd/ndpgen/internal/templates/host.go.tmpl @@ -4,6 +4,9 @@ package {{.Package}} import ( "context" +{{- if .Service.HasRawMethods}} + "encoding/binary" +{{- end}} "encoding/json" extism "github.com/extism/go-sdk" @@ -20,6 +23,7 @@ type {{requestType .}} struct { {{- end}} } {{- end}} +{{- if not .Raw}} // {{responseType .}} is the response type for {{$.Service.Name}}.{{.Name}}. type {{responseType .}} struct { @@ -30,6 +34,7 @@ type {{responseType .}} struct { Error string `json:"error,omitempty"` {{- end}} } +{{- end}} {{end}} // Register{{.Service.Name}}HostFunctions registers {{.Service.Name}} service host functions. @@ -51,18 +56,48 @@ func new{{$.Service.Name}}{{.Name}}HostFunction(service {{$.Service.Interface}}) // Read JSON request from plugin memory reqBytes, err := p.ReadBytes(stack[0]) if err != nil { +{{- if .Raw}} + {{$.Service.Name | lower}}WriteRawError(p, stack, err) +{{- else}} {{$.Service.Name | lower}}WriteError(p, stack, err) +{{- end}} return } var req {{requestType .}} if err := json.Unmarshal(reqBytes, &req); err != nil { +{{- if .Raw}} + {{$.Service.Name | lower}}WriteRawError(p, stack, err) +{{- else}} {{$.Service.Name | lower}}WriteError(p, stack, err) +{{- end}} return } {{- end}} // Call the service method -{{- if .HasReturns}} +{{- if .Raw}} + {{range $i, $r := .Returns}}{{if $i}}, {{end}}{{lower $r.Name}}{{end}}, svcErr := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}) + if svcErr != nil { + {{$.Service.Name | lower}}WriteRawError(p, stack, svcErr) + return + } + + // Write binary-framed response to plugin memory: + // [0x00][4-byte content-type length (big-endian)][content-type string][raw data] + ctBytes := []byte({{lower (index .Returns 0).Name}}) + frame := make([]byte, 1+4+len(ctBytes)+len({{lower (index .Returns 1).Name}})) + frame[0] = 0x00 // success + binary.BigEndian.PutUint32(frame[1:5], uint32(len(ctBytes))) + copy(frame[5:5+len(ctBytes)], ctBytes) + copy(frame[5+len(ctBytes):], {{lower (index .Returns 1).Name}}) + + respPtr, err := p.WriteBytes(frame) + if err != nil { + stack[0] = 0 + return + } + stack[0] = respPtr +{{- else if .HasReturns}} {{- if .HasError}} {{range $i, $r := .Returns}}{{if $i}}, {{end}}{{lower $r.Name}}{{end}}, svcErr := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}) if svcErr != nil { @@ -72,14 +107,6 @@ func new{{$.Service.Name}}{{.Name}}HostFunction(service {{$.Service.Interface}}) {{- else}} {{range $i, $r := .Returns}}{{if $i}}, {{end}}{{lower $r.Name}}{{end}} := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}) {{- end}} -{{- else if .HasError}} - if svcErr := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}); svcErr != nil { - {{$.Service.Name | lower}}WriteError(p, stack, svcErr) - return - } -{{- else}} - service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}) -{{- end}} // Write JSON response to plugin memory resp := {{responseType .}}{ @@ -88,6 +115,22 @@ func new{{$.Service.Name}}{{.Name}}HostFunction(service {{$.Service.Interface}}) {{- end}} } {{$.Service.Name | lower}}WriteResponse(p, stack, resp) +{{- else if .HasError}} + if svcErr := service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}); svcErr != nil { + {{$.Service.Name | lower}}WriteError(p, stack, svcErr) + return + } + + // Write JSON response to plugin memory + resp := {{responseType .}}{} + {{$.Service.Name | lower}}WriteResponse(p, stack, resp) +{{- else}} + service.{{.Name}}(ctx{{range .Params}}, req.{{title .Name}}{{end}}) + + // Write JSON response to plugin memory + resp := {{responseType .}}{} + {{$.Service.Name | lower}}WriteResponse(p, stack, resp) +{{- end}} }, []extism.ValueType{extism.ValueTypePTR}, []extism.ValueType{extism.ValueTypePTR}, @@ -119,3 +162,16 @@ func {{.Service.Name | lower}}WriteError(p *extism.CurrentPlugin, stack []uint64 respPtr, _ := p.WriteBytes(respBytes) stack[0] = respPtr } +{{- if .Service.HasRawMethods}} + +// {{.Service.Name | lower}}WriteRawError writes a binary-framed error response to plugin memory. +// Format: [0x01][UTF-8 error message] +func {{.Service.Name | lower}}WriteRawError(p *extism.CurrentPlugin, stack []uint64, err error) { + errMsg := []byte(err.Error()) + frame := make([]byte, 1+len(errMsg)) + frame[0] = 0x01 // error + copy(frame[1:], errMsg) + respPtr, _ := p.WriteBytes(frame) + stack[0] = respPtr +} +{{- end}} diff --git a/plugins/cmd/ndpgen/internal/types.go b/plugins/cmd/ndpgen/internal/types.go index 7bd2bcc3f..29cf2316a 100644 --- a/plugins/cmd/ndpgen/internal/types.go +++ b/plugins/cmd/ndpgen/internal/types.go @@ -173,6 +173,16 @@ func (s Service) HasErrors() bool { return false } +// HasRawMethods returns true if any method in the service uses raw binary framing. +func (s Service) HasRawMethods() bool { + for _, m := range s.Methods { + if m.Raw { + return true + } + } + return false +} + // Method represents a host function method within a service. type Method struct { Name string // Go method name (e.g., "Call") @@ -181,6 +191,7 @@ type Method struct { Returns []Param // Return values (excluding error) HasError bool // Whether the method returns an error Doc string // Documentation comment for the method + Raw bool // If true, response uses binary framing instead of JSON } // FunctionName returns the Extism host function export name. diff --git a/plugins/cmd/ndpgen/testdata/raw_client_expected.go.txt b/plugins/cmd/ndpgen/testdata/raw_client_expected.go.txt new file mode 100644 index 000000000..22d387041 --- /dev/null +++ b/plugins/cmd/ndpgen/testdata/raw_client_expected.go.txt @@ -0,0 +1,66 @@ +// Code generated by ndpgen. DO NOT EDIT. +// +// This file contains client wrappers for the Stream host service. +// It is intended for use in Navidrome plugins built with TinyGo. +// +//go:build wasip1 + +package ndpdk + +import ( + "encoding/binary" + "encoding/json" + "errors" + + "github.com/navidrome/navidrome/plugins/pdk/go/pdk" +) + +// stream_getstream is the host function provided by Navidrome. +// +//go:wasmimport extism:host/user stream_getstream +func stream_getstream(uint64) uint64 + +type streamGetStreamRequest struct { + Uri string `json:"uri"` +} + +// StreamGetStream calls the stream_getstream host function. +// GetStream returns raw binary stream data with content type. +func StreamGetStream(uri string) (string, []byte, error) { + // Marshal request to JSON + req := streamGetStreamRequest{ + Uri: uri, + } + reqBytes, err := json.Marshal(req) + if err != nil { + return "", nil, err + } + reqMem := pdk.AllocateBytes(reqBytes) + defer reqMem.Free() + + // Call the host function + responsePtr := stream_getstream(reqMem.Offset()) + + // Read the response from memory + responseMem := pdk.FindMemory(responsePtr) + responseBytes := responseMem.ReadBytes() + + // Parse binary-framed response + if len(responseBytes) == 0 { + return "", nil, errors.New("empty response from host") + } + if responseBytes[0] == 0x01 { // error + return "", nil, errors.New(string(responseBytes[1:])) + } + if responseBytes[0] != 0x00 { + return "", nil, errors.New("unknown response status") + } + if len(responseBytes) < 5 { + return "", nil, errors.New("malformed raw response: incomplete header") + } + ctLen := binary.BigEndian.Uint32(responseBytes[1:5]) + if uint32(len(responseBytes)) < 5+ctLen { + return "", nil, errors.New("malformed raw response: content-type overflow") + } + return string(responseBytes[5 : 5+ctLen]), responseBytes[5+ctLen:], nil +} diff --git a/plugins/cmd/ndpgen/testdata/raw_client_expected.py b/plugins/cmd/ndpgen/testdata/raw_client_expected.py new file mode 100644 index 000000000..45af2b6c6 --- /dev/null +++ b/plugins/cmd/ndpgen/testdata/raw_client_expected.py @@ -0,0 +1,63 @@ +# Code generated by ndpgen. DO NOT EDIT. +# +# This file contains client wrappers for the Stream host service. +# It is intended for use in Navidrome plugins built with extism-py. +# +# IMPORTANT: Due to a limitation in extism-py, you cannot import this file directly. +# The @extism.import_fn decorators are only detected when defined in the plugin's +# main __init__.py file. Copy the needed functions from this file into your plugin. + +from dataclasses import dataclass +from typing import Any, Tuple + +import extism +import json +import struct + + +class HostFunctionError(Exception): + """Raised when a host function returns an error.""" + pass + + +@extism.import_fn("extism:host/user", "stream_getstream") +def _stream_getstream(offset: int) -> int: + """Raw host function - do not call directly.""" + ... + + +def stream_get_stream(uri: str) -> Tuple[str, bytes]: + """GetStream returns raw binary stream data with content type. + + Args: + uri: str parameter. + + Returns: + Tuple of (content_type, data) with the raw binary response. + + Raises: + HostFunctionError: If the host function returns an error. + """ + request = { + "uri": uri, + } + request_bytes = json.dumps(request).encode("utf-8") + request_mem = extism.memory.alloc(request_bytes) + response_offset = _stream_getstream(request_mem.offset) + response_mem = extism.memory.find(response_offset) + response_bytes = response_mem.bytes() + + if len(response_bytes) == 0: + raise HostFunctionError("empty response from host") + if response_bytes[0] == 0x01: + raise HostFunctionError(response_bytes[1:].decode("utf-8")) + if response_bytes[0] != 0x00: + raise HostFunctionError("unknown response status") + if len(response_bytes) < 5: + raise HostFunctionError("malformed raw response: incomplete header") + ct_len = struct.unpack(">I", response_bytes[1:5])[0] + if len(response_bytes) < 5 + ct_len: + raise HostFunctionError("malformed raw response: content-type overflow") + content_type = response_bytes[5:5 + ct_len].decode("utf-8") + data = response_bytes[5 + ct_len:] + return content_type, data diff --git a/plugins/cmd/ndpgen/testdata/raw_client_expected.rs b/plugins/cmd/ndpgen/testdata/raw_client_expected.rs new file mode 100644 index 000000000..6de18be8e --- /dev/null +++ b/plugins/cmd/ndpgen/testdata/raw_client_expected.rs @@ -0,0 +1,73 @@ +// Code generated by ndpgen. DO NOT EDIT. +// +// This file contains client wrappers for the Stream host service. +// It is intended for use in Navidrome plugins built with extism-pdk. + +use extism_pdk::*; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +struct StreamGetStreamRequest { + uri: String, +} + +#[host_fn] +extern "ExtismHost" { +} + +#[link(wasm_import_module = "extism:host/user")] +extern "C" { + fn stream_getstream(offset: u64) -> u64; +} + +/// GetStream returns raw binary stream data with content type. +/// +/// # Arguments +/// * `uri` - String parameter. +/// +/// # Returns +/// A tuple of (content_type, data) with the raw binary response. +/// +/// # Errors +/// Returns an error if the host function call fails. +pub fn get_stream(uri: &str) -> Result<(String, Vec), Error> { + let req = StreamGetStreamRequest { + uri: uri.to_owned(), + }; + let input_bytes = serde_json::to_vec(&req).map_err(|e| Error::msg(e.to_string()))?; + let input_mem = Memory::from_bytes(&input_bytes).map_err(|e| Error::msg(e.to_string()))?; + + let response_offset = unsafe { stream_getstream(input_mem.offset()) }; + + let response_mem = Memory::find(response_offset) + .ok_or_else(|| Error::msg("empty response from host"))?; + let response_bytes = response_mem.to_vec(); + + if response_bytes.is_empty() { + return Err(Error::msg("empty response from host")); + } + if response_bytes[0] == 0x01 { + let msg = String::from_utf8_lossy(&response_bytes[1..]).to_string(); + return Err(Error::msg(msg)); + } + if response_bytes[0] != 0x00 { + return Err(Error::msg("unknown response status")); + } + if response_bytes.len() < 5 { + return Err(Error::msg("malformed raw response: incomplete header")); + } + let ct_len = u32::from_be_bytes([ + response_bytes[1], + response_bytes[2], + response_bytes[3], + response_bytes[4], + ]) as usize; + if ct_len > response_bytes.len() - 5 { + return Err(Error::msg("malformed raw response: content-type overflow")); + } + let ct_end = 5 + ct_len; + let content_type = String::from_utf8_lossy(&response_bytes[5..ct_end]).to_string(); + let data = response_bytes[ct_end..].to_vec(); + Ok((content_type, data)) +} diff --git a/plugins/cmd/ndpgen/testdata/raw_service.go.txt b/plugins/cmd/ndpgen/testdata/raw_service.go.txt new file mode 100644 index 000000000..c08332f5d --- /dev/null +++ b/plugins/cmd/ndpgen/testdata/raw_service.go.txt @@ -0,0 +1,10 @@ +package testpkg + +import "context" + +//nd:hostservice name=Stream permission=stream +type StreamService interface { + // GetStream returns raw binary stream data with content type. + //nd:hostfunc raw=true + GetStream(ctx context.Context, uri string) (contentType string, data []byte, err error) +} diff --git a/plugins/host/subsonicapi.go b/plugins/host/subsonicapi.go index d8fa900d3..117f8abff 100644 --- a/plugins/host/subsonicapi.go +++ b/plugins/host/subsonicapi.go @@ -15,4 +15,10 @@ type SubsonicAPIService interface { // e.g., "getAlbumList2?type=random&size=10". The response is returned as raw JSON. //nd:hostfunc Call(ctx context.Context, uri string) (responseJSON string, err error) + + // CallRaw executes a Subsonic API request and returns the raw binary response. + // Optimized for binary endpoints like getCoverArt and stream that return + // non-JSON data. The response is returned as raw bytes without JSON encoding overhead. + //nd:hostfunc raw=true + CallRaw(ctx context.Context, uri string) (contentType string, data []byte, err error) } diff --git a/plugins/host/subsonicapi_gen.go b/plugins/host/subsonicapi_gen.go index e3c2af7bd..438c51c95 100644 --- a/plugins/host/subsonicapi_gen.go +++ b/plugins/host/subsonicapi_gen.go @@ -4,6 +4,7 @@ package host import ( "context" + "encoding/binary" "encoding/json" extism "github.com/extism/go-sdk" @@ -20,11 +21,17 @@ type SubsonicAPICallResponse struct { Error string `json:"error,omitempty"` } +// SubsonicAPICallRawRequest is the request type for SubsonicAPI.CallRaw. +type SubsonicAPICallRawRequest struct { + Uri string `json:"uri"` +} + // RegisterSubsonicAPIHostFunctions registers SubsonicAPI service host functions. // The returned host functions should be added to the plugin's configuration. func RegisterSubsonicAPIHostFunctions(service SubsonicAPIService) []extism.HostFunction { return []extism.HostFunction{ newSubsonicAPICallHostFunction(service), + newSubsonicAPICallRawHostFunction(service), } } @@ -62,6 +69,50 @@ func newSubsonicAPICallHostFunction(service SubsonicAPIService) extism.HostFunct ) } +func newSubsonicAPICallRawHostFunction(service SubsonicAPIService) extism.HostFunction { + return extism.NewHostFunctionWithStack( + "subsonicapi_callraw", + func(ctx context.Context, p *extism.CurrentPlugin, stack []uint64) { + // Read JSON request from plugin memory + reqBytes, err := p.ReadBytes(stack[0]) + if err != nil { + subsonicapiWriteRawError(p, stack, err) + return + } + var req SubsonicAPICallRawRequest + if err := json.Unmarshal(reqBytes, &req); err != nil { + subsonicapiWriteRawError(p, stack, err) + return + } + + // Call the service method + contenttype, data, svcErr := service.CallRaw(ctx, req.Uri) + if svcErr != nil { + subsonicapiWriteRawError(p, stack, svcErr) + return + } + + // Write binary-framed response to plugin memory: + // [0x00][4-byte content-type length (big-endian)][content-type string][raw data] + ctBytes := []byte(contenttype) + frame := make([]byte, 1+4+len(ctBytes)+len(data)) + frame[0] = 0x00 // success + binary.BigEndian.PutUint32(frame[1:5], uint32(len(ctBytes))) + copy(frame[5:5+len(ctBytes)], ctBytes) + copy(frame[5+len(ctBytes):], data) + + respPtr, err := p.WriteBytes(frame) + if err != nil { + stack[0] = 0 + return + } + stack[0] = respPtr + }, + []extism.ValueType{extism.ValueTypePTR}, + []extism.ValueType{extism.ValueTypePTR}, + ) +} + // subsonicapiWriteResponse writes a JSON response to plugin memory. func subsonicapiWriteResponse(p *extism.CurrentPlugin, stack []uint64, resp any) { respBytes, err := json.Marshal(resp) @@ -86,3 +137,14 @@ func subsonicapiWriteError(p *extism.CurrentPlugin, stack []uint64, err error) { respPtr, _ := p.WriteBytes(respBytes) stack[0] = respPtr } + +// subsonicapiWriteRawError writes a binary-framed error response to plugin memory. +// Format: [0x01][UTF-8 error message] +func subsonicapiWriteRawError(p *extism.CurrentPlugin, stack []uint64, err error) { + errMsg := []byte(err.Error()) + frame := make([]byte, 1+len(errMsg)) + frame[0] = 0x01 // error + copy(frame[1:], errMsg) + respPtr, _ := p.WriteBytes(frame) + stack[0] = respPtr +} diff --git a/plugins/host_subsonicapi.go b/plugins/host_subsonicapi.go index b7a98fcea..01a33c039 100644 --- a/plugins/host_subsonicapi.go +++ b/plugins/host_subsonicapi.go @@ -24,7 +24,7 @@ const subsonicAPIVersion = "1.16.1" // // Authentication: The plugin must provide a valid 'u' (username) parameter in the URL. // URL Format: Only the path and query parameters are used - host/protocol are ignored. -// Automatic Parameters: The service adds 'c' (client), 'v' (version), 'f' (format). +// Automatic Parameters: The service adds 'c' (client), 'v' (version), and optionally 'f' (format). type subsonicAPIServiceImpl struct { pluginID string router SubsonicRouter @@ -50,15 +50,18 @@ func newSubsonicAPIService(pluginID string, router SubsonicRouter, ds model.Data } } -func (s *subsonicAPIServiceImpl) Call(ctx context.Context, uri string) (string, error) { +// executeRequest handles URL parsing, validation, permission checks, HTTP request creation, +// and router invocation. Shared between Call and CallRaw. +// If setJSON is true, the 'f=json' query parameter is added. +func (s *subsonicAPIServiceImpl) executeRequest(ctx context.Context, uri string, setJSON bool) (*httptest.ResponseRecorder, error) { if s.router == nil { - return "", fmt.Errorf("SubsonicAPI router not available") + return nil, fmt.Errorf("SubsonicAPI router not available") } // Parse the input URL parsedURL, err := url.Parse(uri) if err != nil { - return "", fmt.Errorf("invalid URL format: %w", err) + return nil, fmt.Errorf("invalid URL format: %w", err) } // Extract query parameters @@ -67,18 +70,20 @@ func (s *subsonicAPIServiceImpl) Call(ctx context.Context, uri string) (string, // Validate that 'u' (username) parameter is present username := query.Get("u") if username == "" { - return "", fmt.Errorf("missing required parameter 'u' (username)") + return nil, fmt.Errorf("missing required parameter 'u' (username)") } if err := s.checkPermissions(ctx, username); err != nil { log.Warn(ctx, "SubsonicAPI call blocked by permissions", "plugin", s.pluginID, "user", username, err) - return "", err + return nil, err } // Add required Subsonic API parameters query.Set("c", s.pluginID) // Client name (plugin ID) - query.Set("f", "json") // Response format query.Set("v", subsonicAPIVersion) // API version + if setJSON { + query.Set("f", "json") // Response format + } // Extract the endpoint from the path endpoint := path.Base(parsedURL.Path) @@ -96,7 +101,7 @@ func (s *subsonicAPIServiceImpl) Call(ctx context.Context, uri string) (string, // explicitly added in the next step via request.WithInternalAuth. httpReq, err := http.NewRequest("GET", finalURL.String(), nil) if err != nil { - return "", fmt.Errorf("failed to create HTTP request: %w", err) + return nil, fmt.Errorf("failed to create HTTP request: %w", err) } // Set internal authentication context using the username from the 'u' parameter @@ -109,10 +114,26 @@ func (s *subsonicAPIServiceImpl) Call(ctx context.Context, uri string) (string, // Call the subsonic router s.router.ServeHTTP(recorder, httpReq) - // Return the response body as JSON + return recorder, nil +} + +func (s *subsonicAPIServiceImpl) Call(ctx context.Context, uri string) (string, error) { + recorder, err := s.executeRequest(ctx, uri, true) + if err != nil { + return "", err + } return recorder.Body.String(), nil } +func (s *subsonicAPIServiceImpl) CallRaw(ctx context.Context, uri string) (string, []byte, error) { + recorder, err := s.executeRequest(ctx, uri, false) + if err != nil { + return "", nil, err + } + contentType := recorder.Header().Get("Content-Type") + return contentType, recorder.Body.Bytes(), nil +} + func (s *subsonicAPIServiceImpl) checkPermissions(ctx context.Context, username string) error { // If allUsers is true, allow any user if s.allUsers { diff --git a/plugins/host_subsonicapi_test.go b/plugins/host_subsonicapi_test.go index 257332105..b0589fa12 100644 --- a/plugins/host_subsonicapi_test.go +++ b/plugins/host_subsonicapi_test.go @@ -8,6 +8,7 @@ import ( "encoding/json" "net/http" "os" + "path" "path/filepath" "github.com/navidrome/navidrome/conf" @@ -177,6 +178,61 @@ var _ = Describe("SubsonicAPI Host Function", Ordered, func() { Expect(err.Error()).To(ContainSubstring("missing required parameter")) }) }) + + Describe("SubsonicAPI CallRaw", func() { + var plugin *plugin + + BeforeEach(func() { + manager.mu.RLock() + plugin = manager.plugins["test-subsonicapi-plugin"] + manager.mu.RUnlock() + Expect(plugin).ToNot(BeNil()) + }) + + It("successfully calls getCoverArt and returns binary data", func() { + instance, err := plugin.instance(GinkgoT().Context()) + Expect(err).ToNot(HaveOccurred()) + defer instance.Close(GinkgoT().Context()) + + exit, output, err := instance.Call("call_subsonic_api_raw", []byte("/getCoverArt?u=testuser&id=al-1")) + Expect(err).ToNot(HaveOccurred()) + Expect(exit).To(Equal(uint32(0))) + + // Parse the metadata response from the test plugin + var result map[string]any + err = json.Unmarshal(output, &result) + Expect(err).ToNot(HaveOccurred()) + Expect(result["contentType"]).To(Equal("image/png")) + Expect(result["size"]).To(BeNumerically("==", len(fakePNGHeader))) + Expect(result["firstByte"]).To(BeNumerically("==", 0x89)) // PNG magic byte + }) + + It("does NOT set f=json parameter for raw calls", func() { + instance, err := plugin.instance(GinkgoT().Context()) + Expect(err).ToNot(HaveOccurred()) + defer instance.Close(GinkgoT().Context()) + + _, _, err = instance.Call("call_subsonic_api_raw", []byte("/getCoverArt?u=testuser&id=al-1")) + Expect(err).ToNot(HaveOccurred()) + + Expect(router.lastRequest).ToNot(BeNil()) + query := router.lastRequest.URL.Query() + Expect(query.Get("f")).To(BeEmpty()) + Expect(query.Get("c")).To(Equal("test-subsonicapi-plugin")) + Expect(query.Get("v")).To(Equal("1.16.1")) + }) + + It("returns error when username is missing", func() { + instance, err := plugin.instance(GinkgoT().Context()) + Expect(err).ToNot(HaveOccurred()) + defer instance.Close(GinkgoT().Context()) + + exit, _, err := instance.Call("call_subsonic_api_raw", []byte("/getCoverArt")) + Expect(err).To(HaveOccurred()) + Expect(exit).To(Equal(uint32(1))) + Expect(err.Error()).To(ContainSubstring("missing required parameter")) + }) + }) }) var _ = Describe("SubsonicAPIService", func() { @@ -323,6 +379,66 @@ var _ = Describe("SubsonicAPIService", func() { }) }) + Describe("CallRaw", func() { + It("returns binary data and content-type", func() { + service := newSubsonicAPIService("test-plugin", router, dataStore, nil, true) + + ctx := GinkgoT().Context() + contentType, data, err := service.CallRaw(ctx, "/getCoverArt?u=testuser&id=al-1") + Expect(err).ToNot(HaveOccurred()) + Expect(contentType).To(Equal("image/png")) + Expect(data).To(Equal(fakePNGHeader)) + }) + + It("does not set f=json parameter", func() { + service := newSubsonicAPIService("test-plugin", router, dataStore, nil, true) + + ctx := GinkgoT().Context() + _, _, err := service.CallRaw(ctx, "/getCoverArt?u=testuser&id=al-1") + Expect(err).ToNot(HaveOccurred()) + + Expect(router.lastRequest).ToNot(BeNil()) + query := router.lastRequest.URL.Query() + Expect(query.Get("f")).To(BeEmpty()) + }) + + It("enforces permission checks", func() { + service := newSubsonicAPIService("test-plugin", router, dataStore, []string{"user2"}, false) + + ctx := GinkgoT().Context() + _, _, err := service.CallRaw(ctx, "/getCoverArt?u=testuser&id=al-1") + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("not authorized")) + }) + + It("returns error when username is missing", func() { + service := newSubsonicAPIService("test-plugin", router, dataStore, nil, true) + + ctx := GinkgoT().Context() + _, _, err := service.CallRaw(ctx, "/getCoverArt") + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("missing required parameter")) + }) + + It("returns error when router is nil", func() { + service := newSubsonicAPIService("test-plugin", nil, dataStore, nil, true) + + ctx := GinkgoT().Context() + _, _, err := service.CallRaw(ctx, "/getCoverArt?u=testuser") + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("router not available")) + }) + + It("returns error for invalid URL", func() { + service := newSubsonicAPIService("test-plugin", router, dataStore, nil, true) + + ctx := GinkgoT().Context() + _, _, err := service.CallRaw(ctx, "://invalid") + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("invalid URL")) + }) + }) + Describe("Router Availability", func() { It("returns error when router is nil", func() { service := newSubsonicAPIService("test-plugin", nil, dataStore, nil, true) @@ -335,6 +451,9 @@ var _ = Describe("SubsonicAPIService", func() { }) }) +// fakePNGHeader is a minimal PNG file header used in tests. +var fakePNGHeader = []byte{0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A} + // fakeSubsonicRouter is a mock Subsonic router that returns predictable responses. type fakeSubsonicRouter struct { lastRequest *http.Request @@ -343,13 +462,20 @@ type fakeSubsonicRouter struct { func (r *fakeSubsonicRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) { r.lastRequest = req - // Return a successful ping response - response := map[string]any{ - "subsonic-response": map[string]any{ - "status": "ok", - "version": "1.16.1", - }, + endpoint := path.Base(req.URL.Path) + switch endpoint { + case "getCoverArt": + w.Header().Set("Content-Type", "image/png") + _, _ = w.Write(fakePNGHeader) + default: + // Return a successful ping response + response := map[string]any{ + "subsonic-response": map[string]any{ + "status": "ok", + "version": "1.16.1", + }, + } + w.Header().Set("Content-Type", "application/json") + _ = json.NewEncoder(w).Encode(response) } - w.Header().Set("Content-Type", "application/json") - _ = json.NewEncoder(w).Encode(response) } diff --git a/plugins/pdk/go/go.mod b/plugins/pdk/go/go.mod index 4d5fcddfc..3916cd749 100644 --- a/plugins/pdk/go/go.mod +++ b/plugins/pdk/go/go.mod @@ -6,10 +6,3 @@ require ( github.com/extism/go-pdk v1.1.3 github.com/stretchr/testify v1.11.1 ) - -require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.5.2 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) diff --git a/plugins/pdk/go/host/nd_host_subsonicapi.go b/plugins/pdk/go/host/nd_host_subsonicapi.go index 87469ce32..9bb4f4b15 100644 --- a/plugins/pdk/go/host/nd_host_subsonicapi.go +++ b/plugins/pdk/go/host/nd_host_subsonicapi.go @@ -8,6 +8,7 @@ package host import ( + "encoding/binary" "encoding/json" "errors" @@ -19,6 +20,11 @@ import ( //go:wasmimport extism:host/user subsonicapi_call func subsonicapi_call(uint64) uint64 +// subsonicapi_callraw is the host function provided by Navidrome. +// +//go:wasmimport extism:host/user subsonicapi_callraw +func subsonicapi_callraw(uint64) uint64 + type subsonicAPICallRequest struct { Uri string `json:"uri"` } @@ -28,6 +34,10 @@ type subsonicAPICallResponse struct { Error string `json:"error,omitempty"` } +type subsonicAPICallRawRequest struct { + Uri string `json:"uri"` +} + // SubsonicAPICall calls the subsonicapi_call host function. // Call executes a Subsonic API request and returns the JSON response. // @@ -65,3 +75,46 @@ func SubsonicAPICall(uri string) (string, error) { return response.ResponseJSON, nil } + +// SubsonicAPICallRaw calls the subsonicapi_callraw host function. +// CallRaw executes a Subsonic API request and returns the raw binary response. +// Optimized for binary endpoints like getCoverArt and stream that return +// non-JSON data. The response is returned as raw bytes without JSON encoding overhead. +func SubsonicAPICallRaw(uri string) (string, []byte, error) { + // Marshal request to JSON + req := subsonicAPICallRawRequest{ + Uri: uri, + } + reqBytes, err := json.Marshal(req) + if err != nil { + return "", nil, err + } + reqMem := pdk.AllocateBytes(reqBytes) + defer reqMem.Free() + + // Call the host function + responsePtr := subsonicapi_callraw(reqMem.Offset()) + + // Read the response from memory + responseMem := pdk.FindMemory(responsePtr) + responseBytes := responseMem.ReadBytes() + + // Parse binary-framed response + if len(responseBytes) == 0 { + return "", nil, errors.New("empty response from host") + } + if responseBytes[0] == 0x01 { // error + return "", nil, errors.New(string(responseBytes[1:])) + } + if responseBytes[0] != 0x00 { + return "", nil, errors.New("unknown response status") + } + if len(responseBytes) < 5 { + return "", nil, errors.New("malformed raw response: incomplete header") + } + ctLen := binary.BigEndian.Uint32(responseBytes[1:5]) + if uint32(len(responseBytes)) < 5+ctLen { + return "", nil, errors.New("malformed raw response: content-type overflow") + } + return string(responseBytes[5 : 5+ctLen]), responseBytes[5+ctLen:], nil +} diff --git a/plugins/pdk/go/host/nd_host_subsonicapi_stub.go b/plugins/pdk/go/host/nd_host_subsonicapi_stub.go index f9d71a9c0..95dd41558 100644 --- a/plugins/pdk/go/host/nd_host_subsonicapi_stub.go +++ b/plugins/pdk/go/host/nd_host_subsonicapi_stub.go @@ -33,3 +33,17 @@ func (m *mockSubsonicAPIService) Call(uri string) (string, error) { func SubsonicAPICall(uri string) (string, error) { return SubsonicAPIMock.Call(uri) } + +// CallRaw is the mock method for SubsonicAPICallRaw. +func (m *mockSubsonicAPIService) CallRaw(uri string) (string, []byte, error) { + args := m.Called(uri) + return args.String(0), args.Get(1).([]byte), args.Error(2) +} + +// SubsonicAPICallRaw delegates to the mock instance. +// CallRaw executes a Subsonic API request and returns the raw binary response. +// Optimized for binary endpoints like getCoverArt and stream that return +// non-JSON data. The response is returned as raw bytes without JSON encoding overhead. +func SubsonicAPICallRaw(uri string) (string, []byte, error) { + return SubsonicAPIMock.CallRaw(uri) +} diff --git a/plugins/pdk/python/host/nd_host_subsonicapi.py b/plugins/pdk/python/host/nd_host_subsonicapi.py index ee6b543fa..4da8da77f 100644 --- a/plugins/pdk/python/host/nd_host_subsonicapi.py +++ b/plugins/pdk/python/host/nd_host_subsonicapi.py @@ -8,10 +8,11 @@ # main __init__.py file. Copy the needed functions from this file into your plugin. from dataclasses import dataclass -from typing import Any +from typing import Any, Tuple import extism import json +import struct class HostFunctionError(Exception): @@ -25,6 +26,12 @@ def _subsonicapi_call(offset: int) -> int: ... +@extism.import_fn("extism:host/user", "subsonicapi_callraw") +def _subsonicapi_callraw(offset: int) -> int: + """Raw host function - do not call directly.""" + ... + + def subsonicapi_call(uri: str) -> str: """Call executes a Subsonic API request and returns the JSON response. @@ -53,3 +60,42 @@ e.g., "getAlbumList2?type=random&size=10". The response is returned as raw JSON. raise HostFunctionError(response["error"]) return response.get("responseJson", "") + + +def subsonicapi_call_raw(uri: str) -> Tuple[str, bytes]: + """CallRaw executes a Subsonic API request and returns the raw binary response. +Optimized for binary endpoints like getCoverArt and stream that return +non-JSON data. The response is returned as raw bytes without JSON encoding overhead. + + Args: + uri: str parameter. + + Returns: + Tuple of (content_type, data) with the raw binary response. + + Raises: + HostFunctionError: If the host function returns an error. + """ + request = { + "uri": uri, + } + request_bytes = json.dumps(request).encode("utf-8") + request_mem = extism.memory.alloc(request_bytes) + response_offset = _subsonicapi_callraw(request_mem.offset) + response_mem = extism.memory.find(response_offset) + response_bytes = response_mem.bytes() + + if len(response_bytes) == 0: + raise HostFunctionError("empty response from host") + if response_bytes[0] == 0x01: + raise HostFunctionError(response_bytes[1:].decode("utf-8")) + if response_bytes[0] != 0x00: + raise HostFunctionError("unknown response status") + if len(response_bytes) < 5: + raise HostFunctionError("malformed raw response: incomplete header") + ct_len = struct.unpack(">I", response_bytes[1:5])[0] + if len(response_bytes) < 5 + ct_len: + raise HostFunctionError("malformed raw response: content-type overflow") + content_type = response_bytes[5:5 + ct_len].decode("utf-8") + data = response_bytes[5 + ct_len:] + return content_type, data diff --git a/plugins/pdk/rust/nd-pdk-host/src/nd_host_subsonicapi.rs b/plugins/pdk/rust/nd-pdk-host/src/nd_host_subsonicapi.rs index e32b6d72f..2c9e6545f 100644 --- a/plugins/pdk/rust/nd-pdk-host/src/nd_host_subsonicapi.rs +++ b/plugins/pdk/rust/nd-pdk-host/src/nd_host_subsonicapi.rs @@ -21,11 +21,22 @@ struct SubsonicAPICallResponse { error: Option, } +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +struct SubsonicAPICallRawRequest { + uri: String, +} + #[host_fn] extern "ExtismHost" { fn subsonicapi_call(input: Json) -> Json; } +#[link(wasm_import_module = "extism:host/user")] +extern "C" { + fn subsonicapi_callraw(offset: u64) -> u64; +} + /// Call executes a Subsonic API request and returns the JSON response. /// /// The uri parameter should be the Subsonic API path without the server prefix, @@ -52,3 +63,56 @@ pub fn call(uri: &str) -> Result { Ok(response.0.response_json) } + +/// CallRaw executes a Subsonic API request and returns the raw binary response. +/// Optimized for binary endpoints like getCoverArt and stream that return +/// non-JSON data. The response is returned as raw bytes without JSON encoding overhead. +/// +/// # Arguments +/// * `uri` - String parameter. +/// +/// # Returns +/// A tuple of (content_type, data) with the raw binary response. +/// +/// # Errors +/// Returns an error if the host function call fails. +pub fn call_raw(uri: &str) -> Result<(String, Vec), Error> { + let req = SubsonicAPICallRawRequest { + uri: uri.to_owned(), + }; + let input_bytes = serde_json::to_vec(&req).map_err(|e| Error::msg(e.to_string()))?; + let input_mem = Memory::from_bytes(&input_bytes).map_err(|e| Error::msg(e.to_string()))?; + + let response_offset = unsafe { subsonicapi_callraw(input_mem.offset()) }; + + let response_mem = Memory::find(response_offset) + .ok_or_else(|| Error::msg("empty response from host"))?; + let response_bytes = response_mem.to_vec(); + + if response_bytes.is_empty() { + return Err(Error::msg("empty response from host")); + } + if response_bytes[0] == 0x01 { + let msg = String::from_utf8_lossy(&response_bytes[1..]).to_string(); + return Err(Error::msg(msg)); + } + if response_bytes[0] != 0x00 { + return Err(Error::msg("unknown response status")); + } + if response_bytes.len() < 5 { + return Err(Error::msg("malformed raw response: incomplete header")); + } + let ct_len = u32::from_be_bytes([ + response_bytes[1], + response_bytes[2], + response_bytes[3], + response_bytes[4], + ]) as usize; + if ct_len > response_bytes.len() - 5 { + return Err(Error::msg("malformed raw response: content-type overflow")); + } + let ct_end = 5 + ct_len; + let content_type = String::from_utf8_lossy(&response_bytes[5..ct_end]).to_string(); + let data = response_bytes[ct_end..].to_vec(); + Ok((content_type, data)) +} diff --git a/plugins/testdata/test-subsonicapi-plugin/main.go b/plugins/testdata/test-subsonicapi-plugin/main.go index 03b912801..573036b95 100644 --- a/plugins/testdata/test-subsonicapi-plugin/main.go +++ b/plugins/testdata/test-subsonicapi-plugin/main.go @@ -3,6 +3,8 @@ package main import ( + "fmt" + "github.com/navidrome/navidrome/plugins/pdk/go/host" "github.com/navidrome/navidrome/plugins/pdk/go/pdk" ) @@ -28,4 +30,28 @@ func callSubsonicAPIExport() int32 { return 0 } +// call_subsonic_api_raw is the exported function that tests the SubsonicAPI CallRaw host function. +// Input: URI string (e.g., "/getCoverArt?u=testuser&id=al-1") +// Output: JSON with contentType, size, and first bytes of the raw response +// +//go:wasmexport call_subsonic_api_raw +func callSubsonicAPIRawExport() int32 { + uri := pdk.InputString() + + contentType, data, err := host.SubsonicAPICallRaw(uri) + if err != nil { + pdk.SetErrorString("failed to call SubsonicAPI raw: " + err.Error()) + return 1 + } + + // Return metadata about the raw response as JSON + firstByte := 0 + if len(data) > 0 { + firstByte = int(data[0]) + } + result := fmt.Sprintf(`{"contentType":%q,"size":%d,"firstByte":%d}`, contentType, len(data), firstByte) + pdk.OutputString(result) + return 0 +} + func main() {} From 4f3845bbe3ad083864c9b68b3aedc88c1bb0ed52 Mon Sep 17 00:00:00 2001 From: Boris Rorsvort Date: Wed, 4 Feb 2026 23:24:30 +0100 Subject: [PATCH 35/82] fix(ui): Nautiline theme font path (#4983) * fix: Nautiline theme font path * refactor font path --- ui/src/themes/nautiline.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/src/themes/nautiline.js b/ui/src/themes/nautiline.js index 6a05bf381..65ded5fc5 100644 --- a/ui/src/themes/nautiline.js +++ b/ui/src/themes/nautiline.js @@ -8,6 +8,7 @@ // ============================================ const ACCENT_COLOR = '#009688' // Material teal +const UNBOUNDED_FONT_PATH = 'fonts/Unbounded-Variable.woff2' // ============================================ // DESIGN TOKENS @@ -69,7 +70,7 @@ const tokens = { font-style: normal; font-weight: 300 800; font-display: swap; - src: url('/fonts/Unbounded-Variable.woff2') format('woff2'); + src: url('${UNBOUNDED_FONT_PATH}') format('woff2'); } `, }, @@ -275,7 +276,7 @@ const NautilineTheme = { fontStyle: 'normal', fontWeight: '300 800', fontDisplay: 'swap', - src: "url('/fonts/Unbounded-Variable.woff2') format('woff2')", + src: `url('${UNBOUNDED_FONT_PATH}') format('woff2')`, }, body: { backgroundColor: colors.background.primary, @@ -794,7 +795,7 @@ const NautilineTheme = { font-style: normal; font-weight: 300 800; font-display: swap; - src: url('/fonts/Unbounded-Variable.woff2') format('woff2'); + src: url('${UNBOUNDED_FONT_PATH}') format('woff2'); } .react-jinke-music-player-main { From 2731e25fd2fe3bfd9d7c151edd979c3be05fce0c Mon Sep 17 00:00:00 2001 From: Kendall Garner <17521368+kgarner7@users.noreply.github.com> Date: Wed, 4 Feb 2026 22:34:26 +0000 Subject: [PATCH 36/82] fix(ui): use div for fragment, check lastfm url for artist page (#4980) * fix(ui): use div for fragment, check lastfm url for artist page * use span instead of div for better compat * fix: implement isLastFmURL utility and add tests for URL validation --------- Co-authored-by: Deluan --- ui/src/artist/ArtistExternalLink.jsx | 6 +++--- ui/src/common/SafeHTML.jsx | 4 ++-- ui/src/utils/urls.js | 13 +++++++++++++ ui/src/utils/urls.test.js | 25 +++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 ui/src/utils/urls.test.js diff --git a/ui/src/artist/ArtistExternalLink.jsx b/ui/src/artist/ArtistExternalLink.jsx index 1b6d74560..a83972f17 100644 --- a/ui/src/artist/ArtistExternalLink.jsx +++ b/ui/src/artist/ArtistExternalLink.jsx @@ -4,7 +4,7 @@ import { IconButton, Tooltip, Link } from '@material-ui/core' import { ImLastfm2 } from 'react-icons/im' import MusicBrainz from '../icons/MusicBrainz' -import { intersperse } from '../utils' +import { intersperse, isLastFmURL } from '../utils' import config from '../config' import { makeStyles } from '@material-ui/core/styles' @@ -38,13 +38,13 @@ const ArtistExternalLinks = ({ artistInfo, record }) => { } if (config.lastFMEnabled) { - if (lastFMlink) { + if (lastFMlink && isLastFmURL(lastFMlink[2])) { addLink( lastFMlink[2], 'message.openIn.lastfm', , ) - } else if (artistInfo?.lastFmUrl) { + } else if (isLastFmURL(artistInfo?.lastFmUrl)) { addLink( artistInfo?.lastFmUrl, 'message.openIn.lastfm', diff --git a/ui/src/common/SafeHTML.jsx b/ui/src/common/SafeHTML.jsx index 643b538b8..980883568 100644 --- a/ui/src/common/SafeHTML.jsx +++ b/ui/src/common/SafeHTML.jsx @@ -1,5 +1,5 @@ import DOMPurify from 'dompurify' -import { Fragment, useMemo } from 'react' +import { useMemo } from 'react' export const SafeHTML = ({ children }) => { const purified = useMemo(() => { @@ -23,5 +23,5 @@ export const SafeHTML = ({ children }) => { return purify.sanitize(children, { ADD_ATTR: ['referrer-policy'] }) }, [children]) - return + return } diff --git a/ui/src/utils/urls.js b/ui/src/utils/urls.js index 5788096df..80207fe83 100644 --- a/ui/src/utils/urls.js +++ b/ui/src/utils/urls.js @@ -44,3 +44,16 @@ export const shareCoverUrl = (id, square) => { } export const docsUrl = (path) => `https://www.navidrome.org${path}` + +export const isLastFmURL = (url) => { + try { + const parsed = new URL(url) + return ( + (parsed.protocol === 'http:' || parsed.protocol === 'https:') && + (parsed.hostname === 'last.fm' || parsed.hostname.endsWith('.last.fm')) && + parsed.pathname.startsWith('/music/') + ) + } catch (e) { + return false + } +} diff --git a/ui/src/utils/urls.test.js b/ui/src/utils/urls.test.js new file mode 100644 index 000000000..26bdd1283 --- /dev/null +++ b/ui/src/utils/urls.test.js @@ -0,0 +1,25 @@ +import { isLastFmURL } from './urls' + +describe('isLastFmURL', () => { + it('returns true for valid Last.fm music URLs', () => { + expect(isLastFmURL('https://last.fm/music/The+Beatles')).toBe(true) + expect(isLastFmURL('http://last.fm/music/Radiohead')).toBe(true) + expect(isLastFmURL('https://www.last.fm/music/Daft+Punk')).toBe(true) + }) + + it('returns false for non-http(s) protocols (XSS prevention)', () => { + expect(isLastFmURL('javascript:alert(1)//last.fm/music/')).toBe(false) + expect(isLastFmURL('data:text/html,