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

Minor code refactors

Browse Source
This commit is contained in:
Dean Herbert
2025-02-10 17:40:00 +09:00
Unverified
parent 45259b374a
commit b8e33a28d2
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs
+11 -8
View File
@@ -76,7 +76,6 @@ namespace osu.Game.Screens.Edit.Submission
private uint? beatmapSetId;
private MemoryStream? beatmapPackageStream;
private SubmissionBeatmapExporter legacyBeatmapExporter = null!;
private ProgressNotification? exportProgressNotification;
private ProgressNotification? updateProgressNotification;
@@ -214,8 +213,7 @@ namespace osu.Game.Screens.Edit.Submission
}).ConfigureAwait(true);
}
legacyBeatmapExporter = new SubmissionBeatmapExporter(storage, response);
await createBeatmapPackage(response.Files).ConfigureAwait(true);
await createBeatmapPackage(response).ConfigureAwait(true);
};
createRequest.Failure += ex =>
{
@@ -228,7 +226,7 @@ namespace osu.Game.Screens.Edit.Submission
api.Queue(createRequest);
}
private async Task createBeatmapPackage(ICollection<BeatmapSetFile> onlineFiles)
private async Task createBeatmapPackage(PutBeatmapSetResponse response)
{
Debug.Assert(ThreadSafety.IsUpdateThread);
@@ -237,8 +235,13 @@ namespace osu.Game.Screens.Edit.Submission
try
{
beatmapPackageStream = new MemoryStream();
await legacyBeatmapExporter.ExportToStreamAsync(Beatmap.Value.BeatmapSetInfo.ToLive(realmAccess), beatmapPackageStream, exportProgressNotification = new ProgressNotification())
.ConfigureAwait(true);
exportProgressNotification = new ProgressNotification();
var legacyBeatmapExporter = new SubmissionBeatmapExporter(storage, response);
await legacyBeatmapExporter
.ExportToStreamAsync(Beatmap.Value.BeatmapSetInfo.ToLive(realmAccess), beatmapPackageStream, exportProgressNotification)
.ConfigureAwait(true);
}
catch (Exception ex)
{
@@ -253,8 +256,8 @@ namespace osu.Game.Screens.Edit.Submission
await Task.Delay(200).ConfigureAwait(true);
if (onlineFiles.Count > 0)
await patchBeatmapSet(onlineFiles).ConfigureAwait(true);
if (response.Files.Count > 0)
await patchBeatmapSet(response.Files).ConfigureAwait(true);
else
replaceBeatmapSet();
}
osu.Game/Screens/Edit/Submission/SubmissionBeatmapExporter.cs
+8 -13
View File
@@ -14,43 +14,38 @@ namespace osu.Game.Screens.Edit.Submission
public class SubmissionBeatmapExporter : LegacyBeatmapExporter
{
private readonly uint? beatmapSetId;
private readonly HashSet<int>? beatmapIds;
public SubmissionBeatmapExporter(Storage storage)
: base(storage)
{
}
private readonly HashSet<int>? allocatedBeatmapIds;
public SubmissionBeatmapExporter(Storage storage, PutBeatmapSetResponse putBeatmapSetResponse)
: base(storage)
{
beatmapSetId = putBeatmapSetResponse.BeatmapSetId;
beatmapIds = putBeatmapSetResponse.BeatmapIds.Select(id => (int)id).ToHashSet();
allocatedBeatmapIds = putBeatmapSetResponse.BeatmapIds.Select(id => (int)id).ToHashSet();
}
protected override void MutateBeatmap(BeatmapSetInfo beatmapSet, IBeatmap playableBeatmap)
{
base.MutateBeatmap(beatmapSet, playableBeatmap);
if (beatmapSetId != null && beatmapIds != null)
if (beatmapSetId != null && allocatedBeatmapIds != null)
{
playableBeatmap.BeatmapInfo.BeatmapSet = beatmapSet;
playableBeatmap.BeatmapInfo.BeatmapSet!.OnlineID = (int)beatmapSetId;
if (beatmapIds.Contains(playableBeatmap.BeatmapInfo.OnlineID))
if (allocatedBeatmapIds.Contains(playableBeatmap.BeatmapInfo.OnlineID))
{
beatmapIds.Remove(playableBeatmap.BeatmapInfo.OnlineID);
allocatedBeatmapIds.Remove(playableBeatmap.BeatmapInfo.OnlineID);
return;
}
if (playableBeatmap.BeatmapInfo.OnlineID > 0)
throw new InvalidOperationException(@"Encountered beatmap with ID that has not been assigned to it by the server!");
if (beatmapIds.Count == 0)
if (allocatedBeatmapIds.Count == 0)
throw new InvalidOperationException(@"Ran out of new beatmap IDs to assign to unsubmitted beatmaps!");
int newId = beatmapIds.First();
beatmapIds.Remove(newId);
int newId = allocatedBeatmapIds.First();
allocatedBeatmapIds.Remove(newId);
playableBeatmap.BeatmapInfo.OnlineID = newId;
}
}