mirror of
https://github.com/navidrome/navidrome.git
synced 2026-10-18 07:30:29 +00:00
* refactor(persistence): adopt generic deluan/rest repository API Pin deluan/rest to the refactor branch. REST-facing repository methods take a context and return typed values. Drop DataStore.Resource and ResourceRepository; the native API names typed repositories directly through a per-request adapter that later commits remove. * refactor(persistence): base repository helpers take a context * refactor(persistence): LibraryRepository takes a context per call * refactor(persistence): PropertyRepository takes a context per call * refactor(persistence): UserPropsRepository takes a context per call * refactor(persistence): TranscodingRepository takes a context per call * refactor(persistence): ShareRepository takes a context per call * refactor(persistence): PlayerRepository takes a context per call * refactor(persistence): RadioRepository takes a context per call * refactor(persistence): PlayQueueRepository takes a context per call * refactor(persistence): Tag and Genre repositories take a context per call * refactor(persistence): PluginRepository takes a context per call * refactor(persistence): Scrobble repositories take a context per call * refactor(persistence): FolderRepository takes a context per call * refactor(persistence): Artwork repositories take a context per call * refactor(persistence): UserRepository takes a context per call * refactor(persistence): ArtistRepository takes a context per call ReadAll no longer rewrites the shared sort mappings for the role filter; it works on a per-call copy. * test(persistence): assert artist role sort sanitization in ReadAll * refactor(persistence): AlbumRepository takes a context per call * test(persistence): pass the test context to album repository helpers * refactor(persistence): MediaFileRepository takes a context per call * refactor(persistence): Playlist repositories take a context per call * refactor(persistence): build all repositories once per store * refactor(core): REST repository wrappers are built once * refactor(persistence): repositories are stateless Remove the context field from the base repository and the per-request REST adapter. Enable the containedctx linter so no repository can hold a request context again. * chore(lint): skip containedctx in test files * refactor: share simplifications from the stateless repositories sweep Add deleteOwnedAll on sqlRepository and use it in player/share Delete to remove the duplicated bulk-delete loop; have Share.Repository() return model.ShareRepository so subsonic sharing.go drops its repeated type assertions. * chore(core): assert REST wrappers implement Persistable * chore: reformat imports * perf(persistence): build repositories on first use Each transaction store used to construct all 21 repositories up front, paying for filter and sort mapping setup the block never touched. Fields are now sync.OnceValue thunks, so a store only builds what it uses. * fix(persistence): clean plugin references per deleted user A bulk user delete that fails on a later id had already removed the earlier rows but skipped their plugin cleanup. Cleanup now runs right after each successful delete. * fix(core): unload disabled plugins even when a user delete fails A bulk delete can fail on a later id after earlier users were removed and their plugins auto-disabled. The wrapper returned before unloading, leaving those plugins running until the next successful delete or a restart. * chore(deps): pin deluan/rest to v1.0.1 Replaces the pseudo-version of the refactor branch with the tagged release. REST error messages now name the bare type (Artist, not model.Artist). * test: use the spec context instead of context.Background() Replace the context.Background()/context.TODO() calls this branch added to tests with the spec's ctx, GinkgoT().Context(), or t/b.Context(), so repository calls are bound to the running spec's lifetime. * test: declare the spec context once per Describe Set ctx from GinkgoT().Context() first in each top-level BeforeEach and reuse it, building user contexts on top of it instead of repeating inline calls.
188 lines
6.4 KiB
Go
188 lines
6.4 KiB
Go
package playlists
|
|
|
|
import (
|
|
"context"
|
|
"reflect"
|
|
"strings"
|
|
|
|
"github.com/deluan/rest"
|
|
"github.com/navidrome/navidrome/model"
|
|
"github.com/navidrome/navidrome/model/criteria"
|
|
"github.com/navidrome/navidrome/model/request"
|
|
"github.com/navidrome/navidrome/utils/slice"
|
|
)
|
|
|
|
// --- REST adapter (follows Share/Library pattern) ---
|
|
|
|
func (s *playlists) Repository() rest.Repository[model.Playlist] {
|
|
return s.repo
|
|
}
|
|
|
|
// playlistRepositoryWrapper wraps the playlist repository as a thin REST-to-service adapter,
|
|
// delegating to service methods for all mutations.
|
|
type playlistRepositoryWrapper struct {
|
|
model.PlaylistRepository
|
|
service *playlists
|
|
}
|
|
|
|
var _ rest.Persistable[model.Playlist] = (*playlistRepositoryWrapper)(nil)
|
|
|
|
func (r *playlistRepositoryWrapper) Save(ctx context.Context, entity *model.Playlist) (string, error) {
|
|
return r.service.savePlaylist(ctx, entity)
|
|
}
|
|
|
|
func (r *playlistRepositoryWrapper) Update(ctx context.Context, id string, entity model.Playlist, cols ...string) error {
|
|
return r.service.updatePlaylistEntity(ctx, id, &entity, cols...)
|
|
}
|
|
|
|
func (r *playlistRepositoryWrapper) Delete(ctx context.Context, ids ...string) error {
|
|
for _, id := range ids {
|
|
if err := r.service.Delete(ctx, id); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *playlists) TracksRepository(ctx context.Context, playlistId string, refreshSmartPlaylist bool) rest.Repository[model.PlaylistTrack] {
|
|
repo := s.ds.Playlist()
|
|
tracks := repo.Tracks(ctx, playlistId, refreshSmartPlaylist)
|
|
if tracks == nil {
|
|
return nil
|
|
}
|
|
return tracks
|
|
}
|
|
|
|
// savePlaylist creates a new playlist, assigning the owner from context.
|
|
// Only Name, Comment, Public, and Rules are user-settable via the REST API.
|
|
func (s *playlists) savePlaylist(ctx context.Context, pls *model.Playlist) (string, error) {
|
|
usr, _ := request.UserFrom(ctx)
|
|
pls.OwnerID = usr.ID
|
|
pls.ID = "" // Force new creation
|
|
pls.Path = "" // Server-managed (M3U file path)
|
|
pls.Sync = false // Server-managed (M3U sync flag)
|
|
pls.UploadedImage = "" // Managed by image upload endpoint
|
|
pls.ExternalImageURL = "" // Managed by M3U import / plugins only
|
|
pls.EvaluatedAt = nil // Server-managed
|
|
err := s.ds.Playlist().Put(ctx, pls)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return pls.ID, nil
|
|
}
|
|
|
|
// updatePlaylistEntity updates playlist metadata with permission checks.
|
|
// Used by the REST API wrapper.
|
|
//
|
|
// cols names the fields the client actually sent in the JSON body (extracted by
|
|
// rest.Put). When non-empty, fields outside cols are not considered changed and
|
|
// are left untouched — this prevents partial requests like bulk "Make Public"
|
|
// (body: {"public": true}) from wiping fields that just happen to be zero in
|
|
// the deserialized entity (see issue #5541). An empty cols means "treat the
|
|
// entity as a complete record" — preserved for callers that don't use the REST
|
|
// wrapper.
|
|
func (s *playlists) updatePlaylistEntity(ctx context.Context, id string, entity *model.Playlist, cols ...string) error {
|
|
current, err := s.checkWritable(ctx, id)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
sent := sentFields(cols)
|
|
|
|
usr, _ := request.UserFrom(ctx)
|
|
ownerChanged := sent("ownerId") && entity.OwnerID != "" && entity.OwnerID != current.OwnerID
|
|
if !usr.IsAdmin && ownerChanged {
|
|
return rest.ErrPermissionDenied
|
|
}
|
|
|
|
nameChanged := sent("name") && entity.Name != current.Name
|
|
commentChanged := sent("comment") && entity.Comment != current.Comment
|
|
rulesChanged := sent("rules") && !rulesEqual(current.Rules, entity.Rules)
|
|
|
|
if nameChanged || commentChanged || ownerChanged || rulesChanged {
|
|
return s.applyContentUpdate(ctx, current, entity, sent,
|
|
nameChanged, commentChanged, ownerChanged, rulesChanged)
|
|
}
|
|
return s.applyFlagsOnly(ctx, current, entity, sent)
|
|
}
|
|
|
|
// applyContentUpdate handles updates that change at least one of name/comment/
|
|
// owner/rules. It goes through updateMetadata, which always bumps updatedAt
|
|
// (invalidating cached cover-art URLs). namePtr/commentPtr are nil when the
|
|
// field is absent from the request OR present-but-unchanged (so updateMetadata
|
|
// skips them); publicPtr is nil only when public is absent from the request
|
|
// (an idempotent public value is still forwarded).
|
|
func (s *playlists) applyContentUpdate(ctx context.Context, current, entity *model.Playlist,
|
|
sent func(string) bool, nameChanged, commentChanged, ownerChanged, rulesChanged bool,
|
|
) error {
|
|
if ownerChanged {
|
|
current.OwnerID = entity.OwnerID
|
|
}
|
|
if rulesChanged {
|
|
current.Rules = entity.Rules
|
|
current.EvaluatedAt = nil // force re-evaluation on next read
|
|
current.ImportedHash = "" // rules no longer match the source file; next scan must re-import it
|
|
}
|
|
if sent("sync") && current.Path != "" && current.Sync != entity.Sync {
|
|
current.Sync = entity.Sync
|
|
}
|
|
var namePtr, commentPtr *string
|
|
var publicPtr *bool
|
|
if nameChanged {
|
|
namePtr = &entity.Name
|
|
}
|
|
if commentChanged {
|
|
commentPtr = &entity.Comment
|
|
}
|
|
if sent("public") {
|
|
publicPtr = &entity.Public
|
|
}
|
|
return s.updateMetadata(ctx, s.ds, current, namePtr, commentPtr, publicPtr)
|
|
}
|
|
|
|
// applyFlagsOnly handles updates that only toggle sync/public — skips
|
|
// updatedAt so cover art URLs stay stable.
|
|
func (s *playlists) applyFlagsOnly(ctx context.Context, current, entity *model.Playlist,
|
|
sent func(string) bool,
|
|
) error {
|
|
var updateCols []string
|
|
if sent("sync") && current.Path != "" && current.Sync != entity.Sync {
|
|
current.Sync = entity.Sync
|
|
updateCols = append(updateCols, "sync")
|
|
}
|
|
if sent("public") && current.Public != entity.Public {
|
|
current.Public = entity.Public
|
|
updateCols = append(updateCols, "public")
|
|
}
|
|
if len(updateCols) == 0 {
|
|
return nil
|
|
}
|
|
return s.ds.Playlist().Put(ctx, current, updateCols...)
|
|
}
|
|
|
|
// sentFields returns a predicate that reports whether a JSON field was present
|
|
// in the request body. Matching is case-insensitive to mirror Go's json
|
|
// decoder, which populates struct fields from case-variant keys like
|
|
// {"Name":"x"} or {"OWNERID":"y"}. An empty cols list means "treat the entity
|
|
// as a full record" — every field is considered sent.
|
|
func sentFields(cols []string) func(string) bool {
|
|
if len(cols) == 0 {
|
|
return func(string) bool { return true }
|
|
}
|
|
set := slice.ToMap(cols, func(c string) (string, struct{}) { return strings.ToLower(c), struct{}{} })
|
|
return func(field string) bool {
|
|
_, ok := set[strings.ToLower(field)]
|
|
return ok
|
|
}
|
|
}
|
|
|
|
func rulesEqual(a, b *criteria.Criteria) bool {
|
|
if a == b {
|
|
return true
|
|
}
|
|
if a == nil || b == nil {
|
|
return false
|
|
}
|
|
return reflect.DeepEqual(a, b)
|
|
}
|