feat: add support for public/private playlists in NSP import

Signed-off-by: Deluan <deluan@navidrome.org>

conf/configuration.go

@@ -153,6 +153,7 @@ type subsonicOptions struct {
 	ArtistParticipations  bool
 	DefaultReportRealPath bool
 	LegacyClients         string
+	MinimalClients        string
 }
 
 type TagConf struct {

core/playlists.go

@@ -168,6 +168,11 @@ func (s *playlists) parseNSP(_ context.Context, pls *model.Playlist, reader io.R
 	if nsp.Comment != "" {
 		pls.Comment = nsp.Comment
 	}
+	if nsp.Public != nil {
+		pls.Public = *nsp.Public
+	} else {
+		pls.Public = conf.Server.DefaultPlaylistPublicVisibility
+	}
 	return nil
 }
 
@@ -409,7 +414,10 @@ func (s *playlists) updatePlaylist(ctx context.Context, newPls *model.Playlist)
 	} else {
 		log.Info(ctx, "Adding synced playlist", "playlist", newPls.Name, "path", newPls.Path, "owner", owner.UserName)
 		newPls.OwnerID = owner.ID
-		newPls.Public = conf.Server.DefaultPlaylistPublicVisibility
+		// For NSP files, Public may already be set from the file; for M3U, use server default
+		if !newPls.IsSmartPlaylist() {
+			newPls.Public = conf.Server.DefaultPlaylistPublicVisibility
+		}
 	}
 	return s.ds.Playlist(ctx).Put(newPls)
 }
@@ -473,6 +481,7 @@ type nspFile struct {
 	criteria.Criteria
 	Name    string `json:"name"`
 	Comment string `json:"comment"`
+	Public  *bool  `json:"public"`
 }
 
 func (i *nspFile) UnmarshalJSON(data []byte) error {
@@ -483,5 +492,8 @@ func (i *nspFile) UnmarshalJSON(data []byte) error {
 	}
 	i.Name, _ = m["name"].(string)
 	i.Comment, _ = m["comment"].(string)
+	if public, ok := m["public"].(bool); ok {
+		i.Public = &public
+	}
 	return json.Unmarshal(data, &i.Criteria)
 }

core/playlists_test.go

@@ -112,6 +112,27 @@ var _ = Describe("Playlists", func() {
 				_, err := ps.ImportFile(ctx, folder, "invalid_json.nsp")
 				Expect(err.Error()).To(ContainSubstring("line 19, column 1: invalid character '\\n'"))
 			})
+			It("parses NSP with public: true and creates public playlist", func() {
+				pls, err := ps.ImportFile(ctx, folder, "public_playlist.nsp")
+				Expect(err).ToNot(HaveOccurred())
+				Expect(pls.Name).To(Equal("Public Playlist"))
+				Expect(pls.Public).To(BeTrue())
+			})
+			It("parses NSP with public: false and creates private playlist", func() {
+				pls, err := ps.ImportFile(ctx, folder, "private_playlist.nsp")
+				Expect(err).ToNot(HaveOccurred())
+				Expect(pls.Name).To(Equal("Private Playlist"))
+				Expect(pls.Public).To(BeFalse())
+			})
+			It("uses server default when public field is absent", func() {
+				DeferCleanup(configtest.SetupConfig())
+				conf.Server.DefaultPlaylistPublicVisibility = true
+
+				pls, err := ps.ImportFile(ctx, folder, "recently_played.nsp")
+				Expect(err).ToNot(HaveOccurred())
+				Expect(pls.Name).To(Equal("Recently Played"))
+				Expect(pls.Public).To(BeTrue()) // Should be true since server default is true
+			})
 		})
 
 		Describe("Cross-library relative paths", func() {

plugins/examples/discord-rich-presence-rs/README.md

@@ -1,6 +1,6 @@
 # Discord Rich Presence Plugin (Rust)
 
-A Navidrome plugin that displays your currently playing track on Discord using Rich Presence. This is the Rust implementation demonstrating how to use the generated `nd-host` library.
+A Navidrome plugin that displays your currently playing track on Discord using Rich Presence. This is the Rust implementation demonstrating how to use the `nd-pdk` library.
 
 ## ⚠️ Warning
 
@@ -21,20 +21,20 @@ This plugin is for **demonstration purposes only**. It requires storing your Dis
 
 ## Capabilities
 
-This plugin implements three capabilities to demonstrate the nd-host library:
+This plugin implements multiple capabilities to demonstrate the nd-pdk library:
 
 - **Scrobbler**: Receives now-playing events from Navidrome
 - **SchedulerCallback**: Handles heartbeat and activity clearing timers
-- **WebSocketCallback**: Communicates with Discord gateway
+- **WebSocketCallback**: Communicates with Discord gateway (text, binary, error, and close handlers)
 
 ## Configuration
 
 Configure in the Navidrome UI (Settings → Plugins → discord-rich-presence):
 
-| Key           | Description                                | Example                        |
-|---------------|-------------------------------------------|--------------------------------|
-| `clientid`    | Your Discord application ID               | `123456789012345678`           |
-| `user.<name>` | Discord token for the specified user      | `user.alice` = `token123`      |
+| Key           | Description                          | Example                   |
+|---------------|--------------------------------------|---------------------------|
+| `clientid`    | Your Discord application ID          | `123456789012345678`      |
+| `user.<name>` | Discord token for the specified user | `user.alice` = `token123` |
 
 Each user is configured as a separate key with the `user.` prefix.
 
@@ -69,27 +69,30 @@ make discord-rich-presence-rs.ndp
 3. Enable and configure the plugin in the Navidrome UI (Settings → Plugins)
 4. Restart Navidrome if needed
 
-## Using nd-host Library
+## Using nd-pdk Library
 
-This plugin demonstrates how to use the generated Rust host function wrappers:
+This plugin demonstrates how to use the Rust plugin development kit:
 
 ```rust
-use nd_host::{artwork, cache, scheduler, websocket};
+use nd_pdk::host::{artwork, cache, scheduler, websocket};
+use std::collections::HashMap;
 
 // Get artwork URL
-let (url, _) = artwork::artwork_get_track_url(track_id, 300)?;
+let url = artwork::get_track_url(track_id, 300)?;
 
 // Cache operations
-cache::cache_set_string("key", "value", 3600)?;
-let (value, exists) = cache::cache_get_string("key")?;
+cache::set_string("key", "value", 3600)?;
+if let Some(value) = cache::get_string("key")? {
+    // Use the cached value
+}
 
 // Schedule tasks
-scheduler::scheduler_schedule_one_time(60, "payload", "task-id")?;
-scheduler::scheduler_schedule_recurring("@every 30s", "heartbeat", "heartbeat-task")?;
+scheduler::schedule_one_time(60, "payload", "task-id")?;
+scheduler::schedule_recurring("@every 30s", "heartbeat", "heartbeat-task")?;
 
 // WebSocket operations
-let conn_id = websocket::websocket_connect("wss://example.com/socket")?;
-websocket::websocket_send_text(&conn_id, "Hello")?;
+let conn_id = websocket::connect("wss://example.com/socket", HashMap::new(), "my-conn")?;
+websocket::send_text(&conn_id, "Hello")?;
 ```
 
 ## License

plugins/plugins_suite_test.go

@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"testing"
+	"time"
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/conf/configtest"
@@ -42,10 +43,11 @@ func TestPlugins(t *testing.T) {
 
 func buildTestPlugins(t *testing.T, path string) {
 	t.Helper()
+	start := time.Now()
 	t.Logf("[BeforeSuite] Current working directory: %s", path)
 	cmd := exec.Command("make", "-C", path)
 	out, err := cmd.CombinedOutput()
-	t.Logf("[BeforeSuite] Make output: %s", string(out))
+	t.Logf("[BeforeSuite] Make output: %s elapsed: %s", string(out), time.Since(start))
 	if err != nil {
 		t.Fatalf("Failed to build test plugins: %v", err)
 	}

server/public/handle_images.go

@@ -35,7 +35,7 @@ func (pub *Router) handleImages(w http.ResponseWriter, r *http.Request) {
 	artId, err := decodeArtworkID(id)
 	if err != nil {
 		log.Error(r, "Error decoding artwork id", "id", id, err)
-		http.Error(w, err.Error(), http.StatusBadRequest)
+		http.Error(w, "invalid request", http.StatusBadRequest)
 		return
 	}
 	size := p.IntOr("size", 0)

server/subsonic/helpers.go

@@ -166,11 +166,30 @@ func getTranscoding(ctx context.Context) (format string, bitRate int) {
 	return
 }
 
+func isClientInList(clientList, client string) bool {
+	if clientList == "" || client == "" {
+		return false
+	}
+	clients := strings.Split(clientList, ",")
+	for _, c := range clients {
+		if strings.TrimSpace(c) == client {
+			return true
+		}
+	}
+	return false
+}
+
 func childFromMediaFile(ctx context.Context, mf model.MediaFile) responses.Child {
 	child := responses.Child{}
 	child.Id = mf.ID
 	child.Title = mf.FullTitle()
 	child.IsDir = false
+
+	player, ok := request.PlayerFrom(ctx)
+	if ok && isClientInList(conf.Server.Subsonic.MinimalClients, player.Client) {
+		return child
+	}
+
 	child.Parent = mf.AlbumID
 	child.Album = mf.Album
 	child.Year = int32(mf.Year)
@@ -183,7 +202,7 @@ func childFromMediaFile(ctx context.Context, mf model.MediaFile) responses.Child
 	child.BitRate = int32(mf.BitRate)
 	child.CoverArt = mf.CoverArtID().String()
 	child.ContentType = mf.ContentType()
-	player, ok := request.PlayerFrom(ctx)
+
 	if ok && player.ReportRealPath {
 		child.Path = mf.AbsolutePath()
 	} else {
@@ -211,8 +230,8 @@ func childFromMediaFile(ctx context.Context, mf model.MediaFile) responses.Child
 }
 
 func osChildFromMediaFile(ctx context.Context, mf model.MediaFile) *responses.OpenSubsonicChild {
-	player, _ := request.PlayerFrom(ctx)
-	if strings.Contains(conf.Server.Subsonic.LegacyClients, player.Client) {
+	player, ok := request.PlayerFrom(ctx)
+	if ok && isClientInList(conf.Server.Subsonic.MinimalClients, player.Client) {
 		return nil
 	}
 	child := responses.OpenSubsonicChild{}

server/subsonic/helpers_test.go

@@ -169,6 +169,190 @@ var _ = Describe("helpers", func() {
 		})
 	})
 
+	DescribeTable("isClientInList",
+		func(list, client string, expected bool) {
+			Expect(isClientInList(list, client)).To(Equal(expected))
+		},
+		Entry("returns false when clientList is empty", "", "some-client", false),
+		Entry("returns false when client is empty", "client1,client2", "", false),
+		Entry("returns false when both are empty", "", "", false),
+		Entry("returns true when client matches single entry", "my-client", "my-client", true),
+		Entry("returns true when client matches first in list", "client1,client2,client3", "client1", true),
+		Entry("returns true when client matches middle in list", "client1,client2,client3", "client2", true),
+		Entry("returns true when client matches last in list", "client1,client2,client3", "client3", true),
+		Entry("returns false when client does not match", "client1,client2", "client3", false),
+		Entry("trims whitespace from client list entries", "client1, client2 , client3", "client2", true),
+		Entry("does not trim the client parameter", "client1,client2", " client1", false),
+	)
+
+	Describe("childFromMediaFile", func() {
+		var mf model.MediaFile
+		var ctx context.Context
+
+		BeforeEach(func() {
+			mf = model.MediaFile{
+				ID:          "mf-1",
+				Title:       "Test Song",
+				Album:       "Test Album",
+				AlbumID:     "album-1",
+				Artist:      "Test Artist",
+				ArtistID:    "artist-1",
+				Year:        2023,
+				Genre:       "Rock",
+				TrackNumber: 5,
+				Duration:    180.5,
+				Size:        5000000,
+				Suffix:      "mp3",
+				BitRate:     320,
+			}
+			ctx = context.Background()
+		})
+
+		Context("with minimal client", func() {
+			BeforeEach(func() {
+				conf.Server.Subsonic.MinimalClients = "minimal-client"
+				player := model.Player{Client: "minimal-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("returns only basic fields", func() {
+				child := childFromMediaFile(ctx, mf)
+				Expect(child.Id).To(Equal("mf-1"))
+				Expect(child.Title).To(Equal("Test Song"))
+				Expect(child.IsDir).To(BeFalse())
+
+				// These should not be set
+				Expect(child.Album).To(BeEmpty())
+				Expect(child.Artist).To(BeEmpty())
+				Expect(child.Parent).To(BeEmpty())
+				Expect(child.Year).To(BeZero())
+				Expect(child.Genre).To(BeEmpty())
+				Expect(child.Track).To(BeZero())
+				Expect(child.Duration).To(BeZero())
+				Expect(child.Size).To(BeZero())
+				Expect(child.Suffix).To(BeEmpty())
+				Expect(child.BitRate).To(BeZero())
+				Expect(child.CoverArt).To(BeEmpty())
+				Expect(child.ContentType).To(BeEmpty())
+				Expect(child.Path).To(BeEmpty())
+			})
+
+			It("does not include OpenSubsonic extension", func() {
+				child := childFromMediaFile(ctx, mf)
+				Expect(child.OpenSubsonicChild).To(BeNil())
+			})
+		})
+
+		Context("with non-minimal client", func() {
+			BeforeEach(func() {
+				conf.Server.Subsonic.MinimalClients = "minimal-client"
+				player := model.Player{Client: "regular-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("returns all fields", func() {
+				child := childFromMediaFile(ctx, mf)
+				Expect(child.Id).To(Equal("mf-1"))
+				Expect(child.Title).To(Equal("Test Song"))
+				Expect(child.IsDir).To(BeFalse())
+				Expect(child.Album).To(Equal("Test Album"))
+				Expect(child.Artist).To(Equal("Test Artist"))
+				Expect(child.Parent).To(Equal("album-1"))
+				Expect(child.Year).To(Equal(int32(2023)))
+				Expect(child.Genre).To(Equal("Rock"))
+				Expect(child.Track).To(Equal(int32(5)))
+				Expect(child.Duration).To(Equal(int32(180)))
+				Expect(child.Size).To(Equal(int64(5000000)))
+				Expect(child.Suffix).To(Equal("mp3"))
+				Expect(child.BitRate).To(Equal(int32(320)))
+			})
+		})
+
+		Context("when minimal clients list is empty", func() {
+			BeforeEach(func() {
+				conf.Server.Subsonic.MinimalClients = ""
+				player := model.Player{Client: "any-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("returns all fields", func() {
+				child := childFromMediaFile(ctx, mf)
+				Expect(child.Album).To(Equal("Test Album"))
+				Expect(child.Artist).To(Equal("Test Artist"))
+			})
+		})
+
+		Context("when no player in context", func() {
+			It("returns all fields", func() {
+				child := childFromMediaFile(ctx, mf)
+				Expect(child.Album).To(Equal("Test Album"))
+				Expect(child.Artist).To(Equal("Test Artist"))
+			})
+		})
+	})
+
+	Describe("osChildFromMediaFile", func() {
+		var mf model.MediaFile
+		var ctx context.Context
+
+		BeforeEach(func() {
+			mf = model.MediaFile{
+				ID:      "mf-1",
+				Title:   "Test Song",
+				Artist:  "Test Artist",
+				Comment: "Test Comment",
+			}
+			ctx = context.Background()
+		})
+
+		Context("with minimal client", func() {
+			BeforeEach(func() {
+				conf.Server.Subsonic.MinimalClients = "minimal-client"
+				player := model.Player{Client: "minimal-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("returns nil", func() {
+				osChild := osChildFromMediaFile(ctx, mf)
+				Expect(osChild).To(BeNil())
+			})
+		})
+
+		Context("with non-minimal client", func() {
+			BeforeEach(func() {
+				conf.Server.Subsonic.MinimalClients = "minimal-client"
+				player := model.Player{Client: "regular-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("returns OpenSubsonic child fields", func() {
+				osChild := osChildFromMediaFile(ctx, mf)
+				Expect(osChild).ToNot(BeNil())
+				Expect(osChild.Comment).To(Equal("Test Comment"))
+			})
+		})
+
+		Context("when minimal clients list is empty", func() {
+			BeforeEach(func() {
+				conf.Server.Subsonic.MinimalClients = ""
+				player := model.Player{Client: "any-client"}
+				ctx = request.WithPlayer(ctx, player)
+			})
+
+			It("returns OpenSubsonic child fields", func() {
+				osChild := osChildFromMediaFile(ctx, mf)
+				Expect(osChild).ToNot(BeNil())
+			})
+		})
+
+		Context("when no player in context", func() {
+			It("returns OpenSubsonic child fields", func() {
+				osChild := osChildFromMediaFile(ctx, mf)
+				Expect(osChild).ToNot(BeNil())
+			})
+		})
+	})
+
 	Describe("selectedMusicFolderIds", func() {
 		var user model.User
 		var ctx context.Context

server/subsonic/playlists.go

@@ -7,8 +7,10 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
+	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/server/subsonic/responses"
 	"github.com/navidrome/navidrome/utils/req"
 	"github.com/navidrome/navidrome/utils/slice"
@@ -23,7 +25,7 @@ func (api *Router) GetPlaylists(r *http.Request) (*responses.Subsonic, error) {
 	}
 	response := newResponse()
 	response.Playlists = &responses.Playlists{
-		Playlist: slice.Map(allPls, api.buildPlaylist),
+		Playlist: slice.MapWithArg(allPls, ctx, api.buildPlaylist),
 	}
 	return response, nil
 }
@@ -51,7 +53,7 @@ func (api *Router) getPlaylist(ctx context.Context, id string) (*responses.Subso
 
 	response := newResponse()
 	response.Playlist = &responses.PlaylistWithSongs{
-		Playlist: api.buildPlaylist(*pls),
+		Playlist: api.buildPlaylist(ctx, *pls),
 	}
 	response.Playlist.Entry = slice.MapWithArg(pls.MediaFiles(), ctx, childFromMediaFile)
 	return response, nil
@@ -152,21 +154,28 @@ func (api *Router) UpdatePlaylist(r *http.Request) (*responses.Subsonic, error)
 	return newResponse(), nil
 }
 
-func (api *Router) buildPlaylist(p model.Playlist) responses.Playlist {
+func (api *Router) buildPlaylist(ctx context.Context, p model.Playlist) responses.Playlist {
 	pls := responses.Playlist{}
 	pls.Id = p.ID
 	pls.Name = p.Name
-	pls.Comment = p.Comment
 	pls.SongCount = int32(p.SongCount)
-	pls.Owner = p.OwnerName
 	pls.Duration = int32(p.Duration)
-	pls.Public = p.Public
 	pls.Created = p.CreatedAt
-	pls.CoverArt = p.CoverArtID().String()
 	if p.IsSmartPlaylist() {
 		pls.Changed = time.Now()
 	} else {
 		pls.Changed = p.UpdatedAt
 	}
+
+	player, ok := request.PlayerFrom(ctx)
+	if ok && isClientInList(conf.Server.Subsonic.MinimalClients, player.Client) {
+		return pls
+	}
+
+	pls.Comment = p.Comment
+	pls.Owner = p.OwnerName
+	pls.Public = p.Public
+	pls.CoverArt = p.CoverArtID().String()
+
 	return pls
 }

server/subsonic/playlists_test.go

@@ -2,9 +2,12 @@ package subsonic
 
 import (
 	"context"
+	"time"
 
+	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/model"
+	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -12,6 +15,108 @@ import (
 
 var _ core.Playlists = (*fakePlaylists)(nil)
 
+var _ = Describe("buildPlaylist", func() {
+	var router *Router
+	var ds model.DataStore
+	var ctx context.Context
+	var playlist model.Playlist
+
+	BeforeEach(func() {
+		ds = &tests.MockDataStore{}
+		router = New(ds, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
+		ctx = context.Background()
+
+		createdAt := time.Date(2023, 1, 15, 10, 30, 0, 0, time.UTC)
+		updatedAt := time.Date(2023, 2, 20, 14, 45, 0, 0, time.UTC)
+
+		playlist = model.Playlist{
+			ID:        "pls-1",
+			Name:      "My Playlist",
+			Comment:   "Test comment",
+			OwnerName: "admin",
+			Public:    true,
+			SongCount: 10,
+			Duration:  600,
+			CreatedAt: createdAt,
+			UpdatedAt: updatedAt,
+		}
+	})
+
+	Context("with minimal client", func() {
+		BeforeEach(func() {
+			conf.Server.Subsonic.MinimalClients = "minimal-client"
+			player := model.Player{Client: "minimal-client"}
+			ctx = request.WithPlayer(ctx, player)
+		})
+
+		It("returns only basic fields", func() {
+			result := router.buildPlaylist(ctx, playlist)
+
+			Expect(result.Id).To(Equal("pls-1"))
+			Expect(result.Name).To(Equal("My Playlist"))
+			Expect(result.SongCount).To(Equal(int32(10)))
+			Expect(result.Duration).To(Equal(int32(600)))
+			Expect(result.Created).To(Equal(playlist.CreatedAt))
+			Expect(result.Changed).To(Equal(playlist.UpdatedAt))
+
+			// These should not be set
+			Expect(result.Comment).To(BeEmpty())
+			Expect(result.Owner).To(BeEmpty())
+			Expect(result.Public).To(BeFalse())
+			Expect(result.CoverArt).To(BeEmpty())
+		})
+	})
+
+	Context("with non-minimal client", func() {
+		BeforeEach(func() {
+			conf.Server.Subsonic.MinimalClients = "minimal-client"
+			player := model.Player{Client: "regular-client"}
+			ctx = request.WithPlayer(ctx, player)
+		})
+
+		It("returns all fields", func() {
+			result := router.buildPlaylist(ctx, playlist)
+
+			Expect(result.Id).To(Equal("pls-1"))
+			Expect(result.Name).To(Equal("My Playlist"))
+			Expect(result.SongCount).To(Equal(int32(10)))
+			Expect(result.Duration).To(Equal(int32(600)))
+			Expect(result.Created).To(Equal(playlist.CreatedAt))
+			Expect(result.Changed).To(Equal(playlist.UpdatedAt))
+			Expect(result.Comment).To(Equal("Test comment"))
+			Expect(result.Owner).To(Equal("admin"))
+			Expect(result.Public).To(BeTrue())
+		})
+	})
+
+	Context("when minimal clients list is empty", func() {
+		BeforeEach(func() {
+			conf.Server.Subsonic.MinimalClients = ""
+			player := model.Player{Client: "any-client"}
+			ctx = request.WithPlayer(ctx, player)
+		})
+
+		It("returns all fields", func() {
+			result := router.buildPlaylist(ctx, playlist)
+
+			Expect(result.Comment).To(Equal("Test comment"))
+			Expect(result.Owner).To(Equal("admin"))
+			Expect(result.Public).To(BeTrue())
+		})
+	})
+
+	Context("when no player in context", func() {
+		It("returns all fields", func() {
+			result := router.buildPlaylist(ctx, playlist)
+
+			Expect(result.Comment).To(Equal("Test comment"))
+			Expect(result.Owner).To(Equal("admin"))
+			Expect(result.Public).To(BeTrue())
+		})
+	})
+
+})
+
 var _ = Describe("UpdatePlaylist", func() {
 	var router *Router
 	var ds model.DataStore

server/subsonic/responses/.snapshots/Responses AlbumList with OS data should match .JSON

@@ -9,7 +9,6 @@
       {
         "id": "1",
         "isDir": false,
-        "isVideo": false,
         "bpm": 0,
         "comment": "",
         "sortName": "sort name",

server/subsonic/responses/.snapshots/Responses AlbumList with OS data should match .XML

@@ -1,6 +1,6 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <albumList>
-    <album id="1" isDir="false" isVideo="false" sortName="sort name" mediaType="album" musicBrainzId="00000000-0000-0000-0000-000000000000" displayArtist="Display artist" displayAlbumArtist="Display album artist" explicitStatus="explicit">
+    <album id="1" isDir="false" sortName="sort name" mediaType="album" musicBrainzId="00000000-0000-0000-0000-000000000000" displayArtist="Display artist" displayAlbumArtist="Display album artist" explicitStatus="explicit">
       <genres name="Genre 1"></genres>
       <genres name="Genre 2"></genres>
       <moods>mood1</moods>

server/subsonic/responses/.snapshots/Responses AlbumList with data should match .JSON

@@ -9,8 +9,7 @@
       {
         "id": "1",
         "isDir": false,
-        "title": "title",
-        "isVideo": false
+        "title": "title"
       }
     ]
   }

server/subsonic/responses/.snapshots/Responses AlbumList with data should match .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <albumList>
-    <album id="1" isDir="false" title="title" isVideo="false"></album>
+    <album id="1" isDir="false" title="title"></album>
   </albumList>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 with data should match .JSON

@@ -93,7 +93,6 @@
         "transcodedSuffix": "mp3",
         "duration": 146,
         "bitRate": 320,
-        "isVideo": false,
         "bpm": 127,
         "comment": "a comment",
         "sortName": "sorted song",
@@ -185,7 +184,6 @@
         "transcodedSuffix": "mp3",
         "duration": 146,
         "bitRate": 320,
-        "isVideo": false,
         "bpm": 0,
         "comment": "",
         "sortName": "",

server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 with data should match .XML

@@ -15,7 +15,7 @@
     <moods>sad</moods>
     <artists id="1" name="artist1"></artists>
     <artists id="2" name="artist2"></artists>
-    <song id="1" isDir="true" title="title" album="album" artist="artist" track="1" year="1985" genre="Rock" coverArt="1" size="8421341" contentType="audio/flac" suffix="flac" starred="2016-03-02T20:30:00Z" transcodedContentType="audio/mpeg" transcodedSuffix="mp3" duration="146" bitRate="320" isVideo="false" bpm="127" comment="a comment" sortName="sorted song" mediaType="song" musicBrainzId="4321" channelCount="2" samplingRate="44100" bitDepth="16" displayArtist="artist1 &amp; artist2" displayAlbumArtist="album artist1 &amp; album artist2" displayComposer="composer 1 &amp; composer 2" explicitStatus="clean">
+    <song id="1" isDir="true" title="title" album="album" artist="artist" track="1" year="1985" genre="Rock" coverArt="1" size="8421341" contentType="audio/flac" suffix="flac" starred="2016-03-02T20:30:00Z" transcodedContentType="audio/mpeg" transcodedSuffix="mp3" duration="146" bitRate="320" bpm="127" comment="a comment" sortName="sorted song" mediaType="song" musicBrainzId="4321" channelCount="2" samplingRate="44100" bitDepth="16" displayArtist="artist1 &amp; artist2" displayAlbumArtist="album artist1 &amp; album artist2" displayComposer="composer 1 &amp; composer 2" explicitStatus="clean">
       <isrc>ISRC-1</isrc>
       <genres name="rock"></genres>
       <genres name="progressive"></genres>
@@ -33,7 +33,7 @@
         <artist id="2" name="artist2"></artist>
       </contributors>
     </song>
-    <song id="2" isDir="true" title="title" album="album" artist="artist" track="1" year="1985" genre="Rock" coverArt="1" size="8421341" contentType="audio/flac" suffix="flac" starred="2016-03-02T20:30:00Z" transcodedContentType="audio/mpeg" transcodedSuffix="mp3" duration="146" bitRate="320" isVideo="false">
+    <song id="2" isDir="true" title="title" album="album" artist="artist" track="1" year="1985" genre="Rock" coverArt="1" size="8421341" contentType="audio/flac" suffix="flac" starred="2016-03-02T20:30:00Z" transcodedContentType="audio/mpeg" transcodedSuffix="mp3" duration="146" bitRate="320">
       <replayGain trackGain="0" albumGain="0" trackPeak="0" albumPeak="0" baseGain="0" fallbackGain="0"></replayGain>
     </song>
   </album>

server/subsonic/responses/.snapshots/Responses Bookmarks with data should match .JSON

@@ -10,8 +10,7 @@
         "entry": {
           "id": "1",
           "isDir": false,
-          "title": "title",
-          "isVideo": false
+          "title": "title"
         },
         "position": 123,
         "username": "user2",

server/subsonic/responses/.snapshots/Responses Bookmarks with data should match .XML

@@ -1,7 +1,7 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <bookmarks>
     <bookmark position="123" username="user2" comment="a comment" created="0001-01-01T00:00:00Z" changed="0001-01-01T00:00:00Z">
-      <entry id="1" isDir="false" title="title" isVideo="false"></entry>
+      <entry id="1" isDir="false" title="title"></entry>
     </bookmark>
   </bookmarks>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses Child with data should match .JSON

@@ -24,7 +24,6 @@
         "transcodedSuffix": "mp3",
         "duration": 146,
         "bitRate": 320,
-        "isVideo": false,
         "bpm": 127,
         "comment": "a comment",
         "sortName": "sorted title",
@@ -116,7 +115,6 @@
       {
         "id": "",
         "isDir": false,
-        "isVideo": false,
         "bpm": 0,
         "comment": "",
         "sortName": "",

server/subsonic/responses/.snapshots/Responses Child with data should match .XML

@@ -1,6 +1,6 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <directory id="1" name="N">
-    <child id="1" isDir="true" title="title" album="album" artist="artist" track="1" year="1985" genre="Rock" coverArt="1" size="8421341" contentType="audio/flac" suffix="flac" starred="2016-03-02T20:30:00Z" transcodedContentType="audio/mpeg" transcodedSuffix="mp3" duration="146" bitRate="320" isVideo="false" bpm="127" comment="a comment" sortName="sorted title" mediaType="song" musicBrainzId="4321" channelCount="2" samplingRate="44100" bitDepth="16" displayArtist="artist 1 &amp; artist 2" displayAlbumArtist="album artist 1 &amp; album artist 2" displayComposer="composer 1 &amp; composer 2" explicitStatus="clean">
+    <child id="1" isDir="true" title="title" album="album" artist="artist" track="1" year="1985" genre="Rock" coverArt="1" size="8421341" contentType="audio/flac" suffix="flac" starred="2016-03-02T20:30:00Z" transcodedContentType="audio/mpeg" transcodedSuffix="mp3" duration="146" bitRate="320" bpm="127" comment="a comment" sortName="sorted title" mediaType="song" musicBrainzId="4321" channelCount="2" samplingRate="44100" bitDepth="16" displayArtist="artist 1 &amp; artist 2" displayAlbumArtist="album artist 1 &amp; album artist 2" displayComposer="composer 1 &amp; composer 2" explicitStatus="clean">
       <isrc>ISRC-1</isrc>
       <isrc>ISRC-2</isrc>
       <genres name="rock"></genres>
@@ -25,7 +25,7 @@
         <artist id="4" name="composer2"></artist>
       </contributors>
     </child>
-    <child id="" isDir="false" isVideo="false">
+    <child id="" isDir="false">
       <replayGain trackGain="0" albumGain="0" trackPeak="0" albumPeak="0" baseGain="0" fallbackGain="0"></replayGain>
     </child>
   </directory>

server/subsonic/responses/.snapshots/Responses Child without data should match .JSON

@@ -8,8 +8,7 @@
     "child": [
       {
         "id": "1",
-        "isDir": false,
-        "isVideo": false
+        "isDir": false
       }
     ],
     "id": "",

server/subsonic/responses/.snapshots/Responses Child without data should match .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <directory id="" name="">
-    <child id="1" isDir="false" isVideo="false"></child>
+    <child id="1" isDir="false"></child>
   </directory>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses Child without data should match OpenSubsonic .JSON

@@ -9,7 +9,6 @@
       {
         "id": "1",
         "isDir": false,
-        "isVideo": false,
         "bpm": 0,
         "comment": "",
         "sortName": "",

server/subsonic/responses/.snapshots/Responses Child without data should match OpenSubsonic .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <directory id="" name="">
-    <child id="1" isDir="false" isVideo="false"></child>
+    <child id="1" isDir="false"></child>
   </directory>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses Directory with data should match .JSON

@@ -9,8 +9,7 @@
       {
         "id": "1",
         "isDir": false,
-        "title": "title",
-        "isVideo": false
+        "title": "title"
       }
     ],
     "id": "1",

server/subsonic/responses/.snapshots/Responses Directory with data should match .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <directory id="1" name="N">
-    <child id="1" isDir="false" title="title" isVideo="false"></child>
+    <child id="1" isDir="false" title="title"></child>
   </directory>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses PlayQueue with data should match .JSON

@@ -9,8 +9,7 @@
       {
         "id": "1",
         "isDir": false,
-        "title": "title",
-        "isVideo": false
+        "title": "title"
       }
     ],
     "current": "111",

server/subsonic/responses/.snapshots/Responses PlayQueue with data should match .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <playQueue current="111" position="243" username="user1" changed="0001-01-01T00:00:00Z" changedBy="a_client">
-    <entry id="1" isDir="false" title="title" isVideo="false"></entry>
+    <entry id="1" isDir="false" title="title"></entry>
   </playQueue>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses PlayQueueByIndex with data should match .JSON

@@ -9,8 +9,7 @@
       {
         "id": "1",
         "isDir": false,
-        "title": "title",
-        "isVideo": false
+        "title": "title"
       }
     ],
     "currentIndex": 0,

server/subsonic/responses/.snapshots/Responses PlayQueueByIndex with data should match .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <playQueueByIndex currentIndex="0" position="243" username="user1" changed="0001-01-01T00:00:00Z" changedBy="a_client">
-    <entry id="1" isDir="false" title="title" isVideo="false"></entry>
+    <entry id="1" isDir="false" title="title"></entry>
   </playQueueByIndex>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses Playlists with data should match .JSON

@@ -23,7 +23,6 @@
         "name": "bbb",
         "songCount": 0,
         "duration": 0,
-        "public": false,
         "created": "0001-01-01T00:00:00Z",
         "changed": "0001-01-01T00:00:00Z"
       }

server/subsonic/responses/.snapshots/Responses Playlists with data should match .XML

@@ -1,6 +1,6 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <playlists>
     <playlist id="111" name="aaa" comment="comment" songCount="2" duration="120" public="true" owner="admin" created="0001-01-01T00:00:00Z" changed="0001-01-01T00:00:00Z" coverArt="pl-123123123123"></playlist>
-    <playlist id="222" name="bbb" songCount="0" duration="0" public="false" created="0001-01-01T00:00:00Z" changed="0001-01-01T00:00:00Z"></playlist>
+    <playlist id="222" name="bbb" songCount="0" duration="0" created="0001-01-01T00:00:00Z" changed="0001-01-01T00:00:00Z"></playlist>
   </playlists>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses Shares with data should match .JSON

@@ -14,8 +14,7 @@
             "title": "title",
             "album": "album",
             "artist": "artist",
-            "duration": 120,
-            "isVideo": false
+            "duration": 120
           },
           {
             "id": "2",
@@ -23,8 +22,7 @@
             "title": "title 2",
             "album": "album",
             "artist": "artist",
-            "duration": 300,
-            "isVideo": false
+            "duration": 300
           }
         ],
         "id": "ABC123",

server/subsonic/responses/.snapshots/Responses Shares with data should match .XML

@@ -1,8 +1,8 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <shares>
     <share id="ABC123" url="http://localhost/p/ABC123" description="Check it out!" username="deluan" created="2016-03-02T20:30:00Z" expires="2016-03-02T20:30:00Z" lastVisited="2016-03-02T20:30:00Z" visitCount="2">
-      <entry id="1" isDir="false" title="title" album="album" artist="artist" duration="120" isVideo="false"></entry>
-      <entry id="2" isDir="false" title="title 2" album="album" artist="artist" duration="300" isVideo="false"></entry>
+      <entry id="1" isDir="false" title="title" album="album" artist="artist" duration="120"></entry>
+      <entry id="2" isDir="false" title="title 2" album="album" artist="artist" duration="300"></entry>
     </share>
   </shares>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses SimilarSongs with data should match .JSON

@@ -9,8 +9,7 @@
       {
         "id": "1",
         "isDir": false,
-        "title": "title",
-        "isVideo": false
+        "title": "title"
       }
     ]
   }

server/subsonic/responses/.snapshots/Responses SimilarSongs with data should match .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <similarSongs>
-    <song id="1" isDir="false" title="title" isVideo="false"></song>
+    <song id="1" isDir="false" title="title"></song>
   </similarSongs>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses SimilarSongs2 with data should match .JSON

@@ -9,8 +9,7 @@
       {
         "id": "1",
         "isDir": false,
-        "title": "title",
-        "isVideo": false
+        "title": "title"
       }
     ]
   }

server/subsonic/responses/.snapshots/Responses SimilarSongs2 with data should match .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <similarSongs2>
-    <song id="1" isDir="false" title="title" isVideo="false"></song>
+    <song id="1" isDir="false" title="title"></song>
   </similarSongs2>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses TopSongs with data should match .JSON

@@ -9,8 +9,7 @@
       {
         "id": "1",
         "isDir": false,
-        "title": "title",
-        "isVideo": false
+        "title": "title"
       }
     ]
   }

server/subsonic/responses/.snapshots/Responses TopSongs with data should match .XML

@@ -1,5 +1,5 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <topSongs>
-    <song id="1" isDir="false" title="title" isVideo="false"></song>
+    <song id="1" isDir="false" title="title"></song>
   </topSongs>
 </subsonic-response>

server/subsonic/responses/responses.go

@@ -161,7 +161,7 @@ type Child struct {
 	Type                  string     `xml:"type,attr,omitempty"                     json:"type,omitempty"`
 	UserRating            int32      `xml:"userRating,attr,omitempty"               json:"userRating,omitempty"`
 	SongCount             int32      `xml:"songCount,attr,omitempty"                json:"songCount,omitempty"`
-	IsVideo               bool       `xml:"isVideo,attr"                            json:"isVideo"`
+	IsVideo               bool       `xml:"isVideo,attr,omitempty"                  json:"isVideo,omitempty"`
 	BookmarkPosition      int64      `xml:"bookmarkPosition,attr,omitempty"         json:"bookmarkPosition,omitempty"`
 	/*
 	   <xs:attribute name="averageRating" type="sub:AverageRating" use="optional"/>  <!-- Added in 1.6.0 -->
@@ -177,7 +177,7 @@ type OpenSubsonicChild struct {
 	SortName           string              `xml:"sortName,attr,omitempty"           json:"sortName"`
 	MediaType          MediaType           `xml:"mediaType,attr,omitempty"          json:"mediaType"`
 	MusicBrainzId      string              `xml:"musicBrainzId,attr,omitempty"      json:"musicBrainzId"`
-	Isrc               Array[string]       `xml:"isrc,omitempty"                  json:"isrc"`
+	Isrc               Array[string]       `xml:"isrc,omitempty"                    json:"isrc"`
 	Genres             Array[ItemGenre]    `xml:"genres,omitempty"                  json:"genres"`
 	ReplayGain         ReplayGain          `xml:"replayGain,omitempty"              json:"replayGain"`
 	ChannelCount       int32               `xml:"channelCount,attr,omitempty"       json:"channelCount"`
@@ -308,7 +308,7 @@ type Playlist struct {
 	Comment   string    `xml:"comment,attr,omitempty"        json:"comment,omitempty"`
 	SongCount int32     `xml:"songCount,attr"                json:"songCount"`
 	Duration  int32     `xml:"duration,attr"                 json:"duration"`
-	Public    bool      `xml:"public,attr"                   json:"public"`
+	Public    bool      `xml:"public,attr,omitempty"         json:"public,omitempty"`
 	Owner     string    `xml:"owner,attr,omitempty"          json:"owner,omitempty"`
 	Created   time.Time `xml:"created,attr"                  json:"created"`
 	Changed   time.Time `xml:"changed,attr"                  json:"changed"`

tests/fixtures/playlists/private_playlist.nsp

@@ -0,0 +1,11 @@
+{
+  "name": "Private Playlist",
+  "comment": "A smart playlist that is explicitly private",
+  "public": false,
+  "all": [
+    {"is": {"loved": true}}
+  ],
+  "sort": "title",
+  "order": "asc",
+  "limit": 100
+}

tests/fixtures/playlists/public_playlist.nsp

@@ -0,0 +1,11 @@
+{
+  "name": "Public Playlist",
+  "comment": "A smart playlist that is public",
+  "public": true,
+  "all": [
+    {"inTheLast": {"lastPlayed": 30}}
+  ],
+  "sort": "lastPlayed",
+  "order": "desc",
+  "limit": 50
+}