h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-21 01:00:27 +08:00
Code Issues Releases Wiki Activity

Extract leaderboard fetch logic from song select beatmap leaderboard drawable

Browse Source
This commit is contained in:
Bartłomiej Dach
2025-02-14 11:49:50 +01:00
Unverified
parent 071a4ba9b0
commit c92caa2d18
26 changed files with 289 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModNoRelease.cs
+1 -1
View File
@@ -631,7 +631,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+1 -1
View File
@@ -578,7 +578,7 @@ namespace osu.Game.Rulesets.Mania.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
+1 -1
View File
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Mania.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+1 -1
View File
@@ -178,7 +178,7 @@ namespace osu.Game.Rulesets.Mania.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
+1 -1
View File
@@ -199,7 +199,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleSoloPlayer()
: base(new PlayerConfiguration
: base(null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+1 -1
View File
@@ -860,7 +860,7 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
+1 -1
View File
@@ -217,7 +217,7 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+1 -1
View File
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+1 -1
View File
@@ -570,7 +570,7 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+1 -1
View File
@@ -516,7 +516,7 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+1 -1
View File
@@ -338,7 +338,7 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
+1 -1
View File
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+1 -1
View File
@@ -494,7 +494,7 @@ namespace osu.Game.Rulesets.Osu.Tests
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game.Rulesets.Taiko.Tests/Judgements/JudgementTest.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
protected override bool PauseOnFocusLost => false;
public ScoreAccessibleReplayPlayer(Score score)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = false,
ShowResults = false,
osu.Game/OsuGameBase.cs
+5
View File
@@ -60,6 +60,7 @@ using osu.Game.Resources;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Scoring;
using osu.Game.Screens.Select.Leaderboards;
using osu.Game.Skinning;
using osu.Game.Utils;
using RuntimeInfo = osu.Framework.RuntimeInfo;
@@ -339,6 +340,10 @@ namespace osu.Game
dependencies.Cache(beatmapCache = new BeatmapLookupCache());
base.Content.Add(beatmapCache);
var leaderboardProvider = new LeaderboardProvider();
dependencies.Cache(leaderboardProvider);
base.Content.Add(leaderboardProvider);
dependencies.CacheAs<IRulesetConfigCache>(rulesetConfigCache = new RulesetConfigCache(realm, RulesetStore));
var powerStatus = CreateBatteryInfo();
osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+1 -1
View File
@@ -343,7 +343,7 @@ namespace osu.Game.Overlays.SkinEditor
public override bool? AllowGlobalTrackControl => false;
public EndlessPlayer(Func<IBeatmap, IReadOnlyList<Mod>, Score> createScore)
: base(createScore, new PlayerConfiguration
: base(createScore, null, new PlayerConfiguration
{
ShowResults = false,
AutomaticallySkipIntro = true,
osu.Game/Screens/Play/ReplayPlayer.cs
+9 -6
View File
@@ -7,6 +7,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Input.Bindings;
@@ -19,6 +20,7 @@ using osu.Game.Scoring;
using osu.Game.Screens.Play.HUD;
using osu.Game.Screens.Play.PlayerSettings;
using osu.Game.Screens.Ranking;
using osu.Game.Screens.Select.Leaderboards;
using osu.Game.Users;
namespace osu.Game.Screens.Play
@@ -38,6 +40,8 @@ namespace osu.Game.Screens.Play
private bool isAutoplayPlayback => GameplayState.Mods.OfType<ModAutoplay>().Any();
private readonly BindableList<ScoreInfo> leaderboardScores = new BindableList<ScoreInfo>();
// Disallow replays from failing. (see https://github.com/ppy/osu/issues/6108)
protected override bool CheckModsAllowFailure()
{
@@ -47,16 +51,17 @@ namespace osu.Game.Screens.Play
return base.CheckModsAllowFailure();
}
public ReplayPlayer(Score score, PlayerConfiguration configuration = null)
: this((_, _) => score, configuration)
public ReplayPlayer(Score score, StateTrackingLeaderboardProvider leaderboardScores = null, PlayerConfiguration configuration = null)
: this((_, _) => score, leaderboardScores, configuration)
{
replayIsFailedScore = score.ScoreInfo.Rank == ScoreRank.F;
}
public ReplayPlayer(Func<IBeatmap, IReadOnlyList<Mod>, Score> createScore, PlayerConfiguration configuration = null)
public ReplayPlayer(Func<IBeatmap, IReadOnlyList<Mod>, Score> createScore, [CanBeNull] StateTrackingLeaderboardProvider leaderboardScores = null, PlayerConfiguration configuration = null)
: base(configuration)
{
this.createScore = createScore;
this.leaderboardScores.AddRange(leaderboardScores?.Scores.Value?.best ?? []);
}
/// <summary>
@@ -97,13 +102,11 @@ namespace osu.Game.Screens.Play
// Don't re-import replay scores as they're already present in the database.
protected override Task ImportScore(Score score) => Task.CompletedTask;
public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
protected override GameplayLeaderboard CreateGameplayLeaderboard() =>
new SoloGameplayLeaderboard(Score.ScoreInfo.User)
{
AlwaysVisible = { Value = true },
Scores = { BindTarget = LeaderboardScores }
Scores = { BindTarget = leaderboardScores }
};
protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score)
osu.Game/Screens/Play/SoloPlayer.cs
+8 -24
View File
@@ -1,11 +1,8 @@
// 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.
#nullable disable
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using osu.Framework.Bindables;
using osu.Game.Beatmaps;
using osu.Game.Extensions;
@@ -14,22 +11,19 @@ using osu.Game.Online.Rooms;
using osu.Game.Online.Solo;
using osu.Game.Scoring;
using osu.Game.Screens.Play.HUD;
using osu.Game.Screens.Select.Leaderboards;
namespace osu.Game.Screens.Play
{
public partial class SoloPlayer : SubmittingPlayer
{
public SoloPlayer()
: this(null)
{
}
protected SoloPlayer(PlayerConfiguration configuration = null)
public SoloPlayer(StateTrackingLeaderboardProvider? leaderboardScores, PlayerConfiguration? configuration = null)
: base(configuration)
{
this.leaderboardScores.AddRange(leaderboardScores?.Scores.Value?.best ?? []);
}
protected override APIRequest<APIScoreToken> CreateTokenRequest()
protected override APIRequest<APIScoreToken>? CreateTokenRequest()
{
int beatmapId = Beatmap.Value.BeatmapInfo.OnlineID;
int rulesetId = Ruleset.Value.OnlineID;
@@ -43,32 +37,22 @@ namespace osu.Game.Screens.Play
return new CreateSoloScoreRequest(Beatmap.Value.BeatmapInfo, rulesetId, Game.VersionHash);
}
public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
private readonly BindableList<ScoreInfo> leaderboardScores = new BindableList<ScoreInfo>();
protected override GameplayLeaderboard CreateGameplayLeaderboard() =>
new SoloGameplayLeaderboard(Score.ScoreInfo.User)
{
AlwaysVisible = { Value = false },
Scores = { BindTarget = LeaderboardScores }
Scores = { BindTarget = leaderboardScores }
};
protected override bool ShouldExitOnTokenRetrievalFailure(Exception exception) => false;
protected override Task ImportScore(Score score)
{
// Before importing a score, stop binding the leaderboard with its score source.
// This avoids a case where the imported score may cause a leaderboard refresh
// (if the leaderboard's source is local).
LeaderboardScores.UnbindBindings();
return base.ImportScore(score);
}
protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
{
IBeatmapInfo beatmap = score.ScoreInfo.BeatmapInfo;
IBeatmapInfo beatmap = score.ScoreInfo.BeatmapInfo!;
Debug.Assert(beatmap!.OnlineID > 0);
Debug.Assert(beatmap.OnlineID > 0);
return new SubmitSoloScoreRequest(score.ScoreInfo, token, beatmap.OnlineID);
}
osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+23 -124
View File
@@ -3,21 +3,17 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Extensions;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.Leaderboards;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Scoring;
using Realms;
namespace osu.Game.Screens.Select.Leaderboards
{
@@ -48,24 +44,10 @@ namespace osu.Game.Screens.Select.Leaderboards
}
}
private bool filterMods;
/// <summary>
/// Whether to apply the game's currently selected mods as a filter when retrieving scores.
/// </summary>
public bool FilterMods
{
get => filterMods;
set
{
if (value == filterMods)
return;
filterMods = value;
RefetchScores();
}
}
public Bindable<bool> FilterMods { get; set; } = new Bindable<bool>();
[Resolved]
private IBindable<RulesetInfo> ruleset { get; set; } = null!;
@@ -77,32 +59,16 @@ namespace osu.Game.Screens.Select.Leaderboards
private IAPIProvider api { get; set; } = null!;
[Resolved]
private RulesetStore rulesets { get; set; } = null!;
private LeaderboardProvider leaderboardProvider { get; set; } = null!;
[Resolved]
private RealmAccess realm { get; set; } = null!;
private IDisposable? scoreSubscription;
private GetScoresRequest? scoreRetrievalRequest;
[BackgroundDependencyLoader]
private void load()
{
ruleset.ValueChanged += _ => RefetchScores();
mods.ValueChanged += _ =>
{
if (filterMods)
RefetchScores();
};
}
public StateTrackingLeaderboardProvider? LeaderboardProvider { get; private set; }
protected override bool IsOnlineScope => Scope != BeatmapLeaderboardScope.Local;
protected override APIRequest? FetchScores(CancellationToken cancellationToken)
{
scoreRetrievalRequest?.Cancel();
scoreRetrievalRequest = null;
LeaderboardProvider?.RemoveAndDisposeImmediately();
LeaderboardProvider = null;
var fetchBeatmapInfo = BeatmapInfo;
@@ -114,12 +80,6 @@ namespace osu.Game.Screens.Select.Leaderboards
var fetchRuleset = ruleset.Value ?? fetchBeatmapInfo.Ruleset;
if (Scope == BeatmapLeaderboardScope.Local)
{
subscribeToLocalScores(fetchBeatmapInfo, cancellationToken);
return null;
}
if (!api.IsLoggedIn)
{
SetErrorState(LeaderboardState.NotLoggedIn);
@@ -132,41 +92,34 @@ namespace osu.Game.Screens.Select.Leaderboards
return null;
}
if (fetchBeatmapInfo.OnlineID <= 0 || fetchBeatmapInfo.Status <= BeatmapOnlineStatus.Pending)
if ((fetchBeatmapInfo.OnlineID <= 0 || fetchBeatmapInfo.Status <= BeatmapOnlineStatus.Pending) && IsOnlineScope)
{
SetErrorState(LeaderboardState.BeatmapUnavailable);
return null;
}
if (!api.LocalUser.Value.IsSupporter && (Scope != BeatmapLeaderboardScope.Global || filterMods))
if (!api.LocalUser.Value.IsSupporter && (Scope >= BeatmapLeaderboardScope.Country || FilterMods.Value))
{
SetErrorState(LeaderboardState.NotSupporter);
return null;
}
IReadOnlyList<Mod>? requestMods = null;
if (filterMods && !mods.Value.Any())
// add nomod for the request
requestMods = new Mod[] { new ModNoMod() };
else if (filterMods)
requestMods = mods.Value;
var newRequest = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
newRequest.Success += response => Schedule(() =>
LeaderboardProvider = new StateTrackingLeaderboardProvider(leaderboardProvider)
{
// Request may have changed since fetch request.
// Can't rely on request cancellation due to Schedule inside SetScores so let's play it safe.
if (!newRequest.Equals(scoreRetrievalRequest))
return;
SetScores(
response.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo)).OrderByTotalScore(),
response.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
);
});
return scoreRetrievalRequest = newRequest;
Beatmap = { Value = BeatmapInfo! },
Ruleset = { BindTarget = ruleset },
ModFilterActive = { BindTarget = FilterMods },
Mods = { BindTarget = mods },
Scope = { Value = Scope },
};
LeaderboardProvider.Scores.BindValueChanged(val =>
{
if (val.NewValue != null)
SetScores(val.NewValue.Value.best, val.NewValue.Value.userScore);
}, true);
LeaderboardProvider.RetrievalFailed += _ => Schedule(() => SetErrorState(LeaderboardState.NetworkFailure));
AddInternal(LeaderboardProvider);
return null;
}
protected override LeaderboardScore CreateDrawableScore(ScoreInfo model, int index) => new LeaderboardScore(model, index, IsOnlineScope, Scope != BeatmapLeaderboardScope.Friend)
@@ -178,59 +131,5 @@ namespace osu.Game.Screens.Select.Leaderboards
{
Action = () => ScoreSelected?.Invoke(model)
};
private void subscribeToLocalScores(BeatmapInfo beatmapInfo, CancellationToken cancellationToken)
{
Debug.Assert(beatmapInfo != null);
scoreSubscription?.Dispose();
scoreSubscription = null;
scoreSubscription = realm.RegisterForNotifications(r =>
r.All<ScoreInfo>().Filter($"{nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $0"
+ $" AND {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.Hash)} == {nameof(ScoreInfo.BeatmapHash)}"
+ $" AND {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $1"
+ $" AND {nameof(ScoreInfo.DeletePending)} == false"
, beatmapInfo.ID, ruleset.Value.ShortName), localScoresChanged);
void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes)
{
if (cancellationToken.IsCancellationRequested)
return;
// This subscription may fire from changes to linked beatmaps, which we don't care about.
// It's currently not possible for a score to be modified after insertion, so we can safely ignore callbacks with only modifications.
if (changes?.HasCollectionChanges() == false)
return;
var scores = sender.AsEnumerable();
if (filterMods && !mods.Value.Any())
{
// we need to filter out all scores that have any mods to get all local nomod scores
scores = scores.Where(s => !s.Mods.Any());
}
else if (filterMods)
{
// otherwise find all the scores that have all of the currently selected mods (similar to how web applies mod filters)
// we're creating and using a string HashSet representation of selected mods so that it can be translated into the DB query itself
var selectedMods = mods.Value.Select(m => m.Acronym).ToHashSet();
scores = scores.Where(s => selectedMods.SetEquals(s.Mods.Select(m => m.Acronym)));
}
scores = scores.Detach().OrderByTotalScore();
SetScores(scores);
}
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
scoreSubscription?.Dispose();
scoreRetrievalRequest?.Cancel();
}
}
}
osu.Game/Screens/Select/Leaderboards/LeaderboardProvider.cs
+85
View File
@@ -0,0 +1,85 @@
// 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 System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Scoring;
using Realms;
namespace osu.Game.Screens.Select.Leaderboards
{
public partial class LeaderboardProvider : Component
{
[Resolved]
private RealmAccess realm { get; set; } = null!;
[Resolved]
private IAPIProvider api { get; set; } = null!;
[Resolved]
private RulesetStore rulesets { get; set; } = null!;
private IQueryable<ScoreInfo> getLocalScoresFor(Realm r, BeatmapInfo beatmap, RulesetInfo ruleset)
{
return r.All<ScoreInfo>().Filter($"{nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $0"
+ $" AND {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.Hash)} == {nameof(ScoreInfo.BeatmapHash)}"
+ $" AND {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $1"
+ $" AND {nameof(ScoreInfo.DeletePending)} == false", beatmap.ID, ruleset.ShortName);
}
public IEnumerable<ScoreInfo> GetLocalScoresFor(BeatmapInfo beatmap, RulesetInfo ruleset) => realm.Run(r => getLocalScoresFor(r, beatmap, ruleset)).AsEnumerable();
public IDisposable SubscribeToLocalScores(BeatmapInfo beatmap, RulesetInfo ruleset, NotificationCallbackDelegate<ScoreInfo> onChange)
=> realm.RegisterForNotifications(r => getLocalScoresFor(r, beatmap, ruleset), onChange);
public Task<(IEnumerable<ScoreInfo> best, ScoreInfo? userScore)> GetOnlineScoresAsync(BeatmapInfo beatmap, RulesetInfo ruleset, IReadOnlyList<Mod>? mods, BeatmapLeaderboardScope scope,
CancellationToken cancellationToken = default)
{
IReadOnlyList<Mod>? requestMods = mods;
if (mods != null && !mods.Any())
// add nomod for the request
requestMods = new Mod[] { new ModNoMod() };
var tcs = new TaskCompletionSource<(IEnumerable<ScoreInfo>, ScoreInfo?)>();
var newRequest = new GetScoresRequest(beatmap, ruleset, scope, requestMods);
newRequest.Success += response =>
{
if (cancellationToken.IsCancellationRequested)
{
tcs.SetCanceled(cancellationToken);
return;
}
// Request may have changed since fetch request.
IEnumerable<ScoreInfo> newScores = response.Scores.Select(s => s.ToScoreInfo(rulesets, beatmap)).OrderByTotalScore().ToArray();
var userScore = response.UserScore?.CreateScoreInfo(rulesets, beatmap);
tcs.SetResult((newScores, userScore));
};
newRequest.Failure += ex =>
{
if (cancellationToken.IsCancellationRequested)
{
tcs.SetCanceled(cancellationToken);
return;
}
tcs.SetException(ex);
};
api.Queue(newRequest);
return tcs.Task;
}
}
}
osu.Game/Screens/Select/Leaderboards/StateTrackingLeaderboardProvider.cs
+137
View File
@@ -0,0 +1,137 @@
// 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 System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Scoring;
using Realms;
namespace osu.Game.Screens.Select.Leaderboards
{
public partial class StateTrackingLeaderboardProvider : Component
{
/// <summary>
/// List of all fetched scores.
/// <see langword="null"/> if fetch is in progress.
/// Updates to this bindable may not be delivered on the update thread. Consumers are expected to schedule locally as required.
/// </summary>
public Bindable<(IEnumerable<ScoreInfo> best, ScoreInfo? userScore)?> Scores => scores;
private Bindable<(IEnumerable<ScoreInfo>, ScoreInfo?)?> scores { get; } = new Bindable<(IEnumerable<ScoreInfo>, ScoreInfo?)?>();
/// <summary>
/// Raised when fetching scores fails.
/// This event may not be invoked on the update thread. Consumers are expected to schedule locally as required.
/// </summary>
public event Action<Exception>? RetrievalFailed;
public Bindable<BeatmapLeaderboardScope> Scope { get; } = new Bindable<BeatmapLeaderboardScope>();
public Bindable<BeatmapInfo> Beatmap { get; } = new Bindable<BeatmapInfo>();
public Bindable<RulesetInfo> Ruleset { get; } = new Bindable<RulesetInfo>();
public Bindable<bool> ModFilterActive { get; } = new BindableBool();
public Bindable<IReadOnlyList<Mod>> Mods { get; } = new Bindable<IReadOnlyList<Mod>>([]);
private readonly LeaderboardProvider leaderboardProvider;
private IDisposable? localScoreSubscription;
private CancellationTokenSource? onlineLookupCancellationTokenSource;
public StateTrackingLeaderboardProvider(LeaderboardProvider leaderboardProvider)
{
this.leaderboardProvider = leaderboardProvider;
}
protected override void LoadComplete()
{
base.LoadComplete();
Scope.BindValueChanged(_ => Scheduler.AddOnce(refetch));
Beatmap.BindValueChanged(_ => Scheduler.AddOnce(refetch));
Ruleset.BindValueChanged(_ => Scheduler.AddOnce(refetch));
ModFilterActive.BindValueChanged(_ => Scheduler.AddOnce(refetch));
Mods.BindValueChanged(_ => Scheduler.AddOnce(refetch));
refetch();
}
private void refetch()
{
localScoreSubscription?.Dispose();
localScoreSubscription = null;
onlineLookupCancellationTokenSource?.Cancel();
onlineLookupCancellationTokenSource = null;
if (Scope.Value == BeatmapLeaderboardScope.Local)
{
localScoreSubscription = leaderboardProvider.SubscribeToLocalScores(Beatmap.Value, Ruleset.Value, localScoresChanged);
}
else
{
onlineLookupCancellationTokenSource = new CancellationTokenSource();
scores.Value = null;
leaderboardProvider.GetOnlineScoresAsync(Beatmap.Value, Ruleset.Value, ModFilterActive.Value ? Mods.Value : null, Scope.Value, onlineLookupCancellationTokenSource.Token)
.ContinueWith(t =>
{
switch (t.Status)
{
case TaskStatus.RanToCompletion:
scores.Value = t.GetResultSafely();
break;
case TaskStatus.Faulted:
RetrievalFailed?.Invoke(t.Exception!);
break;
}
});
}
}
private void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes)
{
// This subscription may fire from changes to linked beatmaps, which we don't care about.
// It's currently not possible for a score to be modified after insertion, so we can safely ignore callbacks with only modifications.
if (changes?.HasCollectionChanges() == false)
return;
var newScores = sender.AsEnumerable();
if (ModFilterActive.Value && !Mods.Value.Any())
{
// we need to filter out all scores that have any mods to get all local nomod scores
newScores = newScores.Where(s => !s.Mods.Any());
}
else if (ModFilterActive.Value)
{
// otherwise find all the scores that have all of the currently selected mods (similar to how web applies mod filters)
// we're creating and using a string HashSet representation of selected mods so that it can be translated into the DB query itself
var selectedMods = Mods.Value.Select(m => m.Acronym).ToHashSet();
newScores = newScores.Where(s => selectedMods.SetEquals(s.Mods.Select(m => m.Acronym)));
}
newScores = newScores.Detach().OrderByTotalScore();
scores.Value = (newScores, null);
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
localScoreSubscription?.Dispose();
localScoreSubscription = null;
onlineLookupCancellationTokenSource?.Cancel();
onlineLookupCancellationTokenSource = null;
}
}
}
osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
+1 -1
View File
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select
{
base.OnTabChanged(tab, selectedMods);
Leaderboard.FilterMods = selectedMods;
Leaderboard.FilterMods.Value = selectedMods;
switch (tab)
{
osu.Game/Screens/Select/PlaySongSelect.cs
+2 -8
View File
@@ -129,17 +129,11 @@ namespace osu.Game.Screens.Select
if (replayGeneratingMod != null)
{
player = new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods))
{
LeaderboardScores = { BindTarget = playBeatmapDetailArea.Leaderboard.Scores }
};
player = new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods), playBeatmapDetailArea.Leaderboard.LeaderboardProvider);
}
else
{
player = new SoloPlayer
{
LeaderboardScores = { BindTarget = playBeatmapDetailArea.Leaderboard.Scores }
};
player = new SoloPlayer(playBeatmapDetailArea.Leaderboard.LeaderboardProvider);
}
return player;
osu.Game/Screens/SelectV2/SongSelectV2.cs
+1 -1
View File
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.SelectV2
logo.Action = () =>
{
this.Push(new PlayerLoaderV2(() => new SoloPlayer()));
this.Push(new PlayerLoaderV2(() => new SoloPlayer(null)));
return false;
};
}
osu.Game/Tests/Visual/TestPlayer.cs
+1 -1
View File
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Visual
private SpectatorClient spectatorClient { get; set; }
public TestPlayer(bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
: base(new PlayerConfiguration
: base(null, new PlayerConfiguration
{
AllowPause = allowPause,
ShowResults = showResults
osu.Game/Tests/Visual/TestReplayPlayer.cs
+2 -2
View File
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.Visual
/// Instantiate a replay player that renders an autoplay mod.
/// </summary>
public TestReplayPlayer(bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
: base((beatmap, mods) => mods.OfType<ModAutoplay>().First().CreateScoreFromReplayData(beatmap, mods), new PlayerConfiguration
: base((beatmap, mods) => mods.OfType<ModAutoplay>().First().CreateScoreFromReplayData(beatmap, mods), null, new PlayerConfiguration
{
AllowPause = allowPause,
ShowResults = showResults
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual
/// Instantiate a replay player that renders the provided replay.
/// </summary>
public TestReplayPlayer(Score score, bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
: base(score, new PlayerConfiguration
: base(score, null, new PlayerConfiguration
{
AllowPause = allowPause,
ShowResults = showResults