From 3b5f3b67a7672a07896ce50a83a43d1b089a2ff0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Jul 2023 15:42:04 +0900
Subject: [PATCH] Tidy up and improve messaging on completion notification

---
 osu.Game/BackgroundBeatmapProcessor.cs | 40 +++++++++++---------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 9a2d029724..b3fb938f48 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -219,18 +219,20 @@ namespace osu.Game
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
 
-            ProgressNotification? notification = null;
-
             if (scoreIds.Count == 0)
                 return;
 
-            notificationOverlay?.Post(notification = new ProgressNotification { State = ProgressNotificationState.Active });
+            ProgressNotification notification = new ProgressNotification { State = ProgressNotificationState.Active };
 
-            int count = 0;
-            updateNotification();
+            notificationOverlay?.Post(notification);
+
+            int processedCount = 0;
 
             foreach (var id in scoreIds)
             {
+                notification.Text = $"Upgrading scores to new scoring algorithm ({processedCount} of {scoreIds.Count})";
+                notification.Progress = (float)processedCount / scoreIds.Count;
+
                 sleepIfRequired();
 
                 try
@@ -248,32 +250,24 @@ namespace osu.Game
                     });
 
                     Logger.Log($"Converted total score for score {id}");
+                    ++processedCount;
                 }
                 catch (Exception e)
                 {
                     Logger.Log($"Failed to convert total score for {id}: {e}");
                 }
-
-                ++count;
-                updateNotification();
             }
 
-            void updateNotification()
+            if (processedCount == scoreIds.Count)
             {
-                if (notification == null)
-                    return;
-
-                if (count == scoreIds.Count)
-                {
-                    notification.CompletionText = $"Total score updated for {scoreIds.Count} scores";
-                    notification.Progress = 1;
-                    notification.State = ProgressNotificationState.Completed;
-                }
-                else
-                {
-                    notification.Text = $"Total score updated for {count} of {scoreIds.Count} scores";
-                    notification.Progress = (float)count / scoreIds.Count;
-                }
+                notification.CompletionText = $"{processedCount} score(s) have been upgraded to the new scoring algorithm";
+                notification.Progress = 1;
+                notification.State = ProgressNotificationState.Completed;
+            }
+            else
+            {
+                notification.CompletionText = $"{processedCount} of {scoreIds.Count} score(s) have been upgraded to the new scoring algorithm. Check logs for issues with remaining scores.";
+                notification.State = ProgressNotificationState.Cancelled;
             }
         }