From 07642546bbc47357a8adc6d3416824f2eaf88f39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Mar 2018 10:42:58 +0900
Subject: [PATCH] Make APIAccess a component

---
 osu.Game/Online/API/APIAccess.cs          | 24 ++++-------------------
 osu.Game/Online/API/APIDownloadRequest.cs |  2 +-
 osu.Game/Online/API/IAPIProvider.cs       |  3 +--
 osu.Game/OsuGameBase.cs                   | 24 +++++++----------------
 osu.Game/Overlays/Direct/DirectPanel.cs   |  2 +-
 5 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 91b77dcf1f..22498d229d 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -8,15 +8,15 @@
 using System.Net;
 using System.Threading;
 using osu.Framework.Configuration;
+using osu.Framework.Graphics;
 using osu.Framework.Logging;
-using osu.Framework.Threading;
 using osu.Game.Configuration;
 using osu.Game.Online.API.Requests;
 using osu.Game.Users;
 
 namespace osu.Game.Online.API
 {
-    public class APIAccess : IAPIProvider, IDisposable
+    public class APIAccess : Component, IAPIProvider
     {
         private readonly OsuConfigManager config;
         private readonly OAuth authentication;
@@ -27,8 +27,6 @@ public class APIAccess : IAPIProvider, IDisposable
 
         private ConcurrentQueue<APIRequest> queue = new ConcurrentQueue<APIRequest>();
 
-        public readonly Scheduler Scheduler = new Scheduler();
-
         /// <summary>
         /// The username/email provided by the user when initiating a login.
         /// </summary>
@@ -306,27 +304,13 @@ public void Logout(bool clearUsername = true)
             Id = 1,
         };
 
-        public void Update()
+        protected override void Dispose(bool isDisposing)
         {
-            Scheduler.Update();
-        }
+            base.Dispose(isDisposing);
 
-        private void dispose()
-        {
             config.Set(OsuSetting.Token, config.Get<bool>(OsuSetting.SavePassword) ? Token : string.Empty);
             config.Save();
         }
-
-        public void Dispose()
-        {
-            dispose();
-            GC.SuppressFinalize(this);
-        }
-
-        ~APIAccess()
-        {
-            dispose();
-        }
     }
 
     public enum APIState
diff --git a/osu.Game/Online/API/APIDownloadRequest.cs b/osu.Game/Online/API/APIDownloadRequest.cs
index 2dff07a847..2c6a4e02ba 100644
--- a/osu.Game/Online/API/APIDownloadRequest.cs
+++ b/osu.Game/Online/API/APIDownloadRequest.cs
@@ -14,7 +14,7 @@ protected override WebRequest CreateWebRequest()
             return request;
         }
 
-        private void request_Progress(long current, long total) => API.Scheduler.Add(delegate { Progress?.Invoke(current, total); });
+        private void request_Progress(long current, long total) => Progress?.Invoke(current, total);
 
         protected APIDownloadRequest()
         {
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index b3c8774209..4119691c85 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -1,13 +1,12 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Configuration;
 using osu.Game.Users;
 
 namespace osu.Game.Online.API
 {
-    public interface IAPIProvider : IUpdateable
+    public interface IAPIProvider
     {
         /// <summary>
         /// The local user.
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a3e4d34659..45fd45b4b5 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -56,8 +56,6 @@ public class OsuGameBase : Framework.Game, ICanAcceptFiles
 
         protected override string MainResourceFile => @"osu.Game.Resources.dll";
 
-        public APIAccess API;
-
         private Container content;
 
         protected override Container<Drawable> Content => content;
@@ -108,12 +106,14 @@ private void load()
 
             dependencies.Cache(SkinManager = new SkinManager(Host.Storage, contextFactory, Host, Audio));
 
-            dependencies.Cache(API = new APIAccess(LocalConfig));
-            dependencies.CacheAs<IAPIProvider>(API);
+            var api = new APIAccess(LocalConfig);
+
+            dependencies.Cache(api);
+            dependencies.CacheAs<IAPIProvider>(api);
 
             dependencies.Cache(RulesetStore = new RulesetStore(contextFactory));
             dependencies.Cache(FileStore = new FileStore(contextFactory, Host.Storage));
-            dependencies.Cache(BeatmapManager = new BeatmapManager(Host.Storage, contextFactory, RulesetStore, API, Host));
+            dependencies.Cache(BeatmapManager = new BeatmapManager(Host.Storage, contextFactory, RulesetStore, api, Host));
             dependencies.Cache(ScoreStore = new ScoreStore(Host.Storage, contextFactory, Host, BeatmapManager, RulesetStore));
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
@@ -180,6 +180,8 @@ private void load()
             };
 
             FileStore.Cleanup();
+
+            AddInternal(api);
         }
 
         private void runMigrations()
@@ -237,18 +239,6 @@ public override void SetHost(GameHost host)
             base.SetHost(host);
         }
 
-        protected override void Update()
-        {
-            base.Update();
-            API.Update();
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            API.Dispose();
-        }
-
         private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();
 
         public void Import(params string[] paths)
diff --git a/osu.Game/Overlays/Direct/DirectPanel.cs b/osu.Game/Overlays/Direct/DirectPanel.cs
index e0d806c90f..cba63b4a49 100644
--- a/osu.Game/Overlays/Direct/DirectPanel.cs
+++ b/osu.Game/Overlays/Direct/DirectPanel.cs
@@ -186,7 +186,7 @@ private void attachDownload(DownloadBeatmapSetRequest request)
                 progressBar.FadeOut(500);
             };
 
-            request.DownloadProgressed += progress => progressBar.Current.Value = progress;
+            request.DownloadProgressed += progress => Schedule(() => progressBar.Current.Value = progress);
 
             request.Success += data =>
             {