Skip to content

Commit c92ac7b

Browse files
NeoCoderMatrix86NeoCoderMatrix86
authored
Merge pull request #501 from NeoCoderMatrix86/448-download-large-audiofile-causes-the-application-to-hang-while-waiting-for-the-download
Remove download file button
2 parents 15479e2 + a01aaeb commit c92ac7b

5 files changed

Lines changed: 8 additions & 42 deletions

File tree

‎AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,18 @@ along with Foobar. If not, see
2727
@if (Cuesheet != null)
2828
{
2929
<MudForm @ref="form" Model="Cuesheet">
30-
<MudTextField @bind-Value="Cuesheet.Artist" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" Placeholder="@_localizer["Enter the cuesheet artist here"]" Variant="Variant.Outlined" />
31-
<MudTextField @bind-Value="Cuesheet.Title" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]" Placeholder="@_localizer["Enter the cuesheet title here"]" Variant="Variant.Outlined" />
30+
<MudTextField @bind-Value="Cuesheet.Artist" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]"
31+
Placeholder="@_localizer["Enter the cuesheet artist here"]" Variant="Variant.Outlined" />
32+
<MudTextField @bind-Value="Cuesheet.Title" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
33+
Placeholder="@_localizer["Enter the cuesheet title here"]" Variant="Variant.Outlined" />
3234
@switch(CurrentViewMode)
3335
{
3436
case ViewMode.ImportView:
3537
case ViewMode.DetailView:
36-
<FileInput Id="@fileInputAudiofileId" Label="@_localizer["Audiofile"]" FileName="@Cuesheet.Audiofile?.Name" OnFileSelected="OnAudiofileSelected" Error="@fileInputAudiofileErrorText" Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" DisplayDownloadFile
37-
OnDownloadFileClicked="DownloadAudio" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" FileDownloadDisabled="Cuesheet.Audiofile != null ? Cuesheet.Audiofile.IsContentStreamLoaded == false : true" />
38-
<FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile" Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
38+
<FileInput Id="@fileInputAudiofileId" Label="@_localizer["Audiofile"]" FileName="@Cuesheet.Audiofile?.Name" OnFileSelected="OnAudiofileSelected" Error="@fileInputAudiofileErrorText"
39+
Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" />
40+
<FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile"
41+
Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
3942
<MudTextField @ref="catalogueNumberTextField" @bind-Value="catalogueNumber" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
4043
Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined"
4144
Mask="@(new PatternMask("00 00000 00000 0"))" OnBlur="CataloguenumberOnBlur" />
@@ -162,15 +165,6 @@ along with Foobar. If not, see
162165
}
163166
}
164167

165-
async Task DownloadAudio()
166-
{
167-
var contentStream = Cuesheet?.Audiofile?.ContentStream;
168-
if (contentStream != null)
169-
{
170-
await _blazorDownloadFileService.DownloadFile(Cuesheet?.Audiofile?.Name, contentStream, Cuesheet?.Audiofile?.AudioCodec?.MimeType);
171-
}
172-
}
173-
174168
async Task CDTextFileRename()
175169
{
176170
var newFileName = await ShowInputDialog(Cuesheet?.CDTextfile?.Name);

‎AudioCuesheetEditor/Shared/Inputs/FileInput.de.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="Download file" xml:space="preserve">
121-
<value>Datei herunterladen</value>
122-
</data>
123120
<data name="No file selected" xml:space="preserve">
124121
<value>Keine Datei ausgewählt</value>
125122
</data>

‎AudioCuesheetEditor/Shared/Inputs/FileInput.razor‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ along with Foobar. If not, see
3434
@if (DisplayMenu)
3535
{
3636
<MudMenu Icon="@Icons.Material.Outlined.MoreVert" Color="Color.Inherit" Class="mt-1" Style="height: 56px;" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.TopRight" Variant="Variant.Filled">
37-
@if (DisplayDownloadFile)
38-
{
39-
<MudMenuItem Icon="@Icons.Material.Outlined.FileDownload" Disabled="FileDownloadDisabled" OnClick="() => OnDownloadFileClicked.InvokeAsync(selectedFile)">@_localizer["Download file"]</MudMenuItem>
40-
}
4137
<MudMenuItem Icon="@Icons.Material.Outlined.EditAttributes" Disabled="FileRenameDisabled" OnClick="() => OnFileRenameClicked.InvokeAsync(selectedFile)">@_localizer["Rename file"]</MudMenuItem>
4238
</MudMenu>
4339
}
@@ -55,18 +51,12 @@ along with Foobar. If not, see
5551
[Parameter]
5652
public EventCallback<IBrowserFile?> OnFileSelected { get; set; }
5753

58-
[Parameter]
59-
public EventCallback<IBrowserFile?> OnDownloadFileClicked { get; set; }
60-
6154
[Parameter]
6255
public EventCallback<IBrowserFile?> OnFileRenameClicked { get; set; }
6356

6457
[Parameter]
6558
public Boolean FileRenameDisabled { get; set; }
6659

67-
[Parameter]
68-
public Boolean FileDownloadDisabled { get; set; }
69-
7060
[Parameter]
7161
public String Id { get; set; } = $"FileInput_{Guid.NewGuid()}";
7262

@@ -79,9 +69,6 @@ along with Foobar. If not, see
7969
[Parameter]
8070
public String? FileName { get; set; }
8171

82-
[Parameter]
83-
public Boolean DisplayDownloadFile { get; set; } = false;
84-
8572
[Parameter]
8673
public Boolean DisplayMenu { get; set; } = true;
8774

‎AudioCuesheetEditor/Shared/Inputs/FileInput.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="Download file" xml:space="preserve">
121-
<value>Download file</value>
122-
</data>
123120
<data name="No file selected" xml:space="preserve">
124121
<value>No file selected</value>
125122
</data>

‎AudioCuesheetEditor/Shared/Record/ControlRecording.razor‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,4 @@ along with Foobar. If not, see
155155
recordTimerStarted = DateTime.Now;
156156
}
157157
}
158-
159-
void DownloadAudio()
160-
{
161-
var audioFile = Cuesheet?.Audiofile;
162-
if (audioFile != null)
163-
{
164-
_blazorDownloadFileService.DownloadFile(audioFile.Name, audioFile.ContentStream, audioFile.AudioCodec?.MimeType);
165-
}
166-
}
167158
}

0 commit comments

Comments
 (0)