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

declare BeatmapSet is not null

Browse Source
This commit is contained in:
cdwcgt
2023-08-14 03:43:16 +09:00
Unverified
parent 09047538c7
commit e7b34cd4da
2 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
+7 -14
View File
@@ -21,15 +21,14 @@ namespace osu.Game.Tests.Visual.Online
{
var beatmap = new APIBeatmap
{
OnlineBeatmapSetID = 173612
OnlineBeatmapSetID = 173612,
BeatmapSet = new APIBeatmapSet
{
OnlineID = 173612
}
};
var beatmapset = new APIBeatmapSet
{
OnlineID = 173612,
};
setupBeatmapResponse(beatmap, beatmapset);
setupBeatmapResponse(beatmap);
AddStep("import score", () =>
{
@@ -62,7 +61,7 @@ namespace osu.Game.Tests.Visual.Online
AddUntilStep("Replay missing screen not show", () => Game.ScreenStack.CurrentScreen.GetType() != typeof(ReplayMissingBeatmapScreen));
}
private void setupBeatmapResponse(APIBeatmap b, APIBeatmapSet s)
private void setupBeatmapResponse(APIBeatmap b)
=> AddStep("setup response", () =>
{
dummyAPI.HandleRequest = request =>
@@ -73,12 +72,6 @@ namespace osu.Game.Tests.Visual.Online
return true;
}
if (request is GetBeatmapSetRequest getBeatmapSetRequest)
{
getBeatmapSetRequest.TriggerSuccess(s);
return true;
}
return false;
};
});
osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+2 -19
View File
@@ -18,7 +18,6 @@ using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays;
using osu.Game.Overlays.Settings;
@@ -57,14 +56,12 @@ namespace osu.Game.Screens.Import
private SettingsCheckbox automaticDownload = null!;
private readonly MemoryStream scoreStream;
private readonly APIBeatmap beatmap;
private APIBeatmapSet? beatmapSetInfo;
private readonly APIBeatmapSet beatmapSetInfo;
public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream scoreStream)
{
this.beatmap = beatmap;
beatmapSetInfo = beatmap.BeatmapSet;
beatmapSetInfo = beatmap.BeatmapSet!;
this.scoreStream = scoreStream;
}
@@ -147,18 +144,6 @@ namespace osu.Game.Screens.Import
{
base.LoadComplete();
if (beatmapSetInfo == null)
{
var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
onlineBeatmapRequest.Success += res =>
{
beatmapSetInfo = res;
updateStatus();
};
api.Queue(onlineBeatmapRequest);
}
updateStatus();
realmSubscription = realm.RegisterForNotifications(
realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
@@ -185,8 +170,6 @@ namespace osu.Game.Screens.Import
{
if (changes?.InsertedIndices == null) return;
if (beatmapSetInfo == null) return;
if (!scoreStream.CanRead) return;
if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))