Keep provided IDs where possible if not online

ppy · Mar 30, 2020 · 7ecce71 · 7ecce71
1 parent 09d860d
commit 7ecce71
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -451,12 +451,15 @@ private void update(BeatmapSetInfo set, BeatmapInfo beatmap)
 
                     var res = req.Result;
 
-                    beatmap.Status = res.Status;
-                    beatmap.BeatmapSet.Status = res.BeatmapSet.Status;
-                    beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
-                    beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
-
-                    LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
+                    if (res != null)
+                    {
+                        beatmap.Status = res.Status;
+                        beatmap.BeatmapSet.Status = res.BeatmapSet.Status;
+                        beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
+                        beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
+
+                        LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
+                    }
                 }
                 catch (Exception e)
                 {

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
@@ -12,11 +12,11 @@ namespace osu.Game.Online.API
     /// An API request with a well-defined response type.
     /// </summary>
     /// <typeparam name="T">Type of the response (used for deserialisation).</typeparam>
-    public abstract class APIRequest<T> : APIRequest
+    public abstract class APIRequest<T> : APIRequest where T : class
     {
         protected override WebRequest CreateWebRequest() => new OsuJsonWebRequest<T>(Uri);
 
-        public T Result => ((OsuJsonWebRequest<T>)WebRequest).ResponseObject;
+        public T Result => ((OsuJsonWebRequest<T>)WebRequest)?.ResponseObject;
 
         protected APIRequest()
         {

diff --git a/osu.Game/Online/API/Requests/GetRankingsRequest.cs b/osu.Game/Online/API/Requests/GetRankingsRequest.cs
@@ -6,7 +6,8 @@
 
 namespace osu.Game.Online.API.Requests
 {
-    public abstract class GetRankingsRequest<TModel> : APIRequest<TModel>
+    public abstract class GetRankingsRequest<TModel> : APIRequest<TModel> where TModel : class
+
     {
         private readonly RulesetInfo ruleset;
         private readonly int page;

diff --git a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
@@ -6,7 +6,7 @@
 
 namespace osu.Game.Online.API.Requests
 {
-    public abstract class PaginatedAPIRequest<T> : APIRequest<T>
+    public abstract class PaginatedAPIRequest<T> : APIRequest<T> where T : class
     {
         private readonly int page;
         private readonly int itemsPerPage;