h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:52:54 +08:00
Code Issues Releases Wiki Activity

Add helper method to handle progress notifications for background jobs

Browse Source
This commit is contained in:
Dean Herbert 2023-12-18 18:17:47 +09:00
parent 27ae7d77f4
commit 7462a9f4ab
No known key found for this signature in database
1 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
osu.Game/BackgroundDataStoreProcessor.cs
View File

@ -279,20 +279,17 @@ namespace osu.Game
if (scoreIds.Count == 0) if (scoreIds.Count == 0)
return; return;
ProgressNotification notification = new ProgressNotification { State = ProgressNotificationState.Active }; var notification = showProgressNotification("Upgrading scores to new scoring algorithm", "scores have been upgraded to the new scoring algorithm");
notificationOverlay?.Post(notification);
int processedCount = 0; int processedCount = 0;
int failedCount = 0; int failedCount = 0;
foreach (var id in scoreIds) foreach (var id in scoreIds)
{ {
if (notification.State == ProgressNotificationState.Cancelled) if (notification?.State == ProgressNotificationState.Cancelled)
break; break;
notification.Text = $"Upgrading scores to new scoring algorithm ({processedCount} of {scoreIds.Count})"; updateNotificationProgress(notification, processedCount, scoreIds.Count);
notification.Progress = (float)processedCount / scoreIds.Count;
sleepIfRequired(); sleepIfRequired();
@ -325,24 +322,58 @@ namespace osu.Game
} }
} }
if (processedCount == scoreIds.Count) completeNotification(notification, processedCount, scoreIds.Count, failedCount);
}
private void updateNotificationProgress(ProgressNotification? notification, int processedCount, int totalCount)
{
if (notification == null)
return;
notification.Text = notification.Text.ToString().Split('(').First().TrimEnd() + $" ({processedCount} of {totalCount})";
notification.Progress = (float)processedCount / totalCount;
}
private void completeNotification(ProgressNotification? notification, int processedCount, int totalCount, int? failedCount = null)
{
if (notification == null)
return;
if (processedCount == totalCount)
{ {
notification.CompletionText = $"{processedCount} score(s) have been upgraded to the new scoring algorithm"; notification.CompletionText = $"{processedCount} {notification.CompletionText}";
notification.Progress = 1; notification.Progress = 1;
notification.State = ProgressNotificationState.Completed; notification.State = ProgressNotificationState.Completed;
} }
else else
{ {
notification.Text = $"{processedCount} of {scoreIds.Count} score(s) have been upgraded to the new scoring algorithm."; notification.Text = $"{processedCount} of {totalCount} {notification.CompletionText}";
// We may have arrived here due to user cancellation or completion with failures. // We may have arrived here due to user cancellation or completion with failures.
if (failedCount > 0) if (failedCount > 0)
notification.Text += $" Check logs for issues with {failedCount} failed upgrades."; notification.Text += $" Check logs for issues with {failedCount} failed items.";
notification.State = ProgressNotificationState.Cancelled; notification.State = ProgressNotificationState.Cancelled;
} }
} }
private ProgressNotification? showProgressNotification(string running, string completed)
{
if (notificationOverlay == null)
return null;
ProgressNotification notification = new ProgressNotification
{
Text = running,
CompletionText = completed,
State = ProgressNotificationState.Active
};
notificationOverlay?.Post(notification);
return notification;
}
private void sleepIfRequired() private void sleepIfRequired()
{ {
while (localUserPlayInfo?.IsPlaying.Value == true) while (localUserPlayInfo?.IsPlaying.Value == true)