diff --git a/internal/library/scanrun.go b/internal/library/scanrun.go index a6c9de3d..5f42ecb5 100644 --- a/internal/library/scanrun.go +++ b/internal/library/scanrun.go @@ -100,11 +100,7 @@ func RunScan( var lastStats Stats libPub := newStagePublisher(ctx, 500, time.Second, func() []byte { - blob, _ := json.Marshal(LibraryStageTallies{ - Scanned: lastStats.Scanned, Added: lastStats.Added, - Updated: lastStats.Updated, Skipped: lastStats.Skipped, - Errored: lastStats.Errored, - }) + blob, _ := json.Marshal(LibraryStageTallies(lastStats)) return blob }, func(blob []byte) error { @@ -131,10 +127,7 @@ func RunScan( var lastRes BackfillMBIDsResult bfPub := newStagePublisher(ctx, 500, time.Second, func() []byte { - blob, _ := json.Marshal(MBIDBackfillStageTallies{ - Processed: lastRes.Processed, Healed: lastRes.Healed, - Skipped: lastRes.Skipped, Duplicates: lastRes.Duplicates, - }) + blob, _ := json.Marshal(MBIDBackfillStageTallies(lastRes)) return blob }, func(blob []byte) error { diff --git a/internal/recommendation/home.go b/internal/recommendation/home.go index 4ad696c4..28180427 100644 --- a/internal/recommendation/home.go +++ b/internal/recommendation/home.go @@ -145,10 +145,7 @@ func loadRediscoverAlbums(ctx context.Context, q *dbq.Queries, userID pgtype.UUI if _, dup := seen[r.Album.ID]; dup { continue } - primary = append(primary, dbq.ListRediscoverAlbumsForUserRow{ - Album: r.Album, - ArtistName: r.ArtistName, - }) + primary = append(primary, dbq.ListRediscoverAlbumsForUserRow(r)) if len(primary) >= HomeRediscoverLimit { break } @@ -181,11 +178,7 @@ func loadRediscoverArtists(ctx context.Context, q *dbq.Queries, userID pgtype.UU if _, dup := seen[r.Artist.ID]; dup { continue } - primary = append(primary, dbq.ListRediscoverArtistsForUserRow{ - Artist: r.Artist, - CoverAlbumID: r.CoverAlbumID, - AlbumCount: r.AlbumCount, - }) + primary = append(primary, dbq.ListRediscoverArtistsForUserRow(r)) if len(primary) >= HomeRediscoverLimit { break }