Add ToggleStar to SongContextMenu (WIP)

model/album.go

@@ -3,6 +3,8 @@ package model
 import "time"
 
 type Album struct {
+	Annotations
+
 	ID                   string    `json:"id"            orm:"column(id)"`
 	Name                 string    `json:"name"`
 	CoverArtPath         string    `json:"coverArtPath"`
@@ -25,13 +27,6 @@ type Album struct {
 	OrderAlbumArtistName string    `json:"orderAlbumArtistName"`
 	CreatedAt            time.Time `json:"createdAt"`
 	UpdatedAt            time.Time `json:"updatedAt"`
-
-	// Annotations
-	PlayCount int64     `json:"playCount"   orm:"-"`
-	PlayDate  time.Time `json:"playDate"    orm:"-"`
-	Rating    int       `json:"rating"      orm:"-"`
-	Starred   bool      `json:"starred"     orm:"-"`
-	StarredAt time.Time `json:"starredAt"   orm:"-"`
 }
 
 type Albums []Album
@@ -48,3 +43,7 @@ type AlbumRepository interface {
 	Refresh(ids ...string) error
 	AnnotatedRepository
 }
+
+func (a Album) GetAnnotations() Annotations {
+	return a.Annotations
+}

model/annotation.go

@@ -2,6 +2,18 @@ package model
 
 import "time"
 
+type Annotations struct {
+	PlayCount int64     `json:"playCount"`
+	PlayDate  time.Time `json:"playDate"`
+	Rating    int       `json:"rating"`
+	Starred   bool      `json:"starred"`
+	StarredAt time.Time `json:"starredAt"`
+}
+
+type AnnotatedModel interface {
+	GetAnnotations() Annotations
+}
+
 type AnnotatedRepository interface {
 	IncPlayCount(itemID string, ts time.Time) error
 	SetStar(starred bool, itemIDs ...string) error

model/artist.go

@@ -1,8 +1,8 @@
 package model
 
-import "time"
-
 type Artist struct {
+	Annotations
+
 	ID              string `json:"id"          orm:"column(id)"`
 	Name            string `json:"name"`
 	AlbumCount      int    `json:"albumCount"`
@@ -10,13 +10,6 @@ type Artist struct {
 	FullText        string `json:"fullText"`
 	SortArtistName  string `json:"sortArtistName"`
 	OrderArtistName string `json:"orderArtistName"`
-
-	// Annotations
-	PlayCount int64     `json:"playCount"   orm:"-"`
-	PlayDate  time.Time `json:"playDate"    orm:"-"`
-	Rating    int       `json:"rating"      orm:"-"`
-	Starred   bool      `json:"starred"     orm:"-"`
-	StarredAt time.Time `json:"starredAt"   orm:"-"`
 }
 
 type Artists []Artist
@@ -38,3 +31,7 @@ type ArtistRepository interface {
 	GetIndex() (ArtistIndexes, error)
 	AnnotatedRepository
 }
+
+func (a Artist) GetAnnotations() Annotations {
+	return a.Annotations
+}

model/mediafile.go

@@ -6,6 +6,8 @@ import (
 )
 
 type MediaFile struct {
+	Annotations
+
 	ID                   string    `json:"id"            orm:"pk;column(id)"`
 	Path                 string    `json:"path"`
 	Title                string    `json:"title"`
@@ -36,13 +38,6 @@ type MediaFile struct {
 	Compilation          bool      `json:"compilation"`
 	CreatedAt            time.Time `json:"createdAt"`
 	UpdatedAt            time.Time `json:"updatedAt"`
-
-	// Annotations
-	PlayCount int64     `json:"playCount"   orm:"-"`
-	PlayDate  time.Time `json:"playDate"    orm:"-"`
-	Rating    int       `json:"rating"      orm:"-"`
-	Starred   bool      `json:"starred"     orm:"-"`
-	StarredAt time.Time `json:"starredAt"   orm:"-"`
 }
 
 func (mf *MediaFile) ContentType() string {
@@ -67,3 +62,7 @@ type MediaFileRepository interface {
 
 	AnnotatedRepository
 }
+
+func (mf MediaFile) GetAnnotations() Annotations {
+	return mf.Annotations
+}