RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make carousel non nullable and ensure pre load usages of methods that reference it are protected against failure

Browse Source
This commit is contained in:
mk56-spn 2023-01-13 13:10:29 +01:00
parent 653376f5f2
commit a6b6fb864e
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1151,7 +1151,7 @@ namespace osu.Game.Tests.Visual.SongSelect
public WorkingBeatmap CurrentBeatmap => Beatmap.Value;
public IWorkingBeatmap CurrentBeatmapDetailsBeatmap => BeatmapDetails.Beatmap;
public new BeatmapCarousel Carousel => base.Carousel!;
public new BeatmapCarousel Carousel => base.Carousel;
public new ModSelectOverlay ModSelect => base.ModSelect;
public new void PresentScore(ScoreInfo score) => base.PresentScore(score);

2
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
@ -106,7 +105,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
Schedule(() =>
{
Debug.Assert(Carousel != null);
Carousel.AllowSelection = true;
});
});

29
osu.Game/Screens/Select/SongSelect.cs
View File

@ -79,12 +79,12 @@ namespace osu.Game.Screens.Select
/// </summary>
public virtual bool AllowEditing => true;
public bool BeatmapSetsLoaded => IsLoaded && Carousel?.BeatmapSetsLoaded == true;
public bool BeatmapSetsLoaded => IsLoaded && Carousel.BeatmapSetsLoaded;
[Resolved]
private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
protected BeatmapCarousel? Carousel { get; private set; }
protected BeatmapCarousel Carousel { get; private set; } = null!;
private ParallaxContainer wedgeBackground = null!;
@ -127,7 +127,7 @@ namespace osu.Game.Screens.Select
private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog? manageCollectionsDialog, DifficultyRecommender? recommender)
{
// initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
transferRulesetValue();
transferRulesetValue(false);
LoadComponentAsync(Carousel = new BeatmapCarousel
{
@ -314,10 +314,8 @@ namespace osu.Game.Screens.Select
/// Creates the buttons to be displayed in the footer.
/// </summary>
/// <returns>A set of <see cref="FooterButton"/> and an optional <see cref="OverlayContainer"/> which the button opens when pressed.</returns>
protected virtual IEnumerable<(FooterButton, OverlayContainer?)> CreateFooterButtons()
{
Debug.Assert(Carousel != null);
return new (FooterButton, OverlayContainer?)[]
protected virtual IEnumerable<(FooterButton, OverlayContainer?)> CreateFooterButtons() =>
new (FooterButton, OverlayContainer?)[]
{
(new FooterButtonMods { Current = Mods }, ModSelect),
(new FooterButtonRandom
@ -327,7 +325,6 @@ namespace osu.Game.Screens.Select
}, null),
(beatmapOptionsButton = new FooterButtonOptions(), BeatmapOptions)
};
}
protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
@ -336,7 +333,6 @@ namespace osu.Game.Screens.Select
// if not the current screen, we want to get carousel in a good presentation state before displaying (resume or enter).
bool shouldDebounce = this.IsCurrentScreen();
Debug.Assert(Carousel != null);
Carousel.Filter(criteria, shouldDebounce);
}
@ -375,8 +371,6 @@ namespace osu.Game.Screens.Select
/// <param name="customStartAction">An optional custom action to perform instead of <see cref="OnStart"/>.</param>
public void FinaliseSelection(BeatmapInfo? beatmapInfo = null, RulesetInfo? ruleset = null, Action? customStartAction = null)
{
Debug.Assert(Carousel != null);
// This is very important as we have not yet bound to screen-level bindables before the carousel load is completed.
if (!Carousel.BeatmapSetsLoaded)
{
@ -431,8 +425,6 @@ namespace osu.Game.Screens.Select
Logger.Log($"Song select working beatmap updated to {beatmap}");
Debug.Assert(Carousel != null);
if (Carousel.SelectBeatmap(beatmap.BeatmapInfo, false)) return;
// A selection may not have been possible with filters applied.
@ -522,7 +514,6 @@ namespace osu.Game.Screens.Select
if (transferRulesetValue())
{
Debug.Assert(Carousel != null);
// transferRulesetValue() may trigger a re-filter. If the current selection does not match the new ruleset, we want to switch away from it.
// The default logic on WorkingBeatmap change is to switch to a matching ruleset (see workingBeatmapChanged()), but we don't want that here.
// We perform an early selection attempt and clear out the beatmap selection to avoid a second ruleset change (revert).
@ -609,7 +600,6 @@ namespace osu.Game.Screens.Select
ModSelect.SelectedMods.Disabled = false;
ModSelect.SelectedMods.BindTo(selectedMods);
Debug.Assert(Carousel != null);
Carousel.AllowSelection = true;
BeatmapDetails.Refresh();
@ -672,7 +662,6 @@ namespace osu.Game.Screens.Select
BeatmapOptions.Hide();
Debug.Assert(Carousel != null);
Carousel.AllowSelection = false;
endLooping();
@ -803,7 +792,6 @@ namespace osu.Game.Screens.Select
{
bindBindables();
Debug.Assert(Carousel != null);
Carousel.AllowSelection = true;
// If a selection was already obtained, do not attempt to update the selected beatmap.
@ -867,7 +855,7 @@ namespace osu.Game.Screens.Select
/// Will immediately run filter operations if required.
/// </summary>
/// <returns>Whether a transfer occurred.</returns>
private bool transferRulesetValue()
private bool transferRulesetValue(bool carouselLoaded = true)
{
if (decoupledRuleset.Value?.Equals(Ruleset.Value) == true)
return false;
@ -875,9 +863,12 @@ namespace osu.Game.Screens.Select
Logger.Log($"decoupled ruleset transferred (\"{decoupledRuleset.Value}\" -> \"{Ruleset.Value}\")");
rulesetNoDebounce = decoupledRuleset.Value = Ruleset.Value;
// We don't want to declare the carousel as nullable, so this check allows us to avoid running the carousel flush during the loading process
if (!carouselLoaded) return true;
// if we have a pending filter operation, we want to run it now.
// it could change selection (ie. if the ruleset has been changed).
Carousel?.FlushPendingFilterOperations();
Carousel.FlushPendingFilterOperations();
return true;
}