Merge pull request #19126 from peppy/lazer-leaderboards

Show leaderboard scores from new data source
ppy · Jul 15, 2022 · cbbc8fd · cbbc8fd
2 parents 288fdbd + 4b253f8
commit cbbc8fd
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
@@ -274,14 +274,18 @@ private APIScoresCollection createScores()
                 }
             };
 
+            const int initial_great_count = 2000;
+
+            int greatCount = initial_great_count;
+
             foreach (var s in scores.Scores)
             {
                 s.Statistics = new Dictionary<HitResult, int>
                 {
-                    { HitResult.Great, RNG.Next(2000) },
-                    { HitResult.Ok, RNG.Next(2000) },
-                    { HitResult.Meh, RNG.Next(2000) },
-                    { HitResult.Miss, RNG.Next(2000) }
+                    { HitResult.Great, greatCount -= 100 },
+                    { HitResult.Ok, RNG.Next(100) },
+                    { HitResult.Meh, RNG.Next(100) },
+                    { HitResult.Miss, initial_great_count - greatCount }
                 };
             }
 

diff --git a/osu.Game/Database/EFToRealmMigrator.cs b/osu.Game/Database/EFToRealmMigrator.cs
@@ -443,7 +443,6 @@ private void migrateScores(OsuDbContext db)
                             TotalScore = score.TotalScore,
                             MaxCombo = score.MaxCombo,
                             Accuracy = score.Accuracy,
-                            HasReplay = ((IScoreInfo)score).HasReplay,
                             Date = score.Date,
                             PP = score.PP,
                             Rank = score.Rank,

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
@@ -59,8 +59,9 @@ public class RealmAccess : IDisposable
         /// 13   2022-01-13    Final migration of beatmaps and scores to realm (multiple new storage fields).
         /// 14   2022-03-01    Added BeatmapUserSettings to BeatmapInfo.
         /// 15   2022-07-13    Added LastPlayed to BeatmapInfo.
+        /// 16   2022-07-15    Removed HasReplay from ScoreInfo.
         /// </summary>
-        private const int schema_version = 15;
+        private const int schema_version = 16;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.

diff --git a/osu.Game/Online/API/Requests/GetScoresRequest.cs b/osu.Game/Online/API/Requests/GetScoresRequest.cs
@@ -35,7 +35,7 @@ public GetScoresRequest(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset, BeatmapL
             this.mods = mods ?? Array.Empty<IMod>();
         }
 
-        protected override string Target => $@"beatmaps/{beatmapInfo.OnlineID}/scores{createQueryParameters()}";
+        protected override string Target => $@"beatmaps/{beatmapInfo.OnlineID}/solo-scores{createQueryParameters()}";
 
         private string createQueryParameters()
         {

diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -103,9 +103,6 @@ public ScoreInfo ToScoreInfo(RulesetStore rulesets, BeatmapInfo? beatmap = null)
 
             var mods = Mods.Select(apiMod => rulesetInstance.CreateModFromAcronym(apiMod.Acronym)).Where(m => m != null).ToArray();
 
-            // all API scores provided by this class are considered to be legacy.
-            mods = mods.Append(rulesetInstance.CreateMod<ModClassic>()).ToArray();
-
             var scoreInfo = ToScoreInfo(mods);
 
             scoreInfo.Ruleset = ruleset;
@@ -132,8 +129,7 @@ public ScoreInfo ToScoreInfo(RulesetStore rulesets, BeatmapInfo? beatmap = null)
             Rank = Rank,
             Statistics = Statistics,
             Date = EndedAt ?? DateTimeOffset.Now,
-            Hash = "online", // TODO: temporary?
-            HasReplay = HasReplay,
+            Hash = HasReplay ? "online" : string.Empty, // TODO: temporary?
             Mods = mods,
             PP = PP,
         };

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
@@ -45,7 +45,7 @@ public class ScoreInfo : RealmObject, IHasGuidPrimaryKey, IHasRealmFiles, ISoftD
 
         public double Accuracy { get; set; }
 
-        public bool HasReplay { get; set; }
+        public bool HasReplay => !string.IsNullOrEmpty(Hash);
 
         public DateTimeOffset Date { get; set; }
 

diff --git a/osu.Game/Scoring/ScoreRank.cs b/osu.Game/Scoring/ScoreRank.cs
@@ -11,6 +11,10 @@ namespace osu.Game.Scoring
 {
     public enum ScoreRank
     {
+        // TODO: Localisable?
+        [Description(@"F")]
+        F = -1,
+
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.RankD))]
         [Description(@"D")]
         D,

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -33,7 +33,7 @@ private ReplayAvailability replayAvailability
                 if (State.Value == DownloadState.LocallyAvailable)
                     return ReplayAvailability.Local;
 
-                if (!string.IsNullOrEmpty(Score.Value?.Hash))
+                if (Score.Value?.HasReplay == true)
                     return ReplayAvailability.Online;
 
                 return ReplayAvailability.NotAvailable;