h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:57:36 +08:00
Code Issues Releases Wiki Activity

Merge pull request #18750 from frenzibyte/tournament-player

Browse Source 
Improve tournament player JSON storage using lightweight model
This commit is contained in:
Dean Herbert 2022-06-18 10:52:54 +09:00 committed by GitHub
commit fbca7c761d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 108 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
View File

@ -5,7 +5,6 @@
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Tests.Visual;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
@ -26,13 +25,13 @@ namespace osu.Game.Tournament.Tests.Components
FullName = { Value = "Australia" },
Players =
{
new APIUser { Username = "ASecretBox" },
new APIUser { Username = "Dereban" },
new APIUser { Username = "mReKk" },
new APIUser { Username = "uyghti" },
new APIUser { Username = "Parkes" },
new APIUser { Username = "Shiroha" },
new APIUser { Username = "Jordan The Bear" },
new TournamentUser { Username = "ASecretBox" },
new TournamentUser { Username = "Dereban" },
new TournamentUser { Username = "mReKk" },
new TournamentUser { Username = "uyghti" },
new TournamentUser { Username = "Parkes" },
new TournamentUser { Username = "Shiroha" },
new TournamentUser { Username = "Jordan The Bear" },
}
};

18
osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
View File

@ -27,16 +27,16 @@ namespace osu.Game.Tournament.Tests.Components
Colour = "f2ca34"
};
private readonly APIUser redUser = new APIUser
private readonly TournamentUser redUser = new TournamentUser
{
Username = "BanchoBot",
Id = 3,
OnlineID = 3,
};
private readonly APIUser blueUser = new APIUser
private readonly TournamentUser blueUser = new TournamentUser
{
Username = "Zallius",
Id = 4,
OnlineID = 4,
};
[Cached]
@ -59,11 +59,11 @@ namespace osu.Game.Tournament.Tests.Components
{
Team1 =
{
Value = new TournamentTeam { Players = new BindableList<APIUser> { redUser } }
Value = new TournamentTeam { Players = new BindableList<TournamentUser> { redUser } }
},
Team2 =
{
Value = new TournamentTeam { Players = new BindableList<APIUser> { blueUser } }
Value = new TournamentTeam { Players = new BindableList<TournamentUser> { blueUser } }
}
};
@ -82,19 +82,19 @@ namespace osu.Game.Tournament.Tests.Components
AddStep("message from team red", () => testChannel.AddNewMessages(new Message(nextMessageId())
{
Sender = redUser,
Sender = redUser.ToAPIUser(),
Content = "I am team red."
}));
AddStep("message from team red", () => testChannel.AddNewMessages(new Message(nextMessageId())
{
Sender = redUser,
Sender = redUser.ToAPIUser(),
Content = "I plan to win!"
}));
AddStep("message from team blue", () => testChannel.AddNewMessages(new Message(nextMessageId())
{
Sender = blueUser,
Sender = blueUser.ToAPIUser(),
Content = "Not on my watch. Prepare to eat saaaaaaaaaand. Lots and lots of saaaaaaand."
}));

22
osu.Game.Tournament.Tests/TournamentTestScene.cs
View File

@ -15,8 +15,6 @@ using osu.Game.Tests.Visual;
using osu.Game.Tournament.IO;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Models;
using osu.Game.Users;
using APIUser = osu.Game.Online.API.Requests.Responses.APIUser;
namespace osu.Game.Tournament.Tests
{
@ -123,11 +121,11 @@ namespace osu.Game.Tournament.Tests
},
Players =
{
new APIUser { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 12 } },
new APIUser { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 16 } },
new APIUser { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 20 } },
new APIUser { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 24 } },
new APIUser { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 30 } },
new TournamentUser { Username = "Hello", Rank = 12 },
new TournamentUser { Username = "Hello", Rank = 16 },
new TournamentUser { Username = "Hello", Rank = 20 },
new TournamentUser { Username = "Hello", Rank = 24 },
new TournamentUser { Username = "Hello", Rank = 30 },
}
}
},
@ -140,11 +138,11 @@ namespace osu.Game.Tournament.Tests
FullName = { Value = "United States" },
Players =
{
new APIUser { Username = "Hello" },
new APIUser { Username = "Hello" },
new APIUser { Username = "Hello" },
new APIUser { Username = "Hello" },
new APIUser { Username = "Hello" },
new TournamentUser { Username = "Hello" },
new TournamentUser { Username = "Hello" },
new TournamentUser { Username = "Hello" },
new TournamentUser { Username = "Hello" },
new TournamentUser { Username = "Hello" },
}
}
},

3
osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
View File

@ -7,7 +7,6 @@ using System.Linq;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Tournament.Models;
using osuTK;
using osuTK.Graphics;
@ -56,7 +55,7 @@ namespace osu.Game.Tournament.Components
},
};
TournamentSpriteText createPlayerText(APIUser p) =>
TournamentSpriteText createPlayerText(TournamentUser p) =>
new TournamentSpriteText
{
Text = p.Username,

5
osu.Game.Tournament/Models/TournamentTeam.cs
View File

@ -7,7 +7,6 @@ using System;
using System.Linq;
using Newtonsoft.Json;
using osu.Framework.Bindables;
using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Tournament.Models
{
@ -38,7 +37,7 @@ namespace osu.Game.Tournament.Models
{
get
{
int[] ranks = Players.Select(p => p.Statistics?.GlobalRank)
int[] ranks = Players.Select(p => p.Rank)
.Where(i => i.HasValue)
.Select(i => i.Value)
.ToArray();
@ -59,7 +58,7 @@ namespace osu.Game.Tournament.Models
};
[JsonProperty]
public BindableList<APIUser> Players { get; set; } = new BindableList<APIUser>();
public BindableList<TournamentUser> Players { get; set; } = new BindableList<TournamentUser>();
public TournamentTeam()
{

58
osu.Game.Tournament/Models/TournamentUser.cs Normal file
View File

@ -0,0 +1,58 @@
// 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 Newtonsoft.Json;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Users;
namespace osu.Game.Tournament.Models
{
/// <summary>
/// A tournament player user, containing simple information about the player.
/// </summary>
[Serializable]
public class TournamentUser : IUser
{
[JsonProperty(@"id")]
public int OnlineID { get; set; }
public string Username { get; set; } = string.Empty;
/// <summary>
/// The player's country.
/// </summary>
public Country? Country { get; set; }
/// <summary>
/// The player's global rank, or null if not available.
/// </summary>
public int? Rank { get; set; }
/// <summary>
/// A URL to the player's profile cover.
/// </summary>
public string CoverUrl { get; set; } = string.Empty;
public APIUser ToAPIUser()
{
var user = new APIUser
{
Id = OnlineID,
Username = Username,
Country = Country,
CoverUrl = CoverUrl,
};
user.Statistics = new UserStatistics
{
User = user,
GlobalRank = Rank
};
return user;
}
bool IUser.IsBot => false;
}
}

25
osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
View File

@ -15,7 +15,6 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays.Settings;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
@ -202,14 +201,14 @@ namespace osu.Game.Tournament.Screens.Editors
public void CreateNew()
{
var user = new APIUser();
team.Players.Add(user);
flow.Add(new PlayerRow(team, user));
var player = new TournamentUser();
team.Players.Add(player);
flow.Add(new PlayerRow(team, player));
}
public class PlayerRow : CompositeDrawable
{
private readonly APIUser user;
private readonly TournamentUser user;
[Resolved]
protected IAPIProvider API { get; private set; }
@ -217,11 +216,11 @@ namespace osu.Game.Tournament.Screens.Editors
[Resolved]
private TournamentGameBase game { get; set; }
private readonly Bindable<int?> userId = new Bindable<int?>();
private readonly Bindable<int?> playerId = new Bindable<int?>();
private readonly Container drawableContainer;
public PlayerRow(TournamentTeam team, APIUser user)
public PlayerRow(TournamentTeam team, TournamentUser user)
{
this.user = user;
@ -254,7 +253,7 @@ namespace osu.Game.Tournament.Screens.Editors
LabelText = "User ID",
RelativeSizeAxes = Axes.None,
Width = 200,
Current = userId,
Current = playerId,
},
drawableContainer = new Container
{
@ -281,10 +280,10 @@ namespace osu.Game.Tournament.Screens.Editors
[BackgroundDependencyLoader]
private void load()
{
userId.Value = user.Id;
userId.BindValueChanged(id =>
playerId.Value = user.OnlineID;
playerId.BindValueChanged(id =>
{
user.Id = id.NewValue ?? 0;
user.OnlineID = id.NewValue ?? 0;
if (id.NewValue != id.OldValue)
user.Username = string.Empty;
@ -295,13 +294,13 @@ namespace osu.Game.Tournament.Screens.Editors
return;
}
game.PopulateUser(user, updatePanel, updatePanel);
game.PopulatePlayer(user, updatePanel, updatePanel);
}, true);
}
private void updatePanel()
{
drawableContainer.Child = new UserGridPanel(user) { Width = 300 };
drawableContainer.Child = new UserGridPanel(user.ToAPIUser()) { Width = 300 };
}
}
}

2
osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
View File

@ -257,7 +257,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
};
foreach (var p in team.Players)
fill.Add(new RowDisplay(p.Username, p.Statistics?.GlobalRank?.ToString("\\##,0") ?? "-"));
fill.Add(new RowDisplay(p.Username, p.Rank?.ToString("\\##,0") ?? "-"));
}
internal class RowDisplay : CompositeDrawable

19
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -22,7 +22,6 @@ using osu.Game.Tournament.IO;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Models;
using osuTK.Input;
using APIUser = osu.Game.Online.API.Requests.Responses.APIUser;
namespace osu.Game.Tournament
{
@ -187,9 +186,7 @@ namespace osu.Game.Tournament
{
var playersRequiringPopulation = ladder.Teams
.SelectMany(t => t.Players)
.Where(p => string.IsNullOrEmpty(p.Username)
|| p.Statistics?.GlobalRank == null
|| p.Statistics?.CountryRank == null).ToList();
.Where(p => string.IsNullOrEmpty(p.Username) || p.Rank == null).ToList();
if (playersRequiringPopulation.Count == 0)
return false;
@ -197,7 +194,7 @@ namespace osu.Game.Tournament
for (int i = 0; i < playersRequiringPopulation.Count; i++)
{
var p = playersRequiringPopulation[i];
PopulateUser(p, immediate: true);
PopulatePlayer(p, immediate: true);
updateLoadProgressMessage($"Populating user stats ({i} / {playersRequiringPopulation.Count})");
}
@ -259,9 +256,9 @@ namespace osu.Game.Tournament
private void updateLoadProgressMessage(string s) => Schedule(() => initialisationText.Text = s);
public void PopulateUser(APIUser user, Action success = null, Action failure = null, bool immediate = false)
public void PopulatePlayer(TournamentUser user, Action success = null, Action failure = null, bool immediate = false)
{
var req = new GetUserRequest(user.Id, ladder.Ruleset.Value);
var req = new GetUserRequest(user.OnlineID, ladder.Ruleset.Value);
if (immediate)
{
@ -273,7 +270,7 @@ namespace osu.Game.Tournament
req.Success += res => { populate(); };
req.Failure += _ =>
{
user.Id = 1;
user.OnlineID = 1;
failure?.Invoke();
};
@ -287,12 +284,12 @@ namespace osu.Game.Tournament
if (res == null)
return;
user.Id = res.Id;
user.OnlineID = res.Id;
user.Username = res.Username;
user.Statistics = res.Statistics;
user.CoverUrl = res.CoverUrl;
user.Country = res.Country;
user.Cover = res.Cover;
user.Rank = res.Statistics?.GlobalRank;
success?.Invoke();
}