claunia/romrepomgr
1
0
Fork 0
mirror of https://github.com/claunia/romrepomgr.git synced 2025-12-16 11:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Blazor] Move importing DAT to single thread.

Browse Source 
Does not take so much longer, but UX is much improved.
This commit is contained in:
Natalia Portillo
2025-07-27 12:16:39 +01:00
parent e1ced26bc5
commit a290996037
2 changed files with 130 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
RomRepoMgr.Blazor/Components/Dialogs/ImportDats.razor
View File

@@ -3,13 +3,22 @@
<FluentDialog Width="800px" Height="400px" Title="Import DATs" Modal="true" TrapFocus="true">
<FluentDialogBody>
<p hidden="@IsBusy">DAT files will be imported from @path.</p>
<FluentLabel Color="@StatusColor">@StatusMessage</FluentLabel>
<FluentProgress Max="@ProgressMax" Min="@ProgressMin" Value="@ProgressValue" Visible="@ProgressVisible"/>
<div>
<p hidden="@IsBusy">DAT files will be imported from @path.</p>
<FluentLabel Color="@StatusColor">@StatusMessage</FluentLabel>
<FluentProgress Max="@ProgressMax" Min="@ProgressMin" Value="@ProgressValue" Visible="@ProgressVisible"/>
</div>
@if(Progress2Visible)
{
<div>
<p>@StatusMessage2</p>
<FluentProgress Max="@Progress2Max" Min="@Progress2Min" Value="@Progress2Value"/>
</div>
}
</FluentDialogBody>
<FluentDialogFooter>
<FluentStack Orientation="Orientation.Horizontal">
<FluentButton OnClick="@StartAsync" Disabled="@IsBusy">Start</FluentButton>
<FluentButton OnClick="@Start" Disabled="@IsBusy">Start</FluentButton>
<FluentButton OnClick="@CloseAsync" Disabled="@CannotClose">Close</FluentButton>
</FluentStack>
</FluentDialogFooter>

161
RomRepoMgr.Blazor/Components/Dialogs/ImportDats.razor.cs
View File

@@ -1,9 +1,11 @@
using System.Diagnostics;
using Microsoft.AspNetCore.Components;
using Microsoft.FluentUI.AspNetCore.Components;
using RomRepoMgr.Core.EventArgs;
using RomRepoMgr.Core.Workers;
using Serilog;
using Serilog.Extensions.Logging;
using ErrorEventArgs = RomRepoMgr.Core.EventArgs.ErrorEventArgs;
namespace RomRepoMgr.Blazor.Components.Dialogs;
@@ -17,27 +19,34 @@ public partial class ImportDats : ComponentBase
public string StatusMessage { get; set; }
public bool IsBusy { get; set; }
[CascadingParameter]
public FluentDialog Dialog { get; set; }
public int? ProgressMax { get; set; }
public int? ProgressMin { get; set; }
public int? ProgressValue { get; set; }
public bool CannotClose { get; set; }
public bool ProgressVisible { get; set; }
public Color? StatusColor { get; set; }
public FluentDialog Dialog { get; set; }
public int? ProgressMax { get; set; }
public int? ProgressMin { get; set; }
public int? ProgressValue { get; set; }
public bool CannotClose { get; set; }
public bool ProgressVisible { get; set; }
public string StatusMessage2 { get; set; }
public bool Progress2Visible { get; set; }
public int? Progress2Max { get; set; }
public int? Progress2Min { get; set; }
public int? Progress2Value { get; set; }
public Color? StatusColor { get; set; }
/// <inheritdoc />
protected override void OnInitialized()
{
base.OnInitialized();
path = Path.Combine(Environment.CurrentDirectory, Consts.IncomingDatFolder);
StatusMessage = string.Empty;
IsBusy = false;
CannotClose = false;
ProgressVisible = false;
path = Path.Combine(Environment.CurrentDirectory, Consts.IncomingDatFolder);
StatusMessage = "";
StatusMessage2 = "";
IsBusy = false;
CannotClose = false;
ProgressVisible = false;
Progress2Visible = false;
}
Task StartAsync()
void Start()
{
IsBusy = true;
CannotClose = true;
@@ -59,49 +68,113 @@ public partial class ImportDats : ComponentBase
StatusMessage = string.Format("Found {0} files...", _datFiles.Length);
ProgressMin = 0;
ProgressMax = _datFiles.Length;
ProgressValue = 0;
_listPosition = 0;
_workers = 0;
ProgressMin = 0;
ProgressMax = _datFiles.Length;
ProgressValue = 0;
Progress2Visible = true;
_listPosition = 0;
_workers = 0;
StateHasChanged();
return ImportAsync();
}
async Task ImportAsync()
{
_stopwatch.Restart();
Logger.LogDebug("Starting to import DAT files...");
Import();
}
Parallel.ForEach(_datFiles,
datFile =>
{
_ = InvokeAsync(() =>
{
StatusMessage = string.Format("Importing {0}...", Path.GetFileName(datFile));
void Import()
{
if(_listPosition >= _datFiles.Length)
{
_ = InvokeAsync(() =>
{
ProgressVisible = false;
Progress2Visible = false;
StatusMessage = "Finished";
CannotClose = false;
ProgressValue = _listPosition;
StateHasChanged();
});
StateHasChanged();
});
var worker = new DatImporter(datFile, null, new SerilogLoggerFactory(Log.Logger));
_stopwatch.Stop();
worker.Import();
Logger.LogDebug("Took {TotalSeconds} seconds to import {Length} DAT files",
_stopwatch.Elapsed.TotalSeconds,
_datFiles.Length);
Interlocked.Increment(ref _listPosition);
});
ProgressVisible = false;
StatusMessage = "Finished";
CannotClose = false;
_stopwatch.Stop();
return;
}
Logger.LogDebug("Took {TotalSeconds} seconds to import {Length} DAT files",
_stopwatch.Elapsed.TotalSeconds,
_datFiles.Length);
_ = InvokeAsync(() =>
{
StatusMessage = string.Format("Importing {0}...", Path.GetFileName(_datFiles[_listPosition]));
ProgressValue = _listPosition;
StateHasChanged();
StateHasChanged();
});
var worker = new DatImporter(_datFiles[_listPosition], null, new SerilogLoggerFactory(Log.Logger));
worker.ErrorOccurred += OnWorkerOnErrorOccurred;
worker.SetIndeterminateProgress += OnWorkerOnSetIndeterminateProgress;
worker.SetMessage += OnWorkerOnSetMessage;
worker.SetProgress += OnWorkerOnSetProgress;
worker.SetProgressBounds += OnWorkerOnSetProgressBounds;
worker.WorkFinished += OnWorkerOnWorkFinished;
_ = Task.Run(worker.Import);
}
void OnWorkerOnWorkFinished(object? sender, MessageEventArgs args)
{
_listPosition++;
Import();
}
void OnWorkerOnSetProgressBounds(object? sender, ProgressBoundsEventArgs args)
{
_ = InvokeAsync(() =>
{
Progress2Value = 0;
Progress2Max = (int?)args.Maximum;
Progress2Min = (int?)args.Minimum;
StateHasChanged();
});
}
void OnWorkerOnSetProgress(object? sender, ProgressEventArgs args)
{
_ = InvokeAsync(() =>
{
Progress2Value = (int?)args.Value;
StateHasChanged();
});
}
void OnWorkerOnSetMessage(object? sender, MessageEventArgs args)
{
_ = InvokeAsync(() =>
{
StatusMessage2 = args.Message;
StateHasChanged();
});
}
void OnWorkerOnSetIndeterminateProgress(object? sender, EventArgs args)
{
_ = InvokeAsync(() =>
{
Progress2Value = null;
StateHasChanged();
});
}
void OnWorkerOnErrorOccurred(object? sender, ErrorEventArgs args)
{
_ = InvokeAsync(() =>
{
_listPosition++;
Import();
});
}
Task CloseAsync() => Dialog.CloseAsync();