mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use new Criteria and remove SmartPlaylist struct

Browse source
This commit is contained in:
Deluan 2021-10-21 22:15:05 -04:00 • committed by Deluan Quintão
parent 3972616585
commit 6a550dab77
9 changed files with 43 additions and 490 deletions
Download patch file Download diff file Expand all files Collapse all files

27
model/criteria/criteria.go
View file

@ -3,6 +3,7 @@ package criteria
import (
"encoding/json"
"strings"
"github.com/Masterminds/squirrel"
)
@ -13,10 +14,18 @@ type Criteria struct {
Expression
Sort string
Order string
Max int
Limit int
Offset int
}
func (c Criteria) OrderBy() string {
f := fieldMap[strings.ToLower(c.Sort)]
if c.Order != "" {
f = f + " " + c.Order
}
return f
}
func (c Criteria) ToSql() (sql string, args []interface{}, err error) {
return c.Expression.ToSql()
}
@ -27,12 +36,12 @@ func (c Criteria) MarshalJSON() ([]byte, error) {
Any []Expression `json:"any,omitempty"`
Sort string `json:"sort"`
Order string `json:"order,omitempty"`
Max int `json:"max,omitempty"`
Offset int `json:"offset"`
Limit int `json:"limit"`
Offset int `json:"offset,omitempty"`
}{
Sort: c.Sort,
Order: c.Order,
Max: c.Max,
Limit: c.Limit,
Offset: c.Offset,
}
switch rules := c.Expression.(type) {
@ -48,11 +57,11 @@ func (c Criteria) MarshalJSON() ([]byte, error) {
func (c *Criteria) UnmarshalJSON(data []byte) error {
var aux struct {
All unmarshalConjunctionType `json:"all,omitempty"`
Any unmarshalConjunctionType `json:"any,omitempty"`
All unmarshalConjunctionType `json:"all"`
Any unmarshalConjunctionType `json:"any"`
Sort string `json:"sort"`
Order string `json:"order,omitempty"`
Max int `json:"max,omitempty"`
Order string `json:"order"`
Limit int `json:"limit"`
Offset int `json:"offset"`
}
if err := json.Unmarshal(data, &aux); err != nil {
@ -65,7 +74,7 @@ func (c *Criteria) UnmarshalJSON(data []byte) error {
}
c.Sort = aux.Sort
c.Order = aux.Order
c.Max = aux.Max
c.Limit = aux.Limit
c.Offset = aux.Offset
return nil
}

2
model/criteria/criteria_suite_test.go
View file

@ -5,13 +5,11 @@ import (
_ "github.com/mattn/go-sqlite3"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)
func TestCriteria(t *testing.T) {
tests.Init(t, true)
log.SetLevel(log.LevelCritical)
gomega.RegisterFailHandler(Fail)
RunSpecs(t, "Criteria Suite")

4
model/criteria/criteria_test.go
View file

@ -27,7 +27,7 @@ var _ = Describe("Criteria", func() {
},
Sort: "title",
Order: "asc",
Max: 20,
Limit: 20,
Offset: 10,
}
var b bytes.Buffer
@ -49,7 +49,7 @@ var _ = Describe("Criteria", func() {
],
"sort": "title",
"order": "asc",
"max": 20,
"limit": 20,
"offset": 10
}
`))

2
model/criteria/operators_test.go
View file

@ -35,7 +35,7 @@ var _ = Describe("Operators", func() {
Entry("after", After{"lastPlayed": rangeStart}, "annotation.play_date > ?", rangeStart),
// TODO These may be flaky
Entry("inTheLast", InTheLast{"lastPlayed": 30}, "annotation.play_date > ?", startOfPeriod(30, time.Now())),
Entry("notInPeriod", NotInTheLast{"lastPlayed": 30}, "(annotation.play_date < ? OR annotation.play_date IS NULL)", startOfPeriod(30, time.Now())),
Entry("notInTheLast", NotInTheLast{"lastPlayed": 30}, "(annotation.play_date < ? OR annotation.play_date IS NULL)", startOfPeriod(30, time.Now())),
)
DescribeTable("JSON Conversion",

7
model/playlist.go
View file

@ -4,6 +4,7 @@ import (
"strconv"
"time"
"github.com/navidrome/navidrome/model/criteria"
"github.com/navidrome/navidrome/utils"
)
@ -23,12 +24,12 @@ type Playlist struct {
UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"`
// SmartPlaylist attributes
Rules *SmartPlaylist `structs:"-" json:"rules"`
EvaluatedAt time.Time `structs:"evaluated_at" json:"evaluatedAt"`
Rules *criteria.Criteria `structs:"-" json:"rules"`
EvaluatedAt time.Time `structs:"evaluated_at" json:"evaluatedAt"`
}
func (pls Playlist) IsSmartPlaylist() bool {
return pls.Rules != nil && pls.Rules.Combinator != ""
return pls.Rules != nil && pls.Rules.Expression != nil
}
func (pls Playlist) MediaFiles() MediaFiles {