feat: one Missing files page under Collection: folders gone, each with its album's want, last search or download, and Search, Releases and Remove; an album held before its files went is no longer shown as held again (M504 #5626)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-11 14:44:33 -04:00
parent 38b2325d2d
commit ead0abf0cf
20 changed files with 702 additions and 390 deletions
@@ -270,59 +270,65 @@ func (h *handlers) handleListWants(w http.ResponseWriter, r *http.Request) {
 	}
 	for _, row := range rows {
 		out.Total = row.Total
-		v := wantView{
-			ID: uuidToString(row.ID), ReleaseGroupMBID: row.ReleaseGroupMbid, Title: row.Title,
-			ArtistMBID: row.ArtistMbid, ArtistName: row.ArtistName,
-			PrimaryType: row.PrimaryType, SecondaryTypes: row.SecondaryTypes,
-			Year: first4(row.FirstReleaseDate), Reason: row.Reason,
-			WantedAt: formatTimestamp(row.WantedAt), Upgrade: row.Upgrade, HeldQuality: row.HeldQuality,
-			ImageURL: groupArtURL(musicbrainz.ReleaseGroup{MBID: row.ReleaseGroupMbid, Title: row.Title, ArtistCredit: row.ArtistName}),
-		}
-		if row.LibraryArtistID.Valid {
-			v.ArtistID = uuidToString(row.LibraryArtistID)
-		}
-		if row.AlbumID.Valid {
-			v.AlbumID = uuidToString(row.AlbumID)
-		}
-		if row.RequestedBy != nil {
-			v.RequestedBy = *row.RequestedBy
-		}
-		if row.FulfilledAt.Valid {
-			held := formatTimestamp(row.FulfilledAt)
-			v.HeldAt = &held
-		}
-		if v.SecondaryTypes == nil {
-			v.SecondaryTypes = []string{}
-		}
-		if row.SearchedAt.Valid {
-			v.Search = &wantSearchView{
-				SearchedAt: formatTimestamp(row.SearchedAt), Outcome: row.SearchOutcome,
-				Considered: row.SearchConsidered, BestRelease: row.BestRelease,
-				BestVerdict: row.BestVerdict, Error: row.SearchError,
-			}
-		}
-		if row.GrabName != nil {
-			v.Grab = &wantGrabView{ID: uuidToString(row.GrabID), Name: *row.GrabName,
-				GrabbedAt: formatTimestamp(row.GrabbedAt), Live: !row.GrabEndedAt.Valid,
-				Origin: deref(row.GrabOrigin), Quality: deref(row.GrabQuality), EndReason: deref(row.GrabEndReason),
-				ImportState: deref(row.GrabImportState), ImportReason: deref(row.GrabImportReason),
-				EndDetail: deref(row.GrabEndDetail)}
-			if row.GrabProgress != nil {
-				v.Grab.Progress = *row.GrabProgress
-			}
-			if row.GrabImportedFiles != nil {
-				v.Grab.ImportedFiles = *row.GrabImportedFiles
-			}
-			if row.GrabImportedAt.Valid {
-				at := formatTimestamp(row.GrabImportedAt)
-				v.Grab.ImportedAt = &at
-			}
-		}
-		out.Items = append(out.Items, v)
+		out.Items = append(out.Items, wantViewOf(row))
 	}
 	writeJSON(w, http.StatusOK, out)
 }

+// wantViewOf is one ListWants row as the wanted list and the Missing page
+// send it.
+func wantViewOf(row dbq.ListWantsRow) wantView {
+	v := wantView{
+		ID: uuidToString(row.ID), ReleaseGroupMBID: row.ReleaseGroupMbid, Title: row.Title,
+		ArtistMBID: row.ArtistMbid, ArtistName: row.ArtistName,
+		PrimaryType: row.PrimaryType, SecondaryTypes: row.SecondaryTypes,
+		Year: first4(row.FirstReleaseDate), Reason: row.Reason,
+		WantedAt: formatTimestamp(row.WantedAt), Upgrade: row.Upgrade, HeldQuality: row.HeldQuality,
+		ImageURL: groupArtURL(musicbrainz.ReleaseGroup{MBID: row.ReleaseGroupMbid, Title: row.Title, ArtistCredit: row.ArtistName}),
+	}
+	if row.LibraryArtistID.Valid {
+		v.ArtistID = uuidToString(row.LibraryArtistID)
+	}
+	if row.AlbumID.Valid {
+		v.AlbumID = uuidToString(row.AlbumID)
+	}
+	if row.RequestedBy != nil {
+		v.RequestedBy = *row.RequestedBy
+	}
+	if row.FulfilledAt.Valid {
+		held := formatTimestamp(row.FulfilledAt)
+		v.HeldAt = &held
+	}
+	if v.SecondaryTypes == nil {
+		v.SecondaryTypes = []string{}
+	}
+	if row.SearchedAt.Valid {
+		v.Search = &wantSearchView{
+			SearchedAt: formatTimestamp(row.SearchedAt), Outcome: row.SearchOutcome,
+			Considered: row.SearchConsidered, BestRelease: row.BestRelease,
+			BestVerdict: row.BestVerdict, Error: row.SearchError,
+		}
+	}
+	if row.GrabName != nil {
+		v.Grab = &wantGrabView{ID: uuidToString(row.GrabID), Name: *row.GrabName,
+			GrabbedAt: formatTimestamp(row.GrabbedAt), Live: !row.GrabEndedAt.Valid,
+			Origin: deref(row.GrabOrigin), Quality: deref(row.GrabQuality), EndReason: deref(row.GrabEndReason),
+			ImportState: deref(row.GrabImportState), ImportReason: deref(row.GrabImportReason),
+			EndDetail: deref(row.GrabEndDetail)}
+		if row.GrabProgress != nil {
+			v.Grab.Progress = *row.GrabProgress
+		}
+		if row.GrabImportedFiles != nil {
+			v.Grab.ImportedFiles = *row.GrabImportedFiles
+		}
+		if row.GrabImportedAt.Valid {
+			at := formatTimestamp(row.GrabImportedAt)
+			v.Grab.ImportedAt = &at
+		}
+	}
+	return v
+}
+
 // wantTracksView is an album's track list for the Wanted view (#5572): the
 // library's own tracks for an album it holds or held, else MusicBrainz's
 // standard edition of what is wanted.