RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-31 10:22:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge scoreboard and leaderboard implementations together

Browse Source
This commit is contained in:
dekrain 2022-02-19 20:47:02 +01:00
parent 1abbb9ab39
commit 15ed9ec4fa
No known key found for this signature in database
GPG Key ID: E20077A4AB510334
4 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
View File

@ -388,6 +388,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 0.5140,
MaxCombo = 244,
TotalScore = 1707827,
Date = DateTime.Now.AddMonths(-3),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@ -409,6 +410,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 0.4222,
MaxCombo = 244,
TotalScore = 1707827,
Date = DateTime.Now.AddYears(-2),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,

23
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -1,4 +1,4 @@
// 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.
using System;
@ -30,7 +30,7 @@ using osuTK;
using osuTK.Graphics;
using osu.Game.Online.API;
using osu.Game.Utils;
using osu.Game.Resources.Localisation.Web;
using osu.Framework.Utils;
namespace osu.Game.Online.Leaderboards
{
@ -398,24 +398,7 @@ namespace osu.Game.Online.Leaderboards
protected override string Format()
{
var now = DateTime.Now;
var difference = now - Date;
// TODO(optional): support localisation (probably via `CommonStrings.CountHours()` etc.)
// requires pluralisable string support framework-side
if (difference.TotalSeconds < 10)
return CommonStrings.TimeNow.ToString();
if (difference.TotalMinutes < 1)
return $@"{Math.Floor(difference.TotalSeconds)}s";
if (difference.TotalHours < 1)
return $@"{Math.Floor(difference.TotalMinutes)}min";
if (difference.TotalDays < 1)
return $@"{Math.Floor(difference.TotalHours)}h";
if (difference.TotalDays < 3)
return $@"{Math.Floor(difference.TotalDays)}d";
return string.Empty;
return ScoreboardTimeUtils.FormatDate(Date, TimeSpan.FromSeconds(30));
}
}

40
osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs
View File

@ -2,9 +2,8 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using Humanizer;
using osu.Game.Graphics;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Utils;
namespace osu.Game.Overlays.BeatmapSet.Scores
{
@ -16,41 +15,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
}
protected override string Format()
{
var now = DateTime.Now;
var difference = now - Date;
// web uses momentjs's custom locales to format the date for the purposes of the scoreboard.
// this is intended to be a best-effort, more legible approximation of that.
// compare:
// * https://github.com/ppy/osu-web/blob/a8f5a68fb435cb19a4faa4c7c4bce08c4f096933/resources/assets/lib/scoreboard-time.tsx
// * https://momentjs.com/docs/#/customization/ (reference for the customisation format)
// TODO: support localisation (probably via `CommonStrings.CountHours()` etc.)
// requires pluralisable string support framework-side
if (difference.TotalHours < 1)
return CommonStrings.TimeNow.ToString();
if (difference.TotalDays < 1)
return "hr".ToQuantity((int)difference.TotalHours);
// this is where this gets more complicated because of how the calendar works.
// since there's no `TotalMonths` / `TotalYears`, we have to iteratively add months/years
// and test against cutoff dates to determine how many months/years to show.
if (Date > now.AddMonths(-1))
return difference.TotalDays < 2 ? "1dy" : $"{(int)difference.TotalDays}dys";
for (int months = 1; months <= 11; ++months)
{
if (Date > now.AddMonths(-(months + 1)))
return months == 1 ? "1mo" : $"{months}mos";
}
int years = 1;
while (Date <= now.AddYears(-(years + 1)))
years += 1;
return years == 1 ? "1yr" : $"{years}yrs";
}
=> ScoreboardTimeUtils.FormatDate(Date, TimeSpan.FromHours(1));
}
}

66
osu.Game/Utils/ScoreboardTimeUtils.cs Normal file
View File

@ -0,0 +1,66 @@
// 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 osu.Game.Resources.Localisation.Web;
#nullable enable
namespace osu.Game.Utils
{
public static class ScoreboardTimeUtils
{
public static string FormatQuantity(string template, int quantity)
{
if (quantity <= 1)
return $@"{quantity}{template}";
return $@"{quantity}{template}s";
}
public static string FormatDate(DateTimeOffset time, TimeSpan lowerCutoff)
{
// This function fails if the passed in time is something close to an epoch
// web uses momentjs's custom locales to format the date for the purposes of the scoreboard.
// this is intended to be a best-effort, more legible approximation of that.
// compare:
// * https://github.com/ppy/osu-web/blob/a8f5a68fb435cb19a4faa4c7c4bce08c4f096933/resources/assets/lib/scoreboard-time.tsx
// * https://momentjs.com/docs/#/customization/ (reference for the customisation format)
// TODO: support localisation (probably via `CommonStrings.CountHours()` etc.)
// requires pluralisable string support framework-side
var now = DateTime.Now;
var span = now - time;
if (span < lowerCutoff)
return CommonStrings.TimeNow.ToString();
if (span.TotalMinutes < 1)
return FormatQuantity("sec", (int)span.TotalSeconds);
if (span.TotalHours < 1)
return FormatQuantity("min", (int)span.TotalMinutes);
if (span.TotalDays < 1)
return FormatQuantity("hr", (int)span.TotalHours);
// this is where this gets more complicated because of how the calendar works.
// since there's no `TotalMonths` / `TotalYears`, we have to iteratively add months/years
// and test against cutoff dates to determine how many months/years to show.
if (time > now.AddMonths(-1))
return FormatQuantity("dy", (int)span.TotalDays);
for (int months = 1; months <= 11; ++months)
{
if (time > now.AddMonths(-(months + 1)))
return FormatQuantity("mo", months);
}
int years = 1;
// DateTime causes a crash here for epoch
while (time <= now.AddYears(-(years + 1)))
years += 1;
return FormatQuantity("yr", years);
}
}
}