From 3f51626f07cd76c332518e277000f9931cd4ccee Mon Sep 17 00:00:00 2001
From: Salman Alshamrani <frenzibyte@gmail.com>
Date: Tue, 21 Jan 2025 02:20:48 -0500
Subject: [PATCH] Simplify code immensely

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 .../Sections/Maintenance/GeneralSettings.cs   | 15 +++---
 .../Maintenance/SystemFileImportComponent.cs  | 51 -------------------
 2 files changed, 9 insertions(+), 57 deletions(-)
 delete mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/SystemFileImportComponent.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 99b25808a1..47314dcafe 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
@@ -17,12 +19,13 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         protected override LocalisableString Header => CommonStrings.General;
 
-        private SystemFileImportComponent systemFileImport = null!;
+        private ISystemFileSelector? selector;
 
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game, GameHost host, IPerformFromScreenRunner? performer)
         {
-            Add(systemFileImport = new SystemFileImportComponent(game, host));
+            if ((selector = host.CreateSystemFileSelector(game.HandledExtensions.ToArray())) != null)
+                selector.Selected += f => Task.Run(() => game.Import(f.FullName));
 
             AddRange(new Drawable[]
             {
@@ -31,10 +34,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Text = DebugSettingsStrings.ImportFiles,
                     Action = () =>
                     {
-                        if (systemFileImport.PresentIfAvailable())
-                            return;
-
-                        performer?.PerformFromScreen(menu => menu.Push(new FileImportScreen()));
+                        if (selector != null)
+                            selector.Present();
+                        else
+                            performer?.PerformFromScreen(menu => menu.Push(new FileImportScreen()));
                     },
                 },
                 new SettingsButton
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/SystemFileImportComponent.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/SystemFileImportComponent.cs
deleted file mode 100644
index ded8c81891..0000000000
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/SystemFileImportComponent.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using System.Threading.Tasks;
-using osu.Framework.Graphics;
-using osu.Framework.Platform;
-
-namespace osu.Game.Overlays.Settings.Sections.Maintenance
-{
-    public partial class SystemFileImportComponent : Component
-    {
-        private readonly OsuGameBase game;
-        private readonly GameHost host;
-
-        private ISystemFileSelector? selector;
-
-        public SystemFileImportComponent(OsuGameBase game, GameHost host)
-        {
-            this.game = game;
-            this.host = host;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            selector = host.CreateSystemFileSelector(game.HandledExtensions.ToArray());
-
-            if (selector != null)
-                selector.Selected += f => Schedule(() => startImport(f.FullName));
-        }
-
-        public bool PresentIfAvailable()
-        {
-            if (selector == null)
-                return false;
-
-            selector.Present();
-            return true;
-        }
-
-        private void startImport(string path)
-        {
-            Task.Factory.StartNew(async () =>
-            {
-                await game.Import(path).ConfigureAwait(false);
-            }, TaskCreationOptions.LongRunning);
-        }
-    }
-}