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

feat: expose album, song and artist annotations in the RESTful API

Browse source
This commit is contained in:
Deluan 2020-03-28 19:22:55 -04:00
parent 0e36ed35a3
commit 777231ea79
7 changed files with 47 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
model/album.go
View file

@ -22,11 +22,11 @@ type Album struct {
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `json:"updatedAt"`
// Annotations // Annotations
PlayCount int `json:"-" orm:"-"` PlayCount int `json:"playCount" orm:"-"`
PlayDate time.Time `json:"-" orm:"-"` PlayDate time.Time `json:"playDate" orm:"-"`
Rating int `json:"-" orm:"-"` Rating int `json:"rating" orm:"-"`
Starred bool `json:"-" orm:"-"` Starred bool `json:"starred" orm:"-"`
StarredAt time.Time `json:"-" orm:"-"` StarredAt time.Time `json:"starredAt" orm:"-"`
} }
type Albums []Album type Albums []Album

4
model/annotation.go
View file

@ -7,3 +7,7 @@ type AnnotatedRepository interface {
SetStar(starred bool, itemIDs ...string) error SetStar(starred bool, itemIDs ...string) error
SetRating(rating int, itemID string) error SetRating(rating int, itemID string) error
} }
// While I can't find a better way to make these fields optional in the models, I keep this list here
// to be used in other packages
var AnnotationFields = []string{"playCount", "playDate", "rating", "starred", "starredAt"}

10
model/artist.go
View file

@ -9,11 +9,11 @@ type Artist struct {
FullText string `json:"fullText"` FullText string `json:"fullText"`
// Annotations // Annotations
PlayCount int `json:"-" orm:"-"` PlayCount int `json:"playCount" orm:"-"`
PlayDate time.Time `json:"-" orm:"-"` PlayDate time.Time `json:"playDate" orm:"-"`
Rating int `json:"-" orm:"-"` Rating int `json:"rating" orm:"-"`
Starred bool `json:"-" orm:"-"` Starred bool `json:"starred" orm:"-"`
StarredAt time.Time `json:"-" orm:"-"` StarredAt time.Time `json:"starredAt" orm:"-"`
} }
type Artists []Artist type Artists []Artist

10
model/mediafile.go
View file

@ -30,11 +30,11 @@ type MediaFile struct {
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `json:"updatedAt"`
// Annotations // Annotations
PlayCount int `json:"-" orm:"-"` PlayCount int `json:"playCount" orm:"-"`
PlayDate time.Time `json:"-" orm:"-"` PlayDate time.Time `json:"playDate" orm:"-"`
Rating int `json:"-" orm:"-"` Rating int `json:"rating" orm:"-"`
Starred bool `json:"-" orm:"-"` Starred bool `json:"starred" orm:"-"`
StarredAt time.Time `json:"-" orm:"-"` StarredAt time.Time `json:"starredAt" orm:"-"`
} }
func (mf *MediaFile) ContentType() string { func (mf *MediaFile) ContentType() string {

4
persistence/helpers.go
View file

@ -7,6 +7,8 @@ import (
"strings" "strings"
"github.com/Masterminds/squirrel" "github.com/Masterminds/squirrel"
"github.com/deluan/navidrome/model"
"github.com/deluan/navidrome/utils"
) )
func toSqlArgs(rec interface{}) (map[string]interface{}, error) { func toSqlArgs(rec interface{}) (map[string]interface{}, error) {
@ -21,8 +23,10 @@ func toSqlArgs(rec interface{}) (map[string]interface{}, error) {
err = json.Unmarshal(b, &m) err = json.Unmarshal(b, &m)
r := make(map[string]interface{}, len(m)) r := make(map[string]interface{}, len(m))
for f, v := range m { for f, v := range m {
if !utils.StringInSlice(f, model.AnnotationFields) {
r[toSnakeCase(f)] = v r[toSnakeCase(f)] = v
} }
}
return r, err return r, err
} }

9
utils/strings.go
View file

@ -16,3 +16,12 @@ func NoArticle(name string) string {
} }
return name return name
} }
func StringInSlice(a string, list []string) bool {
for _, b := range list {
if b == a {
return true
}
}
return false
}

14
utils/strings_test.go
View file

@ -34,4 +34,18 @@ var _ = Describe("Strings", func() {
}) })
}) })
}) })
Describe("StringInSlice", func() {
It("returns false if slice is empty", func() {
Expect(StringInSlice("test", nil)).To(BeFalse())
})
It("returns false if string is not found in slice", func() {
Expect(StringInSlice("aaa", []string{"bbb", "ccc"})).To(BeFalse())
})
It("returns true if string is found in slice", func() {
Expect(StringInSlice("bbb", []string{"bbb", "aaa", "ccc"})).To(BeTrue())
})
})
}) })