Merge branch 'track-new-image' into dev
This commit is contained in:
@@ -29,6 +29,34 @@
|
|||||||
<MudTextField @bind-Value="_artist" Label="Artist" Required="true" RequiredError="Artist is required" Variant="Variant.Outlined" />
|
<MudTextField @bind-Value="_artist" Label="Artist" Required="true" RequiredError="Artist is required" Variant="Variant.Outlined" />
|
||||||
<MudTextField @bind-Value="_album" Label="Album" Variant="Variant.Outlined" />
|
<MudTextField @bind-Value="_album" Label="Album" Variant="Variant.Outlined" />
|
||||||
<MudTextField @bind-Value="_genre" Label="Genre" Variant="Variant.Outlined" />
|
<MudTextField @bind-Value="_genre" Label="Genre" Variant="Variant.Outlined" />
|
||||||
|
|
||||||
|
<MudField Label="Cover Art" Variant="Variant.Outlined" InnerPadding="false">
|
||||||
|
<MudStack Spacing="3">
|
||||||
|
@if (_selectedImageFile is { } selectedImage)
|
||||||
|
{
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
||||||
|
<MudText Typo="Typo.body2" Color="Color.Default">Selected: @selectedImage.Name</MudText>
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Clear"
|
||||||
|
Color="Color.Error"
|
||||||
|
Size="Size.Small"
|
||||||
|
Disabled="_isUploading"
|
||||||
|
OnClick="ClearImage"
|
||||||
|
aria-label="Cancel image selection" />
|
||||||
|
</MudStack>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.body2" Color="Color.Default">No cover art — optional.</MudText>
|
||||||
|
}
|
||||||
|
|
||||||
|
<InputFile OnChange="HandleImageFileSelected" accept="image/*" disabled="_isUploading" />
|
||||||
|
@if (_selectedImageFile is not null)
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.caption">Will upload on save.</MudText>
|
||||||
|
}
|
||||||
|
</MudStack>
|
||||||
|
</MudField>
|
||||||
|
|
||||||
<MudTextField @bind-Value="_releaseDate" Label="Release Date (YYYY-MM-DD)" Placeholder="2024-01-15" Variant="Variant.Outlined" />
|
<MudTextField @bind-Value="_releaseDate" Label="Release Date (YYYY-MM-DD)" Placeholder="2024-01-15" Variant="Variant.Outlined" />
|
||||||
|
|
||||||
@if (!string.IsNullOrEmpty(_errorMessage))
|
@if (!string.IsNullOrEmpty(_errorMessage))
|
||||||
@@ -67,6 +95,8 @@
|
|||||||
private const long MaxUploadBytes = 1_073_741_824L;
|
private const long MaxUploadBytes = 1_073_741_824L;
|
||||||
|
|
||||||
private IBrowserFile? _selectedFile;
|
private IBrowserFile? _selectedFile;
|
||||||
|
private IBrowserFile? _selectedImageFile;
|
||||||
|
private string? _imagePath;
|
||||||
private string _trackName = string.Empty;
|
private string _trackName = string.Empty;
|
||||||
private string _artist = string.Empty;
|
private string _artist = string.Empty;
|
||||||
private string _album = string.Empty;
|
private string _album = string.Empty;
|
||||||
@@ -81,6 +111,18 @@
|
|||||||
_errorMessage = null;
|
_errorMessage = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void HandleImageFileSelected(InputFileChangeEventArgs e)
|
||||||
|
{
|
||||||
|
_selectedImageFile = e.File;
|
||||||
|
_imagePath = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ClearImage()
|
||||||
|
{
|
||||||
|
_selectedImageFile = null;
|
||||||
|
_imagePath = null;
|
||||||
|
}
|
||||||
|
|
||||||
private async Task SubmitAsync()
|
private async Task SubmitAsync()
|
||||||
{
|
{
|
||||||
_errorMessage = null;
|
_errorMessage = null;
|
||||||
@@ -130,6 +172,21 @@
|
|||||||
_isUploading = true;
|
_isUploading = true;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// Upload any selected cover art first; abort the submit if it fails so we never
|
||||||
|
// create a track expecting an image that was never stored in the vault.
|
||||||
|
if (_selectedImageFile is { } imgFile)
|
||||||
|
{
|
||||||
|
await using var imgStream = imgFile.OpenReadStream(maxAllowedSize: 50_000_000);
|
||||||
|
var imgResult = await CmsTrackService.UploadImageAsync(imgStream, imgFile.Name, imgFile.ContentType);
|
||||||
|
if (!imgResult.Success)
|
||||||
|
{
|
||||||
|
var imgError = imgResult.Messages.FirstOrDefault()?.Message ?? "Unknown error";
|
||||||
|
_errorMessage = $"Image upload failed: {imgError}";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_imagePath = imgResult.Value;
|
||||||
|
}
|
||||||
|
|
||||||
// OpenReadStream streams chunks from the browser via the SignalR circuit; the
|
// OpenReadStream streams chunks from the browser via the SignalR circuit; the
|
||||||
// service wraps it in StreamContent so the whole file is never materialised in
|
// service wraps it in StreamContent so the whole file is never materialised in
|
||||||
// memory before DeepDrftAPI receives it.
|
// memory before DeepDrftAPI receives it.
|
||||||
@@ -149,6 +206,26 @@
|
|||||||
|
|
||||||
if (result.Success)
|
if (result.Success)
|
||||||
{
|
{
|
||||||
|
// The upload endpoint does not accept an imagePath, so link the cover art with a
|
||||||
|
// follow-up metadata update — same two-step pattern TrackEdit uses.
|
||||||
|
if (_imagePath is { } imgPath && result.Value is { } created)
|
||||||
|
{
|
||||||
|
var linkResult = await CmsTrackService.UpdateAsync(
|
||||||
|
created.Id,
|
||||||
|
_trackName,
|
||||||
|
_artist,
|
||||||
|
string.IsNullOrWhiteSpace(_album) ? null : _album,
|
||||||
|
string.IsNullOrWhiteSpace(_genre) ? null : _genre,
|
||||||
|
string.IsNullOrWhiteSpace(_releaseDate) ? null : (DateOnly?)DateOnly.ParseExact(_releaseDate, "yyyy-MM-dd"),
|
||||||
|
imgPath);
|
||||||
|
if (!linkResult.Success)
|
||||||
|
{
|
||||||
|
// Track was created; image is in the vault but unlinked. Non-blocking —
|
||||||
|
// the user can attach it via Edit.
|
||||||
|
Snackbar.Add("Track uploaded, but cover art could not be linked. You can add it via Edit.", Severity.Warning);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Snackbar.Add($"Uploaded '{_trackName}'.", Severity.Success);
|
Snackbar.Add($"Uploaded '{_trackName}'.", Severity.Success);
|
||||||
Navigation.NavigateTo("/tracks");
|
Navigation.NavigateTo("/tracks");
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user