h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 16:32:54 +08:00
Code Issues Releases Wiki Activity

Rename API score classes

Browse Source
This commit is contained in:
Dean Herbert 2021-10-28 17:48:56 +09:00
parent 34d4715220
commit 817369903a
9 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
View File

@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private ScoreInfo getScoreInfo(bool replayAvailable) private ScoreInfo getScoreInfo(bool replayAvailable)
{ {
return new APILegacyScoreInfo return new APIScoreInfo
{ {
OnlineScoreID = 2553163309, OnlineScoreID = 2553163309,
OnlineRulesetID = 0, OnlineRulesetID = 0,

30
osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
View File

@ -43,11 +43,11 @@ namespace osu.Game.Tests.Visual.Online
} }
}; };
var allScores = new APILegacyScores var allScores = new APIScoresCollection
{ {
Scores = new List<APILegacyScoreInfo> Scores = new List<APIScoreInfo>
{ {
new APILegacyScoreInfo new APIScoreInfo
{ {
User = new User User = new User
{ {
@ -72,7 +72,7 @@ namespace osu.Game.Tests.Visual.Online
TotalScore = 1234567890, TotalScore = 1234567890,
Accuracy = 1, Accuracy = 1,
}, },
new APILegacyScoreInfo new APIScoreInfo
{ {
User = new User User = new User
{ {
@ -96,7 +96,7 @@ namespace osu.Game.Tests.Visual.Online
TotalScore = 1234789, TotalScore = 1234789,
Accuracy = 0.9997, Accuracy = 0.9997,
}, },
new APILegacyScoreInfo new APIScoreInfo
{ {
User = new User User = new User
{ {
@ -119,7 +119,7 @@ namespace osu.Game.Tests.Visual.Online
TotalScore = 12345678, TotalScore = 12345678,
Accuracy = 0.9854, Accuracy = 0.9854,
}, },
new APILegacyScoreInfo new APIScoreInfo
{ {
User = new User User = new User
{ {
@ -141,7 +141,7 @@ namespace osu.Game.Tests.Visual.Online
TotalScore = 1234567, TotalScore = 1234567,
Accuracy = 0.8765, Accuracy = 0.8765,
}, },
new APILegacyScoreInfo new APIScoreInfo
{ {
User = new User User = new User
{ {
@ -162,9 +162,9 @@ namespace osu.Game.Tests.Visual.Online
} }
}; };
var myBestScore = new APILegacyUserTopScoreInfo var myBestScore = new APIScoreWithPosition
{ {
Score = new APILegacyScoreInfo Score = new APIScoreInfo
{ {
User = new User User = new User
{ {
@ -185,9 +185,9 @@ namespace osu.Game.Tests.Visual.Online
Position = 1337, Position = 1337,
}; };
var myBestScoreWithNullPosition = new APILegacyUserTopScoreInfo var myBestScoreWithNullPosition = new APIScoreWithPosition
{ {
Score = new APILegacyScoreInfo Score = new APIScoreInfo
{ {
User = new User User = new User
{ {
@ -208,11 +208,11 @@ namespace osu.Game.Tests.Visual.Online
Position = null, Position = null,
}; };
var oneScore = new APILegacyScores var oneScore = new APIScoresCollection
{ {
Scores = new List<APILegacyScoreInfo> Scores = new List<APIScoreInfo>
{ {
new APILegacyScoreInfo new APIScoreInfo
{ {
User = new User User = new User
{ {
@ -273,7 +273,7 @@ namespace osu.Game.Tests.Visual.Online
private class TestScoresContainer : ScoresContainer private class TestScoresContainer : ScoresContainer
{ {
public new APILegacyScores Scores public new APIScoresCollection Scores
{ {
set => base.Scores = value; set => base.Scores = value;
} }

6
osu.Game/Online/API/Requests/GetScoresRequest.cs
View File

@ -13,7 +13,7 @@ using System.Diagnostics;
namespace osu.Game.Online.API.Requests namespace osu.Game.Online.API.Requests
{ {
public class GetScoresRequest : APIRequest<APILegacyScores> public class GetScoresRequest : APIRequest<APIScoresCollection>
{ {
private readonly BeatmapInfo beatmapInfo; private readonly BeatmapInfo beatmapInfo;
private readonly BeatmapLeaderboardScope scope; private readonly BeatmapLeaderboardScope scope;
@ -36,11 +36,11 @@ namespace osu.Game.Online.API.Requests
Success += onSuccess; Success += onSuccess;
} }
private void onSuccess(APILegacyScores r) private void onSuccess(APIScoresCollection r)
{ {
Debug.Assert(ruleset.ID != null, "ruleset.ID != null"); Debug.Assert(ruleset.ID != null, "ruleset.ID != null");
foreach (APILegacyScoreInfo score in r.Scores) foreach (APIScoreInfo score in r.Scores)
{ {
score.BeatmapInfo = beatmapInfo; score.BeatmapInfo = beatmapInfo;
score.OnlineRulesetID = ruleset.ID.Value; score.OnlineRulesetID = ruleset.ID.Value;

2
osu.Game/Online/API/Requests/GetUserScoresRequest.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Rulesets;
namespace osu.Game.Online.API.Requests namespace osu.Game.Online.API.Requests
{ {
public class GetUserScoresRequest : PaginatedAPIRequest<List<APILegacyScoreInfo>> public class GetUserScoresRequest : PaginatedAPIRequest<List<APIScoreInfo>>
{ {
private readonly long userId; private readonly long userId;
private readonly ScoreType type; private readonly ScoreType type;

2
osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs → osu.Game/Online/API/Requests/Responses/APIScoreInfo.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Users;
namespace osu.Game.Online.API.Requests.Responses namespace osu.Game.Online.API.Requests.Responses
{ {
public class APILegacyScoreInfo public class APIScoreInfo
{ {
public ScoreInfo CreateScoreInfo(RulesetStore rulesets) public ScoreInfo CreateScoreInfo(RulesetStore rulesets)
{ {

16
osu.Game/Online/API/Requests/Responses/APILegacyScores.cs → osu.Game/Online/API/Requests/Responses/APIScoreWithPosition.cs
View File

@ -1,29 +1,19 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Scoring; using osu.Game.Scoring;
namespace osu.Game.Online.API.Requests.Responses namespace osu.Game.Online.API.Requests.Responses
{ {
public class APILegacyScores public class APIScoreWithPosition
{
[JsonProperty(@"scores")]
public List<APILegacyScoreInfo> Scores;
[JsonProperty(@"userScore")]
public APILegacyUserTopScoreInfo UserScore;
}
public class APILegacyUserTopScoreInfo
{ {
[JsonProperty(@"position")] [JsonProperty(@"position")]
public int? Position; public int? Position;
[JsonProperty(@"score")] [JsonProperty(@"score")]
public APILegacyScoreInfo Score; public APIScoreInfo Score;
public ScoreInfo CreateScoreInfo(RulesetStore rulesets) public ScoreInfo CreateScoreInfo(RulesetStore rulesets)
{ {

17
osu.Game/Online/API/Requests/Responses/APIScoresCollection.cs Normal file
View File

@ -0,0 +1,17 @@
// 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.Collections.Generic;
using Newtonsoft.Json;
namespace osu.Game.Online.API.Requests.Responses
{
public class APIScoresCollection
{
[JsonProperty(@"scores")]
public List<APIScoreInfo> Scores;
[JsonProperty(@"userScore")]
public APIScoreWithPosition UserScore;
}
}

2
osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private CancellationTokenSource loadCancellationSource; private CancellationTokenSource loadCancellationSource;
protected APILegacyScores Scores protected APIScoresCollection Scores
{ {
set => Schedule(() => set => Schedule(() =>
{ {

8
osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
View File

@ -15,7 +15,7 @@ using osu.Framework.Localisation;
namespace osu.Game.Overlays.Profile.Sections.Ranks namespace osu.Game.Overlays.Profile.Sections.Ranks
{ {
public class PaginatedScoreContainer : PaginatedProfileSubsection<APILegacyScoreInfo> public class PaginatedScoreContainer : PaginatedProfileSubsection<APIScoreInfo>
{ {
private readonly ScoreType type; private readonly ScoreType type;
@ -51,7 +51,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
} }
} }
protected override void OnItemsReceived(List<APILegacyScoreInfo> items) protected override void OnItemsReceived(List<APIScoreInfo> items)
{ {
if (VisiblePages == 0) if (VisiblePages == 0)
drawableItemIndex = 0; drawableItemIndex = 0;
@ -59,12 +59,12 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
base.OnItemsReceived(items); base.OnItemsReceived(items);
} }
protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() => protected override APIRequest<List<APIScoreInfo>> CreateRequest() =>
new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage); new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
private int drawableItemIndex; private int drawableItemIndex;
protected override Drawable CreateDrawableItem(APILegacyScoreInfo model) protected override Drawable CreateDrawableItem(APIScoreInfo model)
{ {
switch (type) switch (type)
{ {