From 617e6febb6bb81c61fbf126089a836edf7860817 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Oct 2021 20:02:51 +0900
Subject: [PATCH] Refactor `ModelDownloader` to allow for different `OnlineID
 matching`

---
 osu.Game/Beatmaps/BeatmapModelDownloader.cs |  3 +++
 osu.Game/Database/ModelDownloader.cs        | 12 ++++++------
 osu.Game/Scoring/ScoreInfo.cs               |  2 +-
 osu.Game/Scoring/ScoreModelDownloader.cs    |  3 +++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapModelDownloader.cs b/osu.Game/Beatmaps/BeatmapModelDownloader.cs
index 30dc95a966..001726e741 100644
--- a/osu.Game/Beatmaps/BeatmapModelDownloader.cs
+++ b/osu.Game/Beatmaps/BeatmapModelDownloader.cs
@@ -13,6 +13,9 @@ namespace osu.Game.Beatmaps
         protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize) =>
             new DownloadBeatmapSetRequest(set, minimiseDownloadSize);
 
+        public override ArchiveDownloadRequest<BeatmapSetInfo> GetExistingDownload(BeatmapSetInfo model)
+            => CurrentDownloads.Find(r => r.Model.OnlineID == model.OnlineID);
+
         public BeatmapModelDownloader(IBeatmapModelManager beatmapModelManager, IAPIProvider api, GameHost host = null)
             : base(beatmapModelManager, api, host)
         {
diff --git a/osu.Game/Database/ModelDownloader.cs b/osu.Game/Database/ModelDownloader.cs
index b9677c1b2b..12bf5e9ce7 100644
--- a/osu.Game/Database/ModelDownloader.cs
+++ b/osu.Game/Database/ModelDownloader.cs
@@ -15,7 +15,7 @@ using osu.Game.Overlays.Notifications;
 namespace osu.Game.Database
 {
     public abstract class ModelDownloader<TModel> : IModelDownloader<TModel>
-        where TModel : class, IHasPrimaryKey, ISoftDelete, IEquatable<TModel>, IHasOnlineID
+        where TModel : class, IHasPrimaryKey, ISoftDelete, IEquatable<TModel>
     {
         public Action<Notification> PostNotification { protected get; set; }
 
@@ -30,7 +30,7 @@ namespace osu.Game.Database
         private readonly IModelManager<TModel> modelManager;
         private readonly IAPIProvider api;
 
-        private readonly List<ArchiveDownloadRequest<TModel>> currentDownloads = new List<ArchiveDownloadRequest<TModel>>();
+        protected readonly List<ArchiveDownloadRequest<TModel>> CurrentDownloads = new List<ArchiveDownloadRequest<TModel>>();
 
         protected ModelDownloader(IModelManager<TModel> modelManager, IAPIProvider api, IIpcHost importHost = null)
         {
@@ -74,7 +74,7 @@ namespace osu.Game.Database
                     if (!imported.Any())
                         downloadFailed.Value = new WeakReference<ArchiveDownloadRequest<TModel>>(request);
 
-                    currentDownloads.Remove(request);
+                    CurrentDownloads.Remove(request);
                 }, TaskCreationOptions.LongRunning);
             };
 
@@ -86,7 +86,7 @@ namespace osu.Game.Database
                 return true;
             };
 
-            currentDownloads.Add(request);
+            CurrentDownloads.Add(request);
             PostNotification?.Invoke(notification);
 
             api.PerformAsync(request);
@@ -96,7 +96,7 @@ namespace osu.Game.Database
 
             void triggerFailure(Exception error)
             {
-                currentDownloads.Remove(request);
+                CurrentDownloads.Remove(request);
 
                 downloadFailed.Value = new WeakReference<ArchiveDownloadRequest<TModel>>(request);
 
@@ -107,7 +107,7 @@ namespace osu.Game.Database
             }
         }
 
-        public ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model) => currentDownloads.Find(r => r.Model.OnlineID == model.OnlineID);
+        public abstract ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model);
 
         private bool canDownload(TModel model) => GetExistingDownload(model) == null && api != null;
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 1bc04cd21e..5cf22f7945 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -19,7 +19,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Scoring
 {
-    public class ScoreInfo : IHasFiles<ScoreFileInfo>, IHasPrimaryKey, ISoftDelete, IEquatable<ScoreInfo>, IDeepCloneable<ScoreInfo>, IHasOnlineID
+    public class ScoreInfo : IHasFiles<ScoreFileInfo>, IHasPrimaryKey, ISoftDelete, IEquatable<ScoreInfo>, IDeepCloneable<ScoreInfo>
     {
         public int ID { get; set; }
 
diff --git a/osu.Game/Scoring/ScoreModelDownloader.cs b/osu.Game/Scoring/ScoreModelDownloader.cs
index b3c1e2928a..52355585a9 100644
--- a/osu.Game/Scoring/ScoreModelDownloader.cs
+++ b/osu.Game/Scoring/ScoreModelDownloader.cs
@@ -16,5 +16,8 @@ namespace osu.Game.Scoring
         }
 
         protected override ArchiveDownloadRequest<ScoreInfo> CreateDownloadRequest(ScoreInfo score, bool minimiseDownload) => new DownloadReplayRequest(score);
+
+        public override ArchiveDownloadRequest<ScoreInfo> GetExistingDownload(ScoreInfo model)
+            => CurrentDownloads.Find(r => r.Model.OnlineScoreID == model.OnlineScoreID);
     }
 }