From d9034eab26e8abe8698a4de5feacd1be0ae8ecff Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:54:54 +0300
Subject: [PATCH 01/32] Make model manager in `DownloadTrackingComposite`
 protected

---
 osu.Game/Online/DownloadTrackingComposite.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 7a64c9002d..4e52761813 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online
         protected readonly Bindable<TModel> Model = new Bindable<TModel>();
 
         [Resolved(CanBeNull = true)]
-        private TModelManager manager { get; set; }
+        protected TModelManager Manager { get; private set; }
 
         /// <summary>
         /// Holds the current download state of the <typeparamref name="TModel"/>, whether is has already been downloaded, is in progress, or is not downloaded.
@@ -49,19 +49,19 @@ namespace osu.Game.Online
                 else if (manager?.IsAvailableLocally(modelInfo.NewValue) == true)
                     State.Value = DownloadState.LocallyAvailable;
                 else
-                    attachDownload(manager?.GetExistingDownload(modelInfo.NewValue));
+                    attachDownload(Manager?.GetExistingDownload(modelInfo.NewValue));
             }, true);
 
-            if (manager == null)
+            if (Manager == null)
                 return;
 
-            managerDownloadBegan = manager.DownloadBegan.GetBoundCopy();
+            managerDownloadBegan = Manager.DownloadBegan.GetBoundCopy();
             managerDownloadBegan.BindValueChanged(downloadBegan);
-            managerDownloadFailed = manager.DownloadFailed.GetBoundCopy();
+            managerDownloadFailed = Manager.DownloadFailed.GetBoundCopy();
             managerDownloadFailed.BindValueChanged(downloadFailed);
-            managedUpdated = manager.ItemUpdated.GetBoundCopy();
+            managedUpdated = Manager.ItemUpdated.GetBoundCopy();
             managedUpdated.BindValueChanged(itemUpdated);
-            managerRemoved = manager.ItemRemoved.GetBoundCopy();
+            managerRemoved = Manager.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(itemRemoved);
         }
 

From 04d17aadfa4685f54e670b934e17fc3be3cf2b3e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:57:55 +0300
Subject: [PATCH 02/32] Add overridable method for verifying models in database

---
 osu.Game/Online/DownloadTrackingComposite.cs | 42 +++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 4e52761813..9dd8258e78 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
@@ -65,6 +66,15 @@ namespace osu.Game.Online
             managerRemoved.BindValueChanged(itemRemoved);
         }
 
+        /// <summary>
+        /// Verifies that the given databased model is in a correct state to be considered available.
+        /// </summary>
+        /// <example>
+        /// In the case of multiplayer/playlists, this has to verify that the databased beatmap set with the selected beatmap matches what's online.
+        /// </example>
+        /// <param name="databasedModel">The model in database.</param>
+        protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;
+
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {
             if (weakRequest.NewValue.TryGetTarget(out var request))
@@ -134,23 +144,35 @@ namespace osu.Game.Online
         private void itemUpdated(ValueChangedEvent<WeakReference<TModel>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                setDownloadStateFromManager(item, DownloadState.LocallyAvailable);
+            {
+                Schedule(() =>
+                {
+                    if (!item.Equals(Model.Value))
+                        return;
+
+                    if (!VerifyDatabasedModel(item))
+                    {
+                        State.Value = DownloadState.NotDownloaded;
+                        return;
+                    }
+
+                    State.Value = DownloadState.LocallyAvailable;
+                });
+            }
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<TModel>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                setDownloadStateFromManager(item, DownloadState.NotDownloaded);
+            {
+                Schedule(() =>
+                {
+                    if (item.Equals(Model.Value))
+                        State.Value = DownloadState.NotDownloaded;
+                });
+            }
         }
 
-        private void setDownloadStateFromManager(TModel s, DownloadState state) => Schedule(() =>
-        {
-            if (!s.Equals(Model.Value))
-                return;
-
-            State.Value = state;
-        });
-
         #region Disposal
 
         protected override void Dispose(bool isDisposing)

From 7ad8b167ccb2f73247f2506cace66b22ec333665 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:58:29 +0300
Subject: [PATCH 03/32] Add overridable method for checking local availability
 of current model

---
 osu.Game/Online/DownloadTrackingComposite.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 9dd8258e78..1631d9790b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Online
             {
                 if (modelInfo.NewValue == null)
                     attachDownload(null);
-                else if (manager?.IsAvailableLocally(modelInfo.NewValue) == true)
+                else if (IsModelAvailableLocally())
                     State.Value = DownloadState.LocallyAvailable;
                 else
                     attachDownload(Manager?.GetExistingDownload(modelInfo.NewValue));
@@ -75,6 +75,13 @@ namespace osu.Game.Online
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;
 
+        /// <summary>
+        /// Whether the given model is available in the database.
+        /// By default, this calls <see cref="IModelDownloader{TModel}.IsAvailableLocally"/>,
+        /// but can be overriden to add additional checks for verifying the model in database.
+        /// </summary>
+        protected virtual bool IsModelAvailableLocally() => Manager.IsAvailableLocally(Model.Value);
+
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {
             if (weakRequest.NewValue.TryGetTarget(out var request))

From da9c23f3478356b9183fecbe82d0d416c039a26d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:00:56 +0300
Subject: [PATCH 04/32] Add beatmap availability tracker component for
 multiplayer

---
 .../Online/Rooms/MultiplayerBeatmapTracker.cs | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
new file mode 100644
index 0000000000..b22d17f3ef
--- /dev/null
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -0,0 +1,89 @@
+// 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;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Online.Rooms
+{
+    public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    {
+        public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        /// <summary>
+        /// The availability state of the currently selected playlist item.
+        /// </summary>
+        public IBindable<BeatmapAvailability> Availability => availability;
+
+        private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
+
+        public MultiplayerBeatmapTracker()
+        {
+            State.BindValueChanged(_ => updateAvailability());
+            Progress.BindValueChanged(_ => updateAvailability());
+            updateAvailability();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedItem.BindValueChanged(item => Model.Value = item.NewValue?.Beatmap.Value.BeatmapSet, true);
+        }
+
+        protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
+        {
+            int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
+            string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
+
+            BeatmapInfo matchingBeatmap;
+
+            if (databasedSet.Beatmaps == null)
+            {
+                // The given databased beatmap set is not passed in a usable state to check with.
+                // Perform a full query instead, as per https://github.com/ppy/osu/pull/11415.
+                matchingBeatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+                return matchingBeatmap != null;
+            }
+
+            matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            return matchingBeatmap != null;
+        }
+
+        protected override bool IsModelAvailableLocally()
+        {
+            int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
+            string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
+
+            var beatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            return beatmap?.BeatmapSet.DeletePending == false;
+        }
+
+        private void updateAvailability()
+        {
+            switch (State.Value)
+            {
+                case DownloadState.NotDownloaded:
+                    availability.Value = BeatmapAvailability.NotDownloaded();
+                    break;
+
+                case DownloadState.Downloading:
+                    availability.Value = BeatmapAvailability.Downloading(Progress.Value);
+                    break;
+
+                case DownloadState.Importing:
+                    availability.Value = BeatmapAvailability.Importing();
+                    break;
+
+                case DownloadState.LocallyAvailable:
+                    availability.Value = BeatmapAvailability.LocallyAvailable();
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(State));
+            }
+        }
+    }
+}

From cf2378103656863879a08b9e2e2704bdffdebd03 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:02:30 +0300
Subject: [PATCH 05/32] Cache beatmap tracker and bind to selected item in
 `RoomSubScreen`

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2449563c73..c049d4be20 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -40,6 +40,17 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
+        [Cached]
+        protected readonly MultiplayerBeatmapTracker BeatmapTracker;
+
+        protected RoomSubScreen()
+        {
+            InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = SelectedItem },
+            };
+        }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {

From 96feaa027ded707f31ef18482aa0b632dad5627c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:06:54 +0300
Subject: [PATCH 06/32] Make `ArchiveModelManager` import method overridable
 (for testing purposes)

---
 osu.Game/Database/ArchiveModelManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 36cc4cce39..8502ab5965 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -308,7 +308,7 @@ namespace osu.Game.Database
         /// <param name="item">The model to be imported.</param>
         /// <param name="archive">An optional archive to use for model population.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
-        public async Task<TModel> Import(TModel item, ArchiveReader archive = null, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
+        public virtual async Task<TModel> Import(TModel item, ArchiveReader archive = null, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
         {
             cancellationToken.ThrowIfCancellationRequested();
 

From 4778686dc4b712e7c93a30661718fd383674fee2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:07:46 +0300
Subject: [PATCH 07/32] Expose method for triggering filename-backed success in
 `APIDownloadRequest`

Exactly like in `APIRequest<T>`
---
 osu.Game/Online/API/APIDownloadRequest.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIDownloadRequest.cs b/osu.Game/Online/API/APIDownloadRequest.cs
index 940b9b4803..02c589403c 100644
--- a/osu.Game/Online/API/APIDownloadRequest.cs
+++ b/osu.Game/Online/API/APIDownloadRequest.cs
@@ -1,6 +1,7 @@
 // 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;
 using System.IO;
 using osu.Framework.IO.Network;
 
@@ -28,13 +29,19 @@ namespace osu.Game.Online.API
 
         private void request_Progress(long current, long total) => API.Schedule(() => Progressed?.Invoke(current, total));
 
-        protected APIDownloadRequest()
+        internal void TriggerSuccess(string filename)
         {
-            base.Success += onSuccess;
+            if (this.filename != null)
+                throw new InvalidOperationException("Attempted to trigger success more than once");
+
+            this.filename = filename;
+
+            TriggerSuccess();
         }
 
-        private void onSuccess()
+        internal override void TriggerSuccess()
         {
+            base.TriggerSuccess();
             Success?.Invoke(filename);
         }
 

From 23c7afa573b6d9b8b0f4af49283224e2231394b7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:17:05 +0300
Subject: [PATCH 08/32] Expose method for setting progress of archive download
 request

---
 osu.Game/Online/API/ArchiveDownloadRequest.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index f1966aeb2b..bb57a7a5f8 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -18,7 +18,13 @@ namespace osu.Game.Online.API
         {
             Model = model;
 
-            Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total);
+            Progressed += (current, total) => SetProgress((float)current / total);
+        }
+
+        protected void SetProgress(float progress)
+        {
+            Progress = progress;
+            DownloadProgressed?.Invoke(progress);
         }
     }
 }

From adb2605d5d7ddb30fea80a5f289e28e3c357a8db Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:17:47 +0300
Subject: [PATCH 09/32] Enforce `double` type in the download progress path

Wasn't sure where to exactly put this, or whether to split it, but it's very small change to worry about, so I guess it's fine being here
---
 osu.Game/Online/API/ArchiveDownloadRequest.cs          |  8 ++++----
 osu.Game/Online/DownloadTrackingComposite.cs           |  2 +-
 .../Overlays/Notifications/ProgressNotification.cs     | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index bb57a7a5f8..fdb2a984dc 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -10,18 +10,18 @@ namespace osu.Game.Online.API
     {
         public readonly TModel Model;
 
-        public float Progress;
+        public double Progress { get; private set; }
 
-        public event Action<float> DownloadProgressed;
+        public event Action<double> DownloadProgressed;
 
         protected ArchiveDownloadRequest(TModel model)
         {
             Model = model;
 
-            Progressed += (current, total) => SetProgress((float)current / total);
+            Progressed += (current, total) => SetProgress((double)current / total);
         }
 
-        protected void SetProgress(float progress)
+        protected void SetProgress(double progress)
         {
             Progress = progress;
             DownloadProgressed?.Invoke(progress);
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 1631d9790b..b72cf38369 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Online
 
         private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Importing);
 
-        private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
+        private void onRequestProgress(double progress) => Schedule(() => Progress.Value = progress);
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 3105ecd742..e18bab8e83 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -23,9 +23,9 @@ namespace osu.Game.Overlays.Notifications
 
         public string CompletionText { get; set; } = "Task has completed!";
 
-        private float progress;
+        private double progress;
 
-        public float Progress
+        public double Progress
         {
             get => progress;
             set
@@ -185,9 +185,9 @@ namespace osu.Game.Overlays.Notifications
             private Color4 colourActive;
             private Color4 colourInactive;
 
-            private float progress;
+            private double progress;
 
-            public float Progress
+            public double Progress
             {
                 get => progress;
                 set
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.Notifications
                     if (progress == value) return;
 
                     progress = value;
-                    box.ResizeTo(new Vector2(progress, 1), 100, Easing.OutQuad);
+                    box.ResizeTo(new Vector2((float)progress, 1), 100, Easing.OutQuad);
                 }
             }
 

From f0602243bfa792f3880e9d083f1ddc67431a29cf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:30:01 +0300
Subject: [PATCH 10/32] Add beatmapset file containing the eaxct beatmap in
 `TestBeatmap` solely

---
 .../Resources/Archives/test-beatmap.osz          | Bin 0 -> 7286 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/test-beatmap.osz

diff --git a/osu.Game.Tests/Resources/Archives/test-beatmap.osz b/osu.Game.Tests/Resources/Archives/test-beatmap.osz
new file mode 100644
index 0000000000000000000000000000000000000000..f98fd2f8ffef0968270a1f2c7d75162de80417c9
GIT binary patch
literal 7286
zcma)BRa6vEy9JRFrMo+%k?uwux?|{W36WAjVu%48V(9MfMi2(1bCB+C7(hBM|GH22
z;a}^X?_r<)?fvbCv(DS60YG_8h=hcMf%K5attHDLX3|4}gk)-mgv9pJ1$?ozpjCJA
zq~)Yl^`%vD^R}U7)u*+mb)fa4wPB+*{%GN0ZNlZ|`6UME6i3;d^vEUsoGWD;yuxeN
zrxX}n;Y@i%il;aKu13ZjT<E=YI0@z<7dcdTzLD6C*X^sKFINiIPO+>%i0_E=9A`R2
z49_mB7vFE56!#aae;sc(YxI9S_*dTbh`9M2(ANHZf2iN}e22L7@$b05DF(q@HD1)O
z>iuTw{ee&0m-`W7Gle&If1BgXXtJavp9s3TxmQ-d-30``l;qKh)YB!HV*D%3_f`qX
zj946+?=W@Oo<sdrsqf-L)oyX)<Nd`nG|$)SIBr?7U%LVz?ST^C#J}I3d5KGQ1bz>=
zJMQmqFOCCc67N5qAwvCePmcG8FP34T&HI;7HJoSZ`xxKHgHgoE?eYFBJh{IZhP`>a
z3E$tmhd)zo<3xQ6^b>x%-rOuk_^#4qpGvMstUhLrj$ik~uDgz1X#ypnQqLFbm%%-1
zUjv^n!6Y<KkB4zz+ob~U_*O^*g;t-5H-ig6T_@jHGQG#eE+4Bm;mPn#*t!@Po#5i;
z-#!d+cHg}Et8e(^39)_lxCy%$e+d?jQ2&}OWo6Lr=6-s!?RyQn-vsRzD|Mh9et8}~
zx!BxYmI}PN1;KH~r6@02Cb!kya0F2~M!eA3gVPs`D`Vc?9PbxrtI>3>NIi$s1zw*V
z!<YBhrB1TqK*)UAS(4@mVKbke?7%|mrEw~3YS`n$?LOiJHa>+4xP79I{&y*nrk;JO
z-d`Nj>F(O`m<$J*ZGmq82HyO;IeS2@e%zrjJYH^pc_st{^YGEPD4FB@cQOcd3DTIZ
zf4JL!gjPq=YTAF@AKx@+x3B&Rwtd{hJh(=frAbY;uRbm=?{_ZSdw2PNz1{}2Pv-4z
z!fPMTt~*+Xqn;Gd(E56ee))@UuSf2U^{4Y3Ew3CQ(8KHcg)=;0PiBo;+nu^MQY*77
z)7K`gQjGaVUDre5GpBMNM|VL5>Er5>B|DF}+*wkI_eMC$D4(@Mx+uG+VWRMWu%-}~
zE-RkW$Jp-uE3qH0ICAK4G9|4{cgAIEkY=d_cD}AZ<)6?iVX*SCJ882)tOmI=sW|zF
zqlpXu%FH{MkCgAK*6Vg40zqW(c2TdpPy_Pra~3SerGnyN+B`gW9#+1VF43XZG|#~5
zk}mP1$)%KMzipo3Jx#g<{gZ${W8uQ)$CNAYxUIC!wcqKRXYc>)2#f2qiC|afyT-!g
zh|)ICm>Xtci@Cq3SMIL-e1u+z*s3WG4rr3PpXY^GksiC>yr|S=i_}V=Gye^E!}su9
z>?F*ej@=m-4db#(`?6At3scA6ZG4)!%J%cl^5dRuv)ePe=Abg|vO2KepA&s0+dnrs
zRqI{pzY`0M{gq#6b@n1tb5bR|I4|t?NhOR#^{Q3Jk6ujvE`H&0(AaG!_=j%|Ue0Fe
zS%??^<HF?#4JXz8Y|$>##1sN);Sz{sBq}MLo<$%H=*O~$d!pFy-ypmA#UgQ1sRt3)
zR?L5AN%!pAsrXg<w~Odpnfor4+r0du-r~+sFYrST9Fy1=y;3?FTWAF}Yyv}o*WqFQ
z5-Hh5=8(eVv7ANzyC8k*I@(1A2sZ%>39xMkhlhtHsdT<csoN}nz&}^@JeC_L4%nOj
z5hr1MR%?eP`Og_Sw#y1j<^?^MYf*(eV>w?h*N2(=HQ}m^6WdE3BVI4ohpoL(;5f0Y
z5H!@419RB`zpa+h%Sw6gPy9p-Q!WMI{|Mez%13|VOSFsts`rr?S5BB7!?-5J>UD>R
zkJ0;vR!53Ob1^El6seX%e0{FgQOg5_?GQF^2JQbUXh}G!l-b27Usv$%X9;LET=~Sm
z<nX<8o9to+uPS(3vjmuD>;G)|&7?pX`*@mp%x5@l9c7?ilN&|QFc+Nfj)rqrxWzBm
zaV`Jf=h0B*A2#Cu5?%*klW5)VOMG8v>v_luE5^9+CngmfIW;t&<B6H(?f|4PN`K}*
z*0s+=%5{HLQMJE{4|Fb8Z*Z-2o2n~_-jN&(o!*C^i}f(F<)?R&aLx#R<E}sl%$|f8
zEc&Vwpl(5-s}SOH6;E+{_hW+}(CJtvMNUNb5-32seSB@<Fa$bhN|T><L)-lJI7tp*
zUria`1XUX1%x(4nZ1G$xw>5hVUg}jv;&=dt8EnWs_9`-5H&7fV0f9Wt9GpIm4u9^J
zrfNlAej9dYmzAfzLoSkoVcp&Z9N14jIaRNyM=pA5xDnDCcWTHG4<1W9V16^eDdF@w
z=&;h^$T0tRjIMP&l$ynQ<PGXu?cpA^<)ykBcp1(}EnA}|7FLsXHd9fF5izm&#i5@?
zx3?pkeST(k+WsV}UqhfE{2v;Ug<0XSF5n7XJ37^v_(@uw+k{x&wiIwK(KzyhYx2)S
zmW_P&YCX8y@1P!>Rycg9A9#O-ctRW!I2o);e!oL#o??qp(SjBk;O~WEmKywfVEl>c
z#6rF(Yk+zU4k44))TQsFTeqv3S<erf&y-RhQ%A_LCr|rwanU-&HpfFEPu?DVHBVS^
z+Pyk?dy9Ple)dUv#{60bB0K6k+<R0=i1J6Nte<#Kw%+~$xZKSc819Acbh~BFLvlkU
zPpqF1Xh&)4JVxwc&(O6{zH>N<5^K-h8PT(vmHP$Vr8!J+@N+Eivpe0z+^bnL`Pw0>
z2F;d@R!L$=YTy~SyV^EraI^2~h`(ycRrz=#50Ons%yyMtk9B~w<?byfEbX@I1O}os
z+=uA8dm8*iB8X&};x>&PCU0&|vGd^Aq}&{wA+Kl>sS&|>JEoRJ_kC&rY)Ms$ZH$7?
z**%RZS2eHN0Ti&T;!V~HSn?Yy4Kos-kp)@madT#s4xljQr5K+Jr>+87iAGbh_b!kc
zeTu^vfoAU;ZqmXSYd)7HwIp(2WN_QMYGX&lUT>c}3346gC>huvW`KJJC>~q=exK9j
z>$raOW8+mFuaQWb^x+`HMG5*BLFDqDUeVhA^~OR}5V9aS7{k8MIt!Jb^AKbY#d?oj
zGuHy&a~qc_U|m+N7dw%&Y22br-t6g(2*hRaZ4Ju69E;!qN6+Vky9?%-I^f$tn)`-E
z<wrDnRl4mou$pb(d^f6)kN*jXEK##gYWxYog5@XtPS7@TNQ~xt<CU2i5yETfH6IzO
z8YwIl;8YcP?<-C2q+rK{@_y*=lq!U@yhthgr@+DumUi<nlO5|uRN9c-#I7p<pwJ_}
z<q?3GhSaX1qR~<z6bG${%N-egZJ3jE2gWY)DL>o*$F38G^SOn*{yN0s6@lS1@L^s{
z1bFLXbP~!+P!g}JT5b%xU84xj8FWf-$5QX14@)@mmMMh7MIAnjV+!P2{s#@}>^(Nu
z(^TO=_ap{lS~c$;eW?NzGJwFQ?%syI$VO*D$slLtq<qB6$IiyH9IFJ*yDPNK!ZyH&
zplcfsPfYX&fM2cfgeFF0ipr^<h&P&YRUEm=LOQSaxIO`QkgES<uF8Y@+@ej!+P4--
zi8hHjq(Z%f{e}W4>PMYS+9;0d%pR;0bo)?KF_^RP+qDmha-?EwPh=MRxXnbUC}H7q
zXtD_tq1S2{$5$$QN=x3l{&YBR$JGX+XOeQLvE7xZsz{Sz4Vp!0uRJda!HooHD8fCo
z0x}a`g^4F^iLu<>I4&^_{O`U9FS4oyc8aowsbgeE1iBj!R|X-AHzPNKu~H^Oo8CAX
zDqNzyqamfJ#=@q1UAQHoG;g-R#{64C!%Dd7+ln<mFd~RXb2K!PI#_5%k%crvlBYG^
z&I{Q18auq5-*0S@QbQ5vbiv>^FV93TCSu5`l88fwb9Aqf6l4lwxKrtvFP$vz6oHMM
zHzbu8daGH)(2~YUY#Iiv2z$!;#)j*WFr@#*uD5)(V4Hl1p<nZWL3@UoOTEr_>E2iB
zt(IejY^<SxfigML-9P9cLPl3m&KOe4<C5h3g)W)k;J4}=zR{aAv}9v06fY0Oj>`S|
zJ+hzt>K`v+<VA$r5gVIyHwamM>LwN~iuG(>sl1KGj^2r>$$90zz9c2o{?{MsY@Mjd
zY9#!}Q<BUldp~S?dKhnJm~uuWkv$*D#YoFFK|<RJ4P`|-f(hcK?nUXB-q1Fi?v^xo
z<$S-otlN@XAg2pvrC_?}o_O!E(Y(sE^$V*$dH0;b#1_AVWVn!ccw097oXc9OYsUW)
zT%XUPlUU&-hgx#f%jfev1m!;(z%~ftS3=s5e$57qEC*GR;cpGH(x&)k%&nV`5HZmA
zD*dJi?KDe+5Ht&NAPG?7dL5e!*=0*-8kmeiUYS1O#^<2D&h*GdrW*zwp?A6t2jv(U
zB+A?;A#39Cr`zt0vTkkeprqRRK<m)DfHAB-)+rML7b+3^W0G`{7wPQluLq9M=lwLm
z^KdsMARboc3jfCq)`#TgDr^$m09Pxp5h-Ibil*ad+d8~(Q;8jm+SKm`!COayFh4-n
z8=iPcgG0cU%!gJVPA_yfQt}e&marSI6zRuGBy6!!Q)oXI-@}8r)CB=9lN_Jy*$0vd
zj@^+ce^RcWQtrUm`pIMN?*47u1{j}(W;ojUH3~gpmN?z>*Im*zF`y!nXMj_Tf;q{O
z{K~I%|6*3dcOt>;R^)|g_@JW;u(53E@T7qx1imsrTEXOx5j;g{R}n5B@+!Q4im_3E
zT4`xSg>E$X&pSQ(7*AVlfnz+wDio1=(F9W1w^s5x;c|JGT2qyh$PLB>(swGFx=coY
zFiBb!r)Xtjv<6He5b7kKpz@#L^}Y*9orn0>0qoU0pCW|Jc8QSCJ`#lz@n@vDo6~2!
zb)lpEg-_s9N@r5E7SG|aMbPLEaMWMw31`L>Lx&tL^~m_U5DE&qq=UMR<ctFtn$6z_
zt$hE)=?eJN;;<noeVw>`A9<u8q_~B*-2htO8y)<k)~bYH(Vy=7T$a<?IY#rbTlB_?
z>*l>s>k-X|$~9QcPz+{FE2Raq#U7v4;C0K8cBuUxgd>Wu>C+HaHP6lAH`Uyu01tL5
zYi0$M!TW}POj+9TO(#~W>!cPXy@Lnrk<|lWA6$wtY6yB|E&XS6$m=)qh}n9xS61d%
zL&0!{iE3$?Y91^vK*rGA+3JrCT(Fhua>T_qnI`s!0vqJ~ymZwnb_}+THyqJV-4O@9
zQ1+|^+pBP$rlhwanp&g!ayveM+*P?kOHk^H(83r>C2WOtV`uj$H~ZOtSi=xpD>A=A
z`<h8Jz@u6UYvxy69u<uvy;*Os-`#~v(&yS7TSva%L($&0#?(36kd*+!iMe%r9M6RC
z*LWbM^q<e}Lu!WfzX;n-q&NyWaXbzi;#hT@V(GEoO`p|YM&fen5@IV2z2-Li!QB|g
z&ey}cW>;$IW*~B@j1gvCgf+!j2?A$LH^mS88)iH52uZ7_M0sg4eux(!kau|ep={G@
zmFVEJ+WHQ=Ws#UUiKOjscjduvTmh3WSrXm2JM<w=jCqW}Qo4802<b_3aPvmw$nOSZ
zJdOPjU55mgIzQYZCS7qz;j2{4q(&e5XhWz6v@C+2VnE#{dTuP<fjc#)%qNeoTB{Su
zl(OolygV(NK7)Rw3+_!&(R?$yDkoOT_j+aA$x=)|O(MC1LR@I_@ImUVt4(u;b8u!^
zH~u6FyF<A>ef*eXM+pF}tuM<S$+1K8uQ;A;2+^!j6~_bQ3%fr1b#;wv#k!W|-<;^9
zpLCMs?3CPdf44>VY6eL}O4~m@zZt;7+8mD!;w!Dx96xn~D1xug&xoDmCAJrJ6)5oP
zo!XTtCKJO3HHh38qs#>j@c;|DLt6r#)=L8CghkqSf44LfH<*zVR(4{AWyx$p#D0iO
zB$TF!@*&omTXBW}mxbgbkeEvf`|=cqqO+AZ6>8}tX&QPuB)WJ?X+<Ky51dQ^Av5oG
zB1CC3RQf0*Thr=kYE=TyO>74z+M~1~e}pkiApwpZQzd9I5qV_?es=hPR7{ASDxLDa
zDUz!Ky>f7YrL>W{&9MRj+W}e}KP%f|j*D$PFan)%X>2|uX7<K?{);BBGBh%sUMOVZ
z=%^|6&Y8bWhDkT(9akhhLDgQAN}AJ}37>NEQX6GkhO!DVCR4{9;BCW@vjJ4CZqho_
zQbQFpbyE1lr@A9Jhag$ueyTumVt`B(g_i<?s%`932JHxN+9=7DL<J1mc8~O8=XH+=
zSnA1PcO0zED1-nR6(3byBd0VMz4|ysj`@U)55gXERpb9|;Zt?BD<*9_2G3Ob@&D=0
z(AGbSSL6Q*oL)B*Qbw-!_&7z>%+DD4QDzjm6!tkq#c~7FGyKDPs0Y(z2bUH%6r65k
zKU}l{Wo$Q3O5cv*4=!bH-BOZq^d1EC3R9Hs>G)WVa?SHfrs?gVFxjT?eAz+apkox>
zuTHK3Y*e;H6?Jp-(hb9^F_`Ch?F3stF=zSCeL0aETf7}<EO620<t4#K1pT3wof*GH
z(nhF=xGnPsjFN$UDoZ1nUCPLHLH0ws%3kS_MI|#Fy_OjGmt=3syp#mRjJW-O&qPjd
zqqG#N6Bj`aTEttOGfJ8J71X)cqOJA8;<@zcq0T(q=4JB5jYreQaMk$7N!JSt^LbwJ
zYwO&&cAP|$ZdxrJ0}1wfT<-L}avMGXUoKbs;KCeRdJ9txX{#5rW&|FTosMFf&kCpG
z7>(mwif2t;1L5);ZyGL!HC8{A@16vq16+H)leRi|-wiH!j#3J<o6uK2$sFeq=FEht
zDAJQn^Y}B_otFeX9cadgDdAmQ=yhRTtDeXSmhuOcW|D6@KU{tzV<(_)gwOPFA%83Z
zT)EcxURd!q^C6!{5e^-gzbXpd_CQjbSgnbN*shTysl~bcQxv76Yc3G7@lT+vD`}3A
z=?kUqG%uWe?4!G=^!Ulz^`&fXILKad!)w`|PPeW%MpuVSXzN?Ym;9})#Fclx3~tK<
zlYG$Mn4uPf7e$Ct$<tYr_}{msbZ&FMe70|<e+nJVxKyC+2Ak*UO`l&5MX`^H<yx&=
zXMJTZ^U1#%=bey4U7k<UXtafvu)WFv8o5m;CG(QDWAY?YNyNW?%hlD-ngUi}b%l$B
zQf{<>qCD|_(;i+=72m|m-9`qlbDh@m)cbu>B4G0&^zdY!jBzF!nX_6bZ^-Bo`C1|?
zlAP+f#lmeQfR7L0EcM8b9q~3^yQ*<vbvikG6f0cWwq#Z(cZ#LNrB8pG^;6fhfJvU#
zi+Sas<*i_zwHi75+>kJHO(UBiFVv(`kJwo4Z)~|hys})&{=dsUr1NXWsJaw9D&KEb
zH-0_|=4-2>ICy-fJJigAVEb^w2<hQu$-bf9li^v`D2@UbRGS+gD}pBls<m#HT{;ax
z^7iVMl+-%6ueD^9r^ChXqw14geruMTN3l9H`KVnLYoAQytQP+frg3*)`cb*$^VtgP
zOhmV-;NDTaO?4@}1TS(g=^ybK0Sy!2gF>B<?ATAsS-BMk-$ET$=2JL%AGD5Z!4{Vy
zK(kFUypJ*cw{Xt;w_=e~G*M&dz7uX}wRPzdz`-B`SW$+IklL>SW_uAu4GUoQ1v?*s
zq6<r<N^xbz-&8ApYM-<8{Y*wAN&rz_stTS#y@#8i(w22Tv7bI(n!g_VP;Jsst8i8{
z?vLJ)LYN<DQ8a9`>H`}a`fSNq+eWvn!cQKT=9M9sgV}6C%OC(vL_A=BNtNw$(rGkd
z()vlm@!efXjzyl>%GTYD0n2VuX@w_T_rTbiuZiCgzey$pLj;B%8ifXNA?1)#?&&Di
zWFnhOj>|}VnyG6GeS!seROA~~?5>f}={<bg(mPXukCWItOe~_PvV}xy%zA+sKO|v^
zTqMmS+EzLTI&`X}P>3oLFhv+Yvd5K0A!!O9kT^@>F6jGJN4Ik9)Rey8;p_Lfu+sfE
z2e4$5OPO1sl7r!bwcX+%X&BTn!z?won6_&2Hg0s<+qB58lEz3SXAujcKnve1n9BtT
z+i6Z;##pSG7U`7aW)e8$EBx>0-GtSdZx6QIU6Guo`Ofwb?ePoSxz{<(6TXc|JY4=M
z1_<)dId^!cVFR6I1T3JFZ3jXoqcQu4%@8#$N#8T%ah^cwF`tYBBfN`ax$_dqJ`kEU
z$LH2j@g=-s1Rhnop2ye4BxE$EH-|=YZe5fw7G#dzUrf^J7MO?^0Gm~H8!cUw!I7_?
ztU{=Bwee&*i-uNrLyYWL66&UJi@Io5Av!>|UlTuYd3BXUAvaVH%+fzAjRP!op#mJp
z?^#e=*?DAYSlZJY)$OL=#`li<yIKp~1CyLfzi^Bwm#Kw1syq`F<YPrAl)X7ZawD4Z
zfvCtUQ}q<MNW{Cy=zzA~lZ?eG+EKSqs{UkOPsGvPXh4?TOT2*mX=JCt@OBU_6%{<t
zlGKB79(q?12#}GU%gLtee9Ve=0J*nVy>qh|uPEX19n6Nc_Tq`hCR`JOe8uEm$p))r
zOiZ%s<X`GEEhVYX6YAqgjp#tzdAL3~j`GmM9BOoY<Cqr8?n=+FxGnfD2A96wo{#zr
zIf@VOe0noe-49X7b5ql<OeCz<iC^R45n41yv0x*ZXB*vJH=N@~0We~)h?>OJYLyVW
z8B*zN3yP>!Wq6v5RGCQ94qQU3PdPqHi-?UiwPL)#lTxi-pp7z-Oek~AaJ@hV>LFLD
zR3Ft1`OEG4vBcks{~80Pn>xj-R0k|u-7N+E<@>d?^N_dy&Uaj}V{ET>72^)mwj*&=
z&-hKo)^CGb>WOpfU}(R-7!&%5juJl49LWiVO^L3qE?+jYoY3&EeQ#}$>WU;trIOyI
zfg@I4%xa3+9BT3bSioc+hg_={&C*c?Q%f?e`rJHhT(DbiqJH@)+2(M*Ga%01#DCn=
zgott7Nn|ky^RL(S7b7hTk?G1Zf=8p>ee9D3FTlE1Ct6-l06C+B-jt_}^V09B)DzO-
zS$VG_Ms8vAEbg45!@7|3jS9_4f^Y5vy0K2}(VUH(kE4X+odFN_wIV^Fl$$lj1jfu=
zfcWPbATyV4?$7)40_kDS#$-Es{l(LWlb|3l?oR$ynlxO}805uGOtL8kFJ;W<YrCV5
zbiYiUFzu7@M4&EEC>56EGyrTokh8*F&{bI2>klcg4X*6#E1#mI10X0+_3?otJyOxY
zU-a3NU4rck(D|6ZlT5d-Wq+L9_<D;CIjW{EmyX@oa;WZxATNy1_Jwcm$PX6Tj_IUj
z^1|@OFNb5ZyH)f>9M+p2>$tLA*vx{AZm?Lk^lqoLEoi>1)b(qd!LTmV{}ISOMd=HL
zNP^L=?uscIm7MtqAlMqPEv1~iuR<~dK-8M!FV`I!YSqJ_%&48u2(ox3qxR})tL4go
zA!SKXZOJnJ=e=iS4FK{hLZtt`3VhiH{_hF?5B$FugBk!-wEqkszm)z9Vp9Hx{SV^2
BJ!=2}

literal 0
HcmV?d00001


From 80f7db8db364dc4903bf2ec4888b1269e82cde3a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:31:15 +0300
Subject: [PATCH 11/32] Add test coverage for the new multiplayer beatmap
 tracker

---
 .../TestSceneMultiplayerBeatmapTracker.cs     | 178 ++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
new file mode 100644
index 0000000000..839d47afc2
--- /dev/null
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -0,0 +1,178 @@
+// 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;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.IO.Archives;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Online
+{
+    [HeadlessTest]
+    public class TestSceneMultiplayerBeatmapTracker : OsuTestScene
+    {
+        private RulesetStore rulesets;
+        private TestBeatmapManager beatmaps;
+
+        private string testBeatmapFile;
+        private BeatmapInfo testBeatmapInfo;
+        private BeatmapSetInfo testBeatmapSet;
+
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+        private MultiplayerBeatmapTracker tracker;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, GameHost host)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.CacheAs<BeatmapManager>(beatmaps = new TestBeatmapManager(LocalStorage, ContextFactory, rulesets, API, audio, host, Beatmap.Default));
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            testBeatmapFile = getTestBeatmapOsz();
+
+            testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+            testBeatmapSet = testBeatmapInfo.BeatmapSet;
+
+            var existing = beatmaps.QueryBeatmapSet(s => s.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID);
+            if (existing != null)
+                beatmaps.Delete(existing);
+
+            selectedItem.Value = new PlaylistItem
+            {
+                Beatmap = { Value = testBeatmapInfo },
+                Ruleset = { Value = testBeatmapInfo.Ruleset },
+            };
+
+            Child = tracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = selectedItem, }
+            };
+        });
+
+        [Test]
+        public void TestBeatmapDownloadingFlow()
+        {
+            AddAssert("ensure beatmap unavailable", () => !beatmaps.IsAvailableLocally(testBeatmapSet));
+            addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("start downloading", () => beatmaps.Download(testBeatmapSet));
+            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0));
+
+            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4));
+            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4));
+
+            AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
+            addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
+
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+        }
+
+        [Test]
+        public void TestTrackerRespectsSoftDeleting()
+        {
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+
+            AddStep("delete beatmap", () => beatmaps.Delete(testBeatmapSet));
+            addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("undelete beatmap", () => beatmaps.Undelete(testBeatmapSet));
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+        }
+
+        [Test]
+        public void TestTrackerRespectsChecksum()
+        {
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+
+            BeatmapInfo wrongBeatmap = null;
+
+            AddStep("import wrong checksum beatmap", () =>
+            {
+                wrongBeatmap = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+                wrongBeatmap.MD5Hash = "1337";
+
+                beatmaps.Import(wrongBeatmap.BeatmapSet).Wait();
+            });
+            AddAssert("wrong beatmap available", () => beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == wrongBeatmap.OnlineBeatmapID) != null);
+            addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = selectedItem }
+            });
+            addAvailabilityCheckStep("state not downloaded as well", BeatmapAvailability.NotDownloaded);
+        }
+
+        private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
+        {
+            AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
+        }
+
+        private string getTestBeatmapOsz()
+        {
+            var filename = Path.GetTempFileName() + ".osz";
+
+            using (var stream = TestResources.OpenResource("Archives/test-beatmap.osz"))
+            using (var file = File.Create(filename))
+                stream.CopyTo(file);
+
+            return filename;
+        }
+
+        private class TestBeatmapManager : BeatmapManager
+        {
+            public readonly ManualResetEventSlim AllowImport = new ManualResetEventSlim();
+
+            protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
+                => new TestDownloadRequest(set);
+
+            public TestBeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, GameHost host = null, WorkingBeatmap defaultBeatmap = null, bool performOnlineLookups = false)
+                : base(storage, contextFactory, rulesets, api, audioManager, host, defaultBeatmap, performOnlineLookups)
+            {
+            }
+
+            public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
+            {
+                while (!AllowImport.IsSet)
+                    await Task.Delay(10, cancellationToken);
+
+                return await base.Import(item, archive, cancellationToken);
+            }
+        }
+
+        private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
+        {
+            public new void SetProgress(double progress) => base.SetProgress(progress);
+
+            public TestDownloadRequest(BeatmapSetInfo model)
+                : base(model)
+            {
+            }
+
+            protected override string Target => null;
+        }
+    }
+}

From 172552d55173791a5a5293bcab1d2240b8b02783 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:02:33 +0300
Subject: [PATCH 12/32] Use `TaskCompletionSource` for better awaiting

---
 .../Online/TestSceneMultiplayerBeatmapTracker.cs   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 839d47afc2..05e8f8b2e4 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -47,6 +47,8 @@ namespace osu.Game.Tests.Online
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            beatmaps.AllowImport = new TaskCompletionSource<bool>();
+
             testBeatmapFile = getTestBeatmapOsz();
 
             testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
@@ -83,7 +85,7 @@ namespace osu.Game.Tests.Online
             AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
 
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
             AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
@@ -91,7 +93,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestTrackerRespectsSoftDeleting()
         {
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
             AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
 
@@ -105,7 +107,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestTrackerRespectsChecksum()
         {
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
 
             BeatmapInfo wrongBeatmap = null;
 
@@ -144,7 +146,7 @@ namespace osu.Game.Tests.Online
 
         private class TestBeatmapManager : BeatmapManager
         {
-            public readonly ManualResetEventSlim AllowImport = new ManualResetEventSlim();
+            public TaskCompletionSource<bool> AllowImport = new TaskCompletionSource<bool>();
 
             protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
                 => new TestDownloadRequest(set);
@@ -156,9 +158,7 @@ namespace osu.Game.Tests.Online
 
             public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
             {
-                while (!AllowImport.IsSet)
-                    await Task.Delay(10, cancellationToken);
-
+                await AllowImport.Task;
                 return await base.Import(item, archive, cancellationToken);
             }
         }

From d93a853dfd531e9d8d83473b04e3c22b5d290023 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:16:45 +0300
Subject: [PATCH 13/32] Enforce `float` type in the download progress path
 instead

---
 .../Online/TestSceneMultiplayerBeatmapTracker.cs       |  8 ++++----
 osu.Game/Online/API/ArchiveDownloadRequest.cs          |  6 +++---
 osu.Game/Online/DownloadTrackingComposite.cs           |  2 +-
 osu.Game/Online/Rooms/BeatmapAvailability.cs           |  6 +++---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs     |  2 +-
 .../Overlays/Notifications/ProgressNotification.cs     | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 05e8f8b2e4..60a4508b3d 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -77,10 +77,10 @@ namespace osu.Game.Tests.Online
             addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
 
             AddStep("start downloading", () => beatmaps.Download(testBeatmapSet));
-            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0));
+            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0f));
 
-            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4));
-            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4));
+            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4f));
+            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4f));
 
             AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Online
 
         private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
         {
-            public new void SetProgress(double progress) => base.SetProgress(progress);
+            public new void SetProgress(float progress) => base.SetProgress(progress);
 
             public TestDownloadRequest(BeatmapSetInfo model)
                 : base(model)
diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index fdb2a984dc..ccb4e9c119 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -12,16 +12,16 @@ namespace osu.Game.Online.API
 
         public double Progress { get; private set; }
 
-        public event Action<double> DownloadProgressed;
+        public event Action<float> DownloadProgressed;
 
         protected ArchiveDownloadRequest(TModel model)
         {
             Model = model;
 
-            Progressed += (current, total) => SetProgress((double)current / total);
+            Progressed += (current, total) => SetProgress((float)current / total);
         }
 
-        protected void SetProgress(double progress)
+        protected void SetProgress(float progress)
         {
             Progress = progress;
             DownloadProgressed?.Invoke(progress);
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index b72cf38369..1631d9790b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Online
 
         private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Importing);
 
-        private void onRequestProgress(double progress) => Schedule(() => Progress.Value = progress);
+        private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index e7dbc5f436..170009a85b 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -19,17 +19,17 @@ namespace osu.Game.Online.Rooms
         /// <summary>
         /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
         /// </summary>
-        public readonly double? DownloadProgress;
+        public readonly float? DownloadProgress;
 
         [JsonConstructor]
-        private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
+        private BeatmapAvailability(DownloadState state, float? downloadProgress = null)
         {
             State = state;
             DownloadProgress = downloadProgress;
         }
 
         public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
-        public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
+        public static BeatmapAvailability Downloading(float progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
         public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Importing);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
 
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index b22d17f3ef..b15399ad62 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online.Rooms
                     break;
 
                 case DownloadState.Downloading:
-                    availability.Value = BeatmapAvailability.Downloading(Progress.Value);
+                    availability.Value = BeatmapAvailability.Downloading((float)Progress.Value);
                     break;
 
                 case DownloadState.Importing:
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index e18bab8e83..3105ecd742 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -23,9 +23,9 @@ namespace osu.Game.Overlays.Notifications
 
         public string CompletionText { get; set; } = "Task has completed!";
 
-        private double progress;
+        private float progress;
 
-        public double Progress
+        public float Progress
         {
             get => progress;
             set
@@ -185,9 +185,9 @@ namespace osu.Game.Overlays.Notifications
             private Color4 colourActive;
             private Color4 colourInactive;
 
-            private double progress;
+            private float progress;
 
-            public double Progress
+            public float Progress
             {
                 get => progress;
                 set
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.Notifications
                     if (progress == value) return;
 
                     progress = value;
-                    box.ResizeTo(new Vector2((float)progress, 1), 100, Easing.OutQuad);
+                    box.ResizeTo(new Vector2(progress, 1), 100, Easing.OutQuad);
                 }
             }
 

From 0425a659a8c0bae3117e77dd512e899ca6a5c3da Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:19:55 +0300
Subject: [PATCH 14/32] Add null-permissive operator to manager back

---
 osu.Game/Online/DownloadTrackingComposite.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 1631d9790b..188cb9be7a 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Online
         /// By default, this calls <see cref="IModelDownloader{TModel}.IsAvailableLocally"/>,
         /// but can be overriden to add additional checks for verifying the model in database.
         /// </summary>
-        protected virtual bool IsModelAvailableLocally() => Manager.IsAvailableLocally(Model.Value);
+        protected virtual bool IsModelAvailableLocally() => Manager?.IsAvailableLocally(Model.Value) == true;
 
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {

From ccef50e2a2e16767565c75bdc70c52faba7c57e4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 22:04:12 +0300
Subject: [PATCH 15/32] Log important message if user imported bad-checksum
 beatmap

---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index b15399ad62..659f52f00f 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.Rooms
@@ -34,6 +35,15 @@ namespace osu.Game.Online.Rooms
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
+        {
+            var verified = verifyDatabasedModel(databasedSet);
+            if (!verified)
+                Logger.Log("The imported beatmapset does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+
+            return verified;
+        }
+
+        private bool verifyDatabasedModel(BeatmapSetInfo databasedSet)
         {
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;

From b6a37c1c15fe2a95b7efb94b61e37de132d9864e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 22:08:28 +0300
Subject: [PATCH 16/32] Make `TriggerSuccess(filename)` protected and expose in
 test instead

---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 1 +
 osu.Game/Online/API/APIDownloadRequest.cs                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 60a4508b3d..4b8992052e 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -166,6 +166,7 @@ namespace osu.Game.Tests.Online
         private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
         {
             public new void SetProgress(float progress) => base.SetProgress(progress);
+            public new void TriggerSuccess(string filename) => base.TriggerSuccess(filename);
 
             public TestDownloadRequest(BeatmapSetInfo model)
                 : base(model)
diff --git a/osu.Game/Online/API/APIDownloadRequest.cs b/osu.Game/Online/API/APIDownloadRequest.cs
index 02c589403c..62e22d8f88 100644
--- a/osu.Game/Online/API/APIDownloadRequest.cs
+++ b/osu.Game/Online/API/APIDownloadRequest.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Online.API
 
         private void request_Progress(long current, long total) => API.Schedule(() => Progressed?.Invoke(current, total));
 
-        internal void TriggerSuccess(string filename)
+        protected void TriggerSuccess(string filename)
         {
             if (this.filename != null)
                 throw new InvalidOperationException("Attempted to trigger success more than once");

From ddcfd854bd1c66b673d73e5459526ded76ebcb41 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 19:20:19 +0300
Subject: [PATCH 17/32] Wait for scheduled state changes before asserting

---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 4b8992052e..d692e6f9a3 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -130,6 +130,8 @@ namespace osu.Game.Tests.Online
 
         private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
         {
+            // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
+            AddWaitStep("wait for potential change", 1);
             AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
         }
 

From 25f511fd5b2b6b2bfbd9e1787182a8a87f086de0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 21:34:24 +0300
Subject: [PATCH 18/32] Remove unnecessary full querying

---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 659f52f00f..c2c800badc 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -48,17 +48,7 @@ namespace osu.Game.Online.Rooms
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
 
-            BeatmapInfo matchingBeatmap;
-
-            if (databasedSet.Beatmaps == null)
-            {
-                // The given databased beatmap set is not passed in a usable state to check with.
-                // Perform a full query instead, as per https://github.com/ppy/osu/pull/11415.
-                matchingBeatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-                return matchingBeatmap != null;
-            }
-
-            matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            var matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
             return matchingBeatmap != null;
         }
 

From 5e476fa189d7637db79c228721a601a005f2d355 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 22:07:25 +0300
Subject: [PATCH 19/32] Enforce one missed property back to single-floating
 type

---
 osu.Game/Online/API/ArchiveDownloadRequest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index ccb4e9c119..0bf238109e 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.API
     {
         public readonly TModel Model;
 
-        public double Progress { get; private set; }
+        public float Progress { get; private set; }
 
         public event Action<float> DownloadProgressed;
 

From 63ca9de7e4a85990bd162d25cd9be01f8c91c239 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 23:00:07 +0300
Subject: [PATCH 20/32] Rewerite beatmap term properly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index c2c800badc..32a6c39ea8 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Online.Rooms
         {
             var verified = verifyDatabasedModel(databasedSet);
             if (!verified)
-                Logger.Log("The imported beatmapset does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
 
             return verified;
         }

From 5a64abee648f7c49f92305f6ba988c19199e9f64 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 11:51:31 +0300
Subject: [PATCH 21/32] Inline with above method

---
 .../Online/Rooms/MultiplayerBeatmapTracker.cs  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 32a6c39ea8..59dfdcf464 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -35,21 +35,19 @@ namespace osu.Game.Online.Rooms
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
-        {
-            var verified = verifyDatabasedModel(databasedSet);
-            if (!verified)
-                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
-
-            return verified;
-        }
-
-        private bool verifyDatabasedModel(BeatmapSetInfo databasedSet)
         {
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
 
             var matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-            return matchingBeatmap != null;
+
+            if (matchingBeatmap == null)
+            {
+                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+                return false;
+            }
+
+            return true;
         }
 
         protected override bool IsModelAvailableLocally()

From 63b4c529a6fe1f3a996f6074bfb736144e2e9c76 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 11:57:40 +0300
Subject: [PATCH 22/32] Add xmldoc explaining what the multiplayer beatmap
 tracker is for

---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 59dfdcf464..28e4872ad3 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -9,6 +9,12 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.Rooms
 {
+    /// <summary>
+    /// Represent a checksum-verifying beatmap availability tracker usable for online play screens.
+    ///
+    /// This differs from a regular download tracking composite as this accounts for the
+    /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
+    /// </summary>
     public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();

From ed3dece9f8f7c0c0e0d35ac3fa330f2359b84cbc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 18:36:05 +0300
Subject: [PATCH 23/32] Fix wrong importing of test beatmaps

Importing via `testBeatmapSet` causes the beatmapset hash to not be calculated due to no files existing in the importing process, which leads into not reusing existing test beatmaps due to no hash.
---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index d692e6f9a3..a6275f14e6 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -94,13 +94,13 @@ namespace osu.Game.Tests.Online
         public void TestTrackerRespectsSoftDeleting()
         {
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
-            AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
+            AddStep("import beatmap", () => beatmaps.Import(testBeatmapFile).Wait());
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
 
-            AddStep("delete beatmap", () => beatmaps.Delete(testBeatmapSet));
+            AddStep("delete beatmap", () => beatmaps.Delete(beatmaps.QueryBeatmapSet(b => b.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID)));
             addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("undelete beatmap", () => beatmaps.Undelete(testBeatmapSet));
+            AddStep("undelete beatmap", () => beatmaps.Undelete(beatmaps.QueryBeatmapSet(b => b.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID)));
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
 

From dba01cf2b1ea7cf3445f14e30855ce9e95e6bd76 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 18:43:16 +0300
Subject: [PATCH 24/32] Use beatmap "soleily" and remove no longer needed
 archive

---
 .../TestSceneMultiplayerBeatmapTracker.cs     |  41 ++++++++++--------
 .../Resources/Archives/test-beatmap.osz       | Bin 7286 -> 0 bytes
 2 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 osu.Game.Tests/Resources/Archives/test-beatmap.osz

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index a6275f14e6..9caecc198a 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,15 +11,17 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 
@@ -49,9 +52,9 @@ namespace osu.Game.Tests.Online
         {
             beatmaps.AllowImport = new TaskCompletionSource<bool>();
 
-            testBeatmapFile = getTestBeatmapOsz();
+            testBeatmapFile = TestResources.GetTestBeatmapForImport();
 
-            testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+            testBeatmapInfo = getTestBeatmapInfo(testBeatmapFile);
             testBeatmapSet = testBeatmapInfo.BeatmapSet;
 
             var existing = beatmaps.QueryBeatmapSet(s => s.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID);
@@ -109,16 +112,10 @@ namespace osu.Game.Tests.Online
         {
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
 
-            BeatmapInfo wrongBeatmap = null;
-
-            AddStep("import wrong checksum beatmap", () =>
+            AddStep("import altered beatmap", () =>
             {
-                wrongBeatmap = new TestBeatmap(Ruleset.Value).BeatmapInfo;
-                wrongBeatmap.MD5Hash = "1337";
-
-                beatmaps.Import(wrongBeatmap.BeatmapSet).Wait();
+                beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
             });
-            AddAssert("wrong beatmap available", () => beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == wrongBeatmap.OnlineBeatmapID) != null);
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
             AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
@@ -135,15 +132,25 @@ namespace osu.Game.Tests.Online
             AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
         }
 
-        private string getTestBeatmapOsz()
+        private static BeatmapInfo getTestBeatmapInfo(string archiveFile)
         {
-            var filename = Path.GetTempFileName() + ".osz";
+            BeatmapInfo info;
 
-            using (var stream = TestResources.OpenResource("Archives/test-beatmap.osz"))
-            using (var file = File.Create(filename))
-                stream.CopyTo(file);
+            using (var archive = new ZipArchiveReader(File.OpenRead(archiveFile)))
+            using (var stream = archive.GetStream("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var reader = new LineBufferedReader(stream))
+            {
+                var decoder = Decoder.GetDecoder<Beatmap>(reader);
+                var beatmap = decoder.Decode(reader);
 
-            return filename;
+                info = beatmap.BeatmapInfo;
+                info.BeatmapSet.Beatmaps = new List<BeatmapInfo> { info };
+                info.BeatmapSet.Metadata = info.Metadata;
+                info.MD5Hash = stream.ComputeMD5Hash();
+                info.Hash = stream.ComputeSHA2Hash();
+            }
+
+            return info;
         }
 
         private class TestBeatmapManager : BeatmapManager
diff --git a/osu.Game.Tests/Resources/Archives/test-beatmap.osz b/osu.Game.Tests/Resources/Archives/test-beatmap.osz
deleted file mode 100644
index f98fd2f8ffef0968270a1f2c7d75162de80417c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7286
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
BJ!=2}


From fabb0eeb29a35c7e0d212d9c7be9f1aad8e90c35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 17:27:14 +0900
Subject: [PATCH 25/32] Add signalr messagepack key attribute

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 4ce797e583..2adeb9b959 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Online.Rooms
         /// <summary>
         /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
         /// </summary>
+        [Key(1)]
         public readonly float? DownloadProgress;
 
         [JsonConstructor]

From 1d8de2f718916b907b24bf1b411ebb627258cbd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 17:32:54 +0900
Subject: [PATCH 26/32] Rename class to better match purpose

---
 ... TestSceneMultiplayerBeatmapAvailabilityTracker.cs} | 10 +++++-----
 ...er.cs => MultiplayerBeatmapAvailablilityTracker.cs} |  7 +++----
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs     |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename osu.Game.Tests/Online/{TestSceneMultiplayerBeatmapTracker.cs => TestSceneMultiplayerBeatmapAvailabilityTracker.cs} (94%)
 rename osu.Game/Online/Rooms/{MultiplayerBeatmapTracker.cs => MultiplayerBeatmapAvailablilityTracker.cs} (93%)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
similarity index 94%
rename from osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
rename to osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
index 9caecc198a..3c3793670a 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
@@ -28,7 +28,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Online
 {
     [HeadlessTest]
-    public class TestSceneMultiplayerBeatmapTracker : OsuTestScene
+    public class TestSceneMultiplayerBeatmapAvailabilityTracker : OsuTestScene
     {
         private RulesetStore rulesets;
         private TestBeatmapManager beatmaps;
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Online
         private BeatmapSetInfo testBeatmapSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private MultiplayerBeatmapTracker tracker;
+        private MultiplayerBeatmapAvailablilityTracker availablilityTracker;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, GameHost host)
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Online
                 Ruleset = { Value = testBeatmapInfo.Ruleset },
             };
 
-            Child = tracker = new MultiplayerBeatmapTracker
+            Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem, }
             };
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Online
             });
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
+            AddStep("recreate tracker", () => Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
@@ -129,7 +129,7 @@ namespace osu.Game.Tests.Online
         {
             // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
             AddWaitStep("wait for potential change", 1);
-            AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
+            AddAssert(description, () => availablilityTracker.Availability.Value.Equals(expected.Invoke()));
         }
 
         private static BeatmapInfo getTestBeatmapInfo(string archiveFile)
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
similarity index 93%
rename from osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
rename to osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
index 28e4872ad3..578c4db2f8 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     /// This differs from a regular download tracking composite as this accounts for the
     /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
     /// </summary>
-    public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    public class MultiplayerBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
@@ -26,11 +26,10 @@ namespace osu.Game.Online.Rooms
 
         private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
 
-        public MultiplayerBeatmapTracker()
+        public MultiplayerBeatmapAvailablilityTracker()
         {
             State.BindValueChanged(_ => updateAvailability());
-            Progress.BindValueChanged(_ => updateAvailability());
-            updateAvailability();
+            Progress.BindValueChanged(_ => updateAvailability(), true);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index c049d4be20..f2cb1120cb 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected readonly MultiplayerBeatmapTracker BeatmapTracker;
+        protected readonly MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker;
 
         protected RoomSubScreen()
         {
-            InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
+            InternalChild = BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };

From 8e96ffd1e6ea4d848766c72e703503de6b23cffd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 16:54:40 +0300
Subject: [PATCH 27/32] Fix "wait for import" until step potentially finishing
 early

If not obvious, the issue with previous code is that it was checking for `IsAvailableLocally`, while the import is happening on a different thread, so that method could return `true` before the importing has finished and `ItemUpdated` event is called.
---
 .../TestSceneMultiplayerBeatmapAvailabilityTracker.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
index 3c3793670a..646c4139af 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Online
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
 
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
-            AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
+            AddUntilStep("wait for import", () => beatmaps.CurrentImportTask?.IsCompleted == true);
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
 
@@ -127,8 +127,6 @@ namespace osu.Game.Tests.Online
 
         private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
         {
-            // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
-            AddWaitStep("wait for potential change", 1);
             AddAssert(description, () => availablilityTracker.Availability.Value.Equals(expected.Invoke()));
         }
 
@@ -157,6 +155,8 @@ namespace osu.Game.Tests.Online
         {
             public TaskCompletionSource<bool> AllowImport = new TaskCompletionSource<bool>();
 
+            public Task<BeatmapSetInfo> CurrentImportTask { get; private set; }
+
             protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
                 => new TestDownloadRequest(set);
 
@@ -168,7 +168,7 @@ namespace osu.Game.Tests.Online
             public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
             {
                 await AllowImport.Task;
-                return await base.Import(item, archive, cancellationToken);
+                return await (CurrentImportTask = base.Import(item, archive, cancellationToken));
             }
         }
 

From 50d57a39317c32d59e30006679a030bedfbdb10b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 17:07:16 +0300
Subject: [PATCH 28/32] Move tracker loading into BDL

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index f2cb1120cb..cdf889e4f1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected readonly MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker;
+        protected MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
         protected RoomSubScreen()
         {
-            InternalChild = BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };
@@ -54,6 +54,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
+            AddInternal(BeatmapAvailablilityTracker);
+
             sampleStart = audio.Samples.Get(@"SongSelect/confirm-selection");
         }
 

From 62d0036c819c0516005f9b5b3938d359e0cac987 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 17:45:07 +0300
Subject: [PATCH 29/32] Fix using private constructor on MessagePack object

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 2adeb9b959..a83327aad5 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Online.Rooms
         public readonly float? DownloadProgress;
 
         [JsonConstructor]
-        private BeatmapAvailability(DownloadState state, float? downloadProgress = null)
+        public BeatmapAvailability(DownloadState state, float? downloadProgress = null)
         {
             State = state;
             DownloadProgress = downloadProgress;

From db3f9e7cbee3ff3c719d80fc2943420b82a828a2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 4 Feb 2021 02:20:18 +0300
Subject: [PATCH 30/32] Apply documentation suggestion

---
 osu.Game/Online/DownloadTrackingComposite.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 188cb9be7a..69c6ebd07c 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -67,10 +67,10 @@ namespace osu.Game.Online
         }
 
         /// <summary>
-        /// Verifies that the given databased model is in a correct state to be considered available.
+        /// Checks that a database model matches the one expected to be downloaded.
         /// </summary>
         /// <example>
-        /// In the case of multiplayer/playlists, this has to verify that the databased beatmap set with the selected beatmap matches what's online.
+        /// In the case of multiplayer/playlists, this has to check that the databased beatmap set with the selected beatmap matches what's online.
         /// </example>
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;

From d62bbbb7627673b4dc03729639a54ad9b864079e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 00:38:56 +0300
Subject: [PATCH 31/32] Enhance documentation

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Online/DownloadTrackingComposite.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 69c6ebd07c..52042c266b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online
         /// Checks that a database model matches the one expected to be downloaded.
         /// </summary>
         /// <example>
-        /// In the case of multiplayer/playlists, this has to check that the databased beatmap set with the selected beatmap matches what's online.
+        /// For online play, this could be used to check that the databased model matches the online beatmap.
         /// </example>
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;

From a2fdba3e5173441147761ace92894f54cc6f309f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:24:38 +0900
Subject: [PATCH 32/32] Rename to OnlinePlayBeatmapAvailabilityTracker

---
 ...s => TestSceneOnlinePlayBeatmapAvailabilityTracker.cs} | 8 ++++----
 ...racker.cs => OnlinePlayBeatmapAvailablilityTracker.cs} | 4 ++--
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Online/{TestSceneMultiplayerBeatmapAvailabilityTracker.cs => TestSceneOnlinePlayBeatmapAvailabilityTracker.cs} (96%)
 rename osu.Game/Online/Rooms/{MultiplayerBeatmapAvailablilityTracker.cs => OnlinePlayBeatmapAvailablilityTracker.cs} (95%)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
similarity index 96%
rename from osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
rename to osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 646c4139af..d3475de157 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -28,7 +28,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Online
 {
     [HeadlessTest]
-    public class TestSceneMultiplayerBeatmapAvailabilityTracker : OsuTestScene
+    public class TestSceneOnlinePlayBeatmapAvailabilityTracker : OsuTestScene
     {
         private RulesetStore rulesets;
         private TestBeatmapManager beatmaps;
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Online
         private BeatmapSetInfo testBeatmapSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private MultiplayerBeatmapAvailablilityTracker availablilityTracker;
+        private OnlinePlayBeatmapAvailablilityTracker availablilityTracker;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, GameHost host)
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Online
                 Ruleset = { Value = testBeatmapInfo.Ruleset },
             };
 
-            Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem, }
             };
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Online
             });
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("recreate tracker", () => Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            AddStep("recreate tracker", () => Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
similarity index 95%
rename from osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
rename to osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index 578c4db2f8..ad4b3c5151 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     /// This differs from a regular download tracking composite as this accounts for the
     /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
     /// </summary>
-    public class MultiplayerBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    public class OnlinePlayBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
@@ -26,7 +26,7 @@ namespace osu.Game.Online.Rooms
 
         private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
 
-        public MultiplayerBeatmapAvailablilityTracker()
+        public OnlinePlayBeatmapAvailablilityTracker()
         {
             State.BindValueChanged(_ => updateAvailability());
             Progress.BindValueChanged(_ => updateAvailability(), true);
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index cdf889e4f1..b1b3dde26e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
+        protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
         protected RoomSubScreen()
         {
-            BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };