From 8cbd3443308f08941e7b670516ed25355665e948 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 5 Sep 2022 11:28:12 +0900
Subject: [PATCH] Improve performance when cancelling import with debugger
 attached

---
 .../Database/RealmArchiveModelImporter.cs     | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Database/RealmArchiveModelImporter.cs b/osu.Game/Database/RealmArchiveModelImporter.cs
index b340d0ee4b..f1bc0bfe0e 100644
--- a/osu.Game/Database/RealmArchiveModelImporter.cs
+++ b/osu.Game/Database/RealmArchiveModelImporter.cs
@@ -108,47 +108,42 @@ namespace osu.Game.Database
 
             bool isBatchImport = tasks.Length >= minimum_items_considered_batch_import;
 
-            try
+            await Task.WhenAll(tasks.Select(async task =>
             {
-                await Task.WhenAll(tasks.Select(async task =>
+                if (notification.CancellationToken.IsCancellationRequested)
+                    return;
+
+                try
                 {
-                    notification.CancellationToken.ThrowIfCancellationRequested();
+                    var model = await Import(task, isBatchImport, notification.CancellationToken).ConfigureAwait(false);
 
-                    try
+                    lock (imported)
                     {
-                        var model = await Import(task, isBatchImport, notification.CancellationToken).ConfigureAwait(false);
+                        if (model != null)
+                            imported.Add(model);
+                        current++;
 
-                        lock (imported)
-                        {
-                            if (model != null)
-                                imported.Add(model);
-                            current++;
+                        notification.Text = $"Imported {current} of {tasks.Length} {HumanisedModelName}s";
+                        notification.Progress = (float)current / tasks.Length;
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
+                }
+            })).ConfigureAwait(false);
 
-                            notification.Text = $"Imported {current} of {tasks.Length} {HumanisedModelName}s";
-                            notification.Progress = (float)current / tasks.Length;
-                        }
-                    }
-                    catch (TaskCanceledException)
-                    {
-                        throw;
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
-                    }
-                })).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
+            if (imported.Count == 0)
             {
-                if (imported.Count == 0)
+                if (notification.CancellationToken.IsCancellationRequested)
                 {
                     notification.State = ProgressNotificationState.Cancelled;
                     return imported;
                 }
-            }
 
-            if (imported.Count == 0)
-            {
                 notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed!";
                 notification.State = ProgressNotificationState.Cancelled;
             }