refactor: remove annotation handling from engine

2020-01-30 22:07:02 -05:00
parent 67ed830a68
commit 72d9ddf532
20 changed files with 151 additions and 386 deletions
@@ -123,7 +123,7 @@ func (p *playlists) Get(ctx context.Context, id string) (*PlaylistInfo, error) {
 	}

 	// TODO Use model.Playlist when got rid of Entries
-	pinfo := &PlaylistInfo{
+	plsInfo := &PlaylistInfo{
 		Id:        pl.ID,
 		Name:      pl.Name,
 		SongCount: len(pl.Tracks),
@@ -132,19 +132,7 @@ func (p *playlists) Get(ctx context.Context, id string) (*PlaylistInfo, error) {
 		Owner:     pl.Owner,
 		Comment:   pl.Comment,
 	}
-	pinfo.Entries = make(Entries, len(pl.Tracks))

-	var mfIds []string
-	for _, mf := range pl.Tracks {
-		mfIds = append(mfIds, mf.ID)
-	}
-
-	annMap, err := p.ds.Annotation(ctx).GetMap(getUserID(ctx), model.MediaItemType, mfIds)
-
-	for i, mf := range pl.Tracks {
-		ann := annMap[mf.ID]
-		pinfo.Entries[i] = FromMediaFile(&mf, &ann)
-	}
-
-	return pinfo, nil
+	plsInfo.Entries = FromMediaFiles(pl.Tracks)
+	return plsInfo, nil
 }