From 7aaaf7fca2d598998d7c407a3b259db985484b06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Feb 2023 16:55:35 +0900
Subject: [PATCH] Combine and attempt to simplify the score import /
 preparation process further

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs |  3 +
 osu.Game/Screens/Play/Player.cs             | 82 ++++++++++-----------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index a5e442b7de..7bf0482673 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Rulesets.UI
         {
             set
             {
+                if (value == recorder)
+                    return;
+
                 if (value != null && recorder != null)
                     throw new InvalidOperationException("Cannot attach more than one recorder");
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0825f36a0a..bc453d2151 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -276,7 +276,7 @@ namespace osu.Game.Screens.Play
                 },
                 FailOverlay = new FailOverlay
                 {
-                    SaveReplay = prepareAndImportScore,
+                    SaveReplay = async () => await prepareAndImportScoreAsync(true).ConfigureAwait(false),
                     OnRetry = () => Restart(),
                     OnQuit = () => PerformExit(true),
                 },
@@ -614,7 +614,7 @@ namespace osu.Game.Screens.Play
             resultsDisplayDelegate?.Cancel();
 
             // import current score if possible.
-            attemptScoreImport();
+            prepareAndImportScoreAsync();
 
             // The actual exit is performed if
             // - the pause / fail dialog was not requested
@@ -772,10 +772,7 @@ namespace osu.Game.Screens.Play
                 if (prepareScoreForDisplayTask == null)
                 {
                     // Try importing score since the task hasn't been invoked yet.
-                    if (!attemptScoreImport())
-                        // If attempt failed, trying again is unnecessary
-                        resultsDisplayDelegate?.Cancel();
-
+                    prepareAndImportScoreAsync();
                     return;
                 }
 
@@ -785,6 +782,12 @@ namespace osu.Game.Screens.Play
 
                 resultsDisplayDelegate?.Cancel();
 
+                if (prepareScoreForDisplayTask.GetResultSafely() == null)
+                {
+                    // If score import did not occur, we do not want to show the results screen.
+                    return;
+                }
+
                 if (!this.IsCurrentScreen())
                     // This player instance may already be in the process of exiting.
                     return;
@@ -796,53 +799,48 @@ namespace osu.Game.Screens.Play
         }
 
         /// <summary>
-        /// Attempts to run <see cref="prepareAndImportScore"/>
+        /// Asynchronously run score preparation operations (database import, online submission etc.).
         /// </summary>
-        /// <returns>
-        /// Whether the attempt was successful
-        /// </returns>
-        private bool attemptScoreImport()
+        /// <param name="forceImport">Whether the score should be imported even if non-passing (or the current configuration doesn't allow for it).</param>
+        /// <returns>The final score.</returns>
+        [ItemCanBeNull]
+        private Task<ScoreInfo> prepareAndImportScoreAsync(bool forceImport = false)
         {
             // Ensure we are not writing to the replay any more, as we are about to consume and store the score.
             DrawableRuleset.SetRecordTarget(null);
 
+            if (prepareScoreForDisplayTask != null)
+                return prepareScoreForDisplayTask;
+
             // We do not want to import the score in cases where we don't show results
             bool canShowResults = Configuration.ShowResults && ScoreProcessor.HasCompleted.Value && GameplayState.HasPassed;
-            if (!canShowResults)
-                return false;
+            if (!canShowResults && !forceImport)
+                return Task.FromResult<ScoreInfo>(null);
 
-            prepareScoreForDisplayTask ??= Task.Run(prepareAndImportScore);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Asynchronously run score preparation operations (database import, online submission etc.).
-        /// </summary>
-        /// <returns>The final score.</returns>
-        private async Task<ScoreInfo> prepareAndImportScore()
-        {
-            var scoreCopy = Score.DeepClone();
-
-            try
+            return prepareScoreForDisplayTask = Task.Run(async () =>
             {
-                await PrepareScoreForResultsAsync(scoreCopy).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error(ex, @"Score preparation failed!");
-            }
+                var scoreCopy = Score.DeepClone();
 
-            try
-            {
-                await ImportScore(scoreCopy).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error(ex, @"Score import failed!");
-            }
+                try
+                {
+                    await PrepareScoreForResultsAsync(scoreCopy).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, @"Score preparation failed!");
+                }
 
-            return scoreCopy.ScoreInfo;
+                try
+                {
+                    await ImportScore(scoreCopy).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, @"Score import failed!");
+                }
+
+                return scoreCopy.ScoreInfo;
+            });
         }
 
         protected override bool OnScroll(ScrollEvent e)