Add ToggleStar to SongContextMenu (WIP)

persistence/album_repository.go

@@ -74,12 +74,14 @@ func (r *albumRepository) selectAlbum(options ...model.QueryOptions) SelectBuild
 
 func (r *albumRepository) Get(id string) (*model.Album, error) {
 	sq := r.selectAlbum().Where(Eq{"id": id})
-	var res model.Album
-	err := r.queryOne(sq, &res)
-	if err != nil {
+	var res model.Albums
+	if err := r.queryAll(sq, &res); err != nil {
 		return nil, err
 	}
-	return &res, nil
+	if len(res) == 0 {
+		return nil, model.ErrNotFound
+	}
+	return &res[0], nil
 }
 
 func (r *albumRepository) FindByArtist(artistId string) (model.Albums, error) {

persistence/artist_repository.go

@@ -55,9 +55,14 @@ func (r *artistRepository) Put(a *model.Artist) error {
 
 func (r *artistRepository) Get(id string) (*model.Artist, error) {
 	sel := r.selectArtist().Where(Eq{"id": id})
-	var res model.Artist
-	err := r.queryOne(sel, &res)
-	return &res, err
+	var res model.Artists
+	if err := r.queryAll(sel, &res); err != nil {
+		return nil, err
+	}
+	if len(res) == 0 {
+		return nil, model.ErrNotFound
+	}
+	return &res[0], nil
 }
 
 func (r *artistRepository) GetAll(options ...model.QueryOptions) (model.Artists, error) {

persistence/mediafile_repository.go

@@ -54,9 +54,14 @@ func (r mediaFileRepository) selectMediaFile(options ...model.QueryOptions) Sele
 
 func (r mediaFileRepository) Get(id string) (*model.MediaFile, error) {
 	sel := r.selectMediaFile().Where(Eq{"id": id})
-	var res model.MediaFile
-	err := r.queryOne(sel, &res)
-	return &res, err
+	var res model.MediaFiles
+	if err := r.queryAll(sel, &res); err != nil {
+		return nil, err
+	}
+	if len(res) == 0 {
+		return nil, model.ErrNotFound
+	}
+	return &res[0], nil
 }
 
 func (r mediaFileRepository) GetAll(options ...model.QueryOptions) (model.MediaFiles, error) {
@@ -155,8 +160,20 @@ func (r mediaFileRepository) EntityName() string {
 }
 
 func (r mediaFileRepository) NewInstance() interface{} {
-	return model.MediaFile{}
+	return &model.MediaFile{}
+}
+
+func (r mediaFileRepository) Save(entity interface{}) (string, error) {
+	mf := entity.(*model.MediaFile)
+	err := r.Put(mf)
+	return mf.ID, err
+}
+
+func (r mediaFileRepository) Update(entity interface{}, cols ...string) error {
+	mf := entity.(*model.MediaFile)
+	return r.Put(mf)
 }
 
 var _ model.MediaFileRepository = (*mediaFileRepository)(nil)
 var _ model.ResourceRepository = (*mediaFileRepository)(nil)
+var _ rest.Persistable = (*mediaFileRepository)(nil)

persistence/persistence_suite_test.go

@@ -21,7 +21,7 @@ func TestPersistence(t *testing.T) {
 	tests.Init(t, true)
 
 	//os.Remove("./test-123.db")
-	//conf.Server.Path = "./test-123.db"
+	//conf.Server.DbPath = "./test-123.db"
 	conf.Server.DbPath = "file::memory:?cache=shared"
 	_ = orm.RegisterDataBase("default", db.Driver, conf.Server.DbPath)
 	db.EnsureLatestVersion()

persistence/sql_annotations.go

@@ -96,3 +96,12 @@ func (r sqlRepository) cleanAnnotations() error {
 	}
 	return nil
 }
+
+func (r sqlRepository) updateAnnotations(id string, m interface{}) error {
+	ans := m.(model.AnnotatedModel).GetAnnotations()
+	err := r.SetStar(ans.Starred, id)
+	if err != nil {
+		return err
+	}
+	return r.SetRating(ans.Rating, id)
+}

persistence/sql_base_repository.go

@@ -112,6 +112,8 @@ func (r sqlRepository) executeSQL(sq Sqlizer) (int64, error) {
 	return res.RowsAffected()
 }
 
+// Note: Due to a bug in the QueryRow, this method does not map any embedded structs (ex: annotations)
+// In this case, use the queryAll method and get the first item of the returned list
 func (r sqlRepository) queryOne(sq Sqlizer, response interface{}) error {
 	query, args, err := sq.ToSql()
 	if err != nil {
@@ -169,7 +171,10 @@ func (r sqlRepository) put(id string, m interface{}) (newId string, err error) {
 			return "", err
 		}
 		if count > 0 {
-			return id, nil
+			if _, ok := m.(model.AnnotatedModel); ok {
+				err = r.updateAnnotations(id, m)
+			}
+			return id, err
 		}
 	}
 	// If does not have an id OR could not update (new record with predefined id)