mirror of
https://github.com/navidrome/navidrome.git
synced 2026-11-15 22:58:40 +01:00
Merge remote-tracking branch 'origin/master' into feat/artwork-blurhash
# Conflicts: # model/playlist.go # model/playlist_test.go
This commit is contained in:
commit
4d8b486dfd
13 changed files with 349 additions and 6 deletions
|
|
@ -4,9 +4,12 @@ package criteria
|
|||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"github.com/navidrome/navidrome/log"
|
||||
"github.com/navidrome/navidrome/utils"
|
||||
)
|
||||
|
||||
type Expression interface {
|
||||
|
|
@ -20,6 +23,7 @@ type Criteria struct {
|
|||
Limit int
|
||||
LimitPercent int
|
||||
Offset int
|
||||
RefreshDelay time.Duration // 0 = use conf.Server.SmartPlaylistRefreshDelay
|
||||
}
|
||||
|
||||
// EffectiveLimit resolves the effective limit for a query. If a fixed Limit is
|
||||
|
|
@ -83,6 +87,7 @@ func (c Criteria) MarshalJSON() ([]byte, error) {
|
|||
Limit int `json:"limit,omitempty"`
|
||||
LimitPercent int `json:"limitPercent,omitempty"`
|
||||
Offset int `json:"offset,omitempty"`
|
||||
RefreshDelay string `json:"refreshDelay,omitempty"`
|
||||
}{
|
||||
Sort: c.Sort,
|
||||
Order: c.Order,
|
||||
|
|
@ -90,6 +95,9 @@ func (c Criteria) MarshalJSON() ([]byte, error) {
|
|||
LimitPercent: c.LimitPercent,
|
||||
Offset: c.Offset,
|
||||
}
|
||||
if c.RefreshDelay > 0 {
|
||||
aux.RefreshDelay = utils.FormatDuration(c.RefreshDelay)
|
||||
}
|
||||
switch rules := c.Expression.(type) {
|
||||
case Any:
|
||||
aux.Any = rules
|
||||
|
|
@ -110,6 +118,7 @@ func (c *Criteria) UnmarshalJSON(data []byte) error {
|
|||
Limit int `json:"limit"`
|
||||
LimitPercent int `json:"limitPercent"`
|
||||
Offset int `json:"offset"`
|
||||
RefreshDelay string `json:"refreshDelay"`
|
||||
}
|
||||
if err := json.Unmarshal(data, &aux); err != nil {
|
||||
return err
|
||||
|
|
@ -131,6 +140,14 @@ func (c *Criteria) UnmarshalJSON(data []byte) error {
|
|||
c.Limit = aux.Limit
|
||||
c.Offset = aux.Offset
|
||||
|
||||
if aux.RefreshDelay != "" {
|
||||
d, err := utils.ParseDuration(aux.RefreshDelay)
|
||||
if err != nil {
|
||||
return fmt.Errorf("invalid refreshDelay: %w", err)
|
||||
}
|
||||
c.RefreshDelay = d
|
||||
}
|
||||
|
||||
// Clamp LimitPercent to [0, 100]
|
||||
if aux.LimitPercent < 0 {
|
||||
log.Warn("limitPercent value out of range, clamping to 0", "value", aux.LimitPercent)
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package criteria
|
|||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
|
|
@ -255,6 +256,71 @@ var _ = Describe("Criteria", func() {
|
|||
})
|
||||
})
|
||||
|
||||
Describe("refreshDelay", func() {
|
||||
newCriteria := func(extra string) []byte {
|
||||
return []byte(`{"all":[{"is":{"loved":true}}]` + extra + `}`)
|
||||
}
|
||||
|
||||
It("unmarshals a valid refreshDelay", func() {
|
||||
var c Criteria
|
||||
gomega.Expect(json.Unmarshal(newCriteria(`,"refreshDelay":"1d"`), &c)).To(gomega.Succeed())
|
||||
gomega.Expect(c.RefreshDelay).To(gomega.Equal(24 * time.Hour))
|
||||
})
|
||||
|
||||
It("supports week units", func() {
|
||||
var c Criteria
|
||||
gomega.Expect(json.Unmarshal(newCriteria(`,"refreshDelay":"1w"`), &c)).To(gomega.Succeed())
|
||||
gomega.Expect(c.RefreshDelay).To(gomega.Equal(7 * 24 * time.Hour))
|
||||
})
|
||||
|
||||
It("leaves RefreshDelay zero when absent", func() {
|
||||
var c Criteria
|
||||
gomega.Expect(json.Unmarshal(newCriteria(``), &c)).To(gomega.Succeed())
|
||||
gomega.Expect(c.RefreshDelay).To(gomega.BeZero())
|
||||
})
|
||||
|
||||
It("rejects an invalid refreshDelay", func() {
|
||||
var c Criteria
|
||||
err := json.Unmarshal(newCriteria(`,"refreshDelay":"tomorrow"`), &c)
|
||||
gomega.Expect(err).To(gomega.MatchError(gomega.ContainSubstring("refreshDelay")))
|
||||
})
|
||||
|
||||
It("rejects a negative refreshDelay", func() {
|
||||
var c Criteria
|
||||
err := json.Unmarshal(newCriteria(`,"refreshDelay":"-1h"`), &c)
|
||||
gomega.Expect(err).To(gomega.MatchError(gomega.ContainSubstring("refreshDelay")))
|
||||
})
|
||||
|
||||
It("marshals RefreshDelay back as a duration string", func() {
|
||||
c := Criteria{
|
||||
Expression: All{Is{"loved": true}},
|
||||
RefreshDelay: 24 * time.Hour,
|
||||
}
|
||||
j, err := json.Marshal(c)
|
||||
gomega.Expect(err).ToNot(gomega.HaveOccurred())
|
||||
gomega.Expect(string(j)).To(gomega.ContainSubstring(`"refreshDelay":"1d"`))
|
||||
})
|
||||
|
||||
It("omits refreshDelay from JSON when zero", func() {
|
||||
c := Criteria{Expression: All{Is{"loved": true}}}
|
||||
j, err := json.Marshal(c)
|
||||
gomega.Expect(err).ToNot(gomega.HaveOccurred())
|
||||
gomega.Expect(string(j)).ToNot(gomega.ContainSubstring("refreshDelay"))
|
||||
})
|
||||
|
||||
It("round-trips through marshal and unmarshal", func() {
|
||||
c := Criteria{
|
||||
Expression: All{Is{"loved": true}},
|
||||
RefreshDelay: 36 * time.Hour,
|
||||
}
|
||||
j, err := json.Marshal(c)
|
||||
gomega.Expect(err).ToNot(gomega.HaveOccurred())
|
||||
var c2 Criteria
|
||||
gomega.Expect(json.Unmarshal(j, &c2)).To(gomega.Succeed())
|
||||
gomega.Expect(c2.RefreshDelay).To(gomega.Equal(36 * time.Hour))
|
||||
})
|
||||
})
|
||||
|
||||
Context("with child playlists", func() {
|
||||
var (
|
||||
topLevelInPlaylistID string
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import (
|
|||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/navidrome/navidrome/conf"
|
||||
"github.com/navidrome/navidrome/consts"
|
||||
"github.com/navidrome/navidrome/model/criteria"
|
||||
)
|
||||
|
|
@ -46,6 +47,15 @@ func (pls Playlist) ArtworkUpdatedAt() time.Time {
|
|||
return pls.UpdatedAt
|
||||
}
|
||||
|
||||
// RefreshDelay returns the playlist's own refresh window when set, falling
|
||||
// back to the global SmartPlaylistRefreshDelay.
|
||||
func (pls Playlist) RefreshDelay() time.Duration {
|
||||
if pls.IsSmartPlaylist() && pls.Rules.RefreshDelay > 0 {
|
||||
return pls.Rules.RefreshDelay
|
||||
}
|
||||
return conf.Server.SmartPlaylistRefreshDelay
|
||||
}
|
||||
|
||||
func (pls Playlist) MediaFiles() MediaFiles {
|
||||
if len(pls.Tracks) == 0 {
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -3,7 +3,10 @@ package model_test
|
|||
import (
|
||||
"time"
|
||||
|
||||
"github.com/navidrome/navidrome/conf"
|
||||
"github.com/navidrome/navidrome/conf/configtest"
|
||||
"github.com/navidrome/navidrome/model"
|
||||
"github.com/navidrome/navidrome/model/criteria"
|
||||
"github.com/navidrome/navidrome/tests"
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
|
@ -45,6 +48,31 @@ var _ = Describe("Playlist", func() {
|
|||
Expect(pls.ToM3U8()).To(Equal(expected))
|
||||
})
|
||||
})
|
||||
|
||||
Describe("RefreshDelay", func() {
|
||||
BeforeEach(func() {
|
||||
DeferCleanup(configtest.SetupConfig())
|
||||
conf.Server.SmartPlaylistRefreshDelay = 5 * time.Second
|
||||
})
|
||||
|
||||
It("returns the global config value when rules have no refreshDelay", func() {
|
||||
pls := model.Playlist{Rules: &criteria.Criteria{Expression: criteria.All{criteria.Is{"loved": true}}}}
|
||||
Expect(pls.RefreshDelay()).To(Equal(5 * time.Second))
|
||||
})
|
||||
|
||||
It("returns the per-playlist value when set", func() {
|
||||
pls := model.Playlist{Rules: &criteria.Criteria{
|
||||
Expression: criteria.All{criteria.Is{"loved": true}},
|
||||
RefreshDelay: 24 * time.Hour,
|
||||
}}
|
||||
Expect(pls.RefreshDelay()).To(Equal(24 * time.Hour))
|
||||
})
|
||||
|
||||
It("returns the global value for non-smart playlists", func() {
|
||||
pls := model.Playlist{}
|
||||
Expect(pls.RefreshDelay()).To(Equal(5 * time.Second))
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
var _ = Describe("Playlist.ArtworkUpdatedAt", func() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue