h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 23:47:21 +08:00
Code Issues Releases Wiki Activity

Perform a single Save call rather than doing it in each difficulty

Browse Source
This commit is contained in:
Salman Alshamrani 2024-11-28 18:32:03 -05:00
parent 311f0947e4
commit 489d7a30ec
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
View File

@ -107,9 +107,6 @@ namespace osu.Game.Tests.Visual.Editing
AddStep("test play", () => Editor.TestGameplay()); AddStep("test play", () => Editor.TestGameplay());
AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog != null);
AddStep("confirm save", () => InputManager.Key(Key.Number1));
AddUntilStep("wait for return to editor", () => Editor.IsCurrentScreen()); AddUntilStep("wait for return to editor", () => Editor.IsCurrentScreen());
AddAssert("track is still not virtual", () => Beatmap.Value.Track is not TrackVirtual); AddAssert("track is still not virtual", () => Beatmap.Value.Track is not TrackVirtual);

27
osu.Game/Screens/Edit/Setup/ResourcesSection.cs
View File

@ -32,9 +32,6 @@ namespace osu.Game.Screens.Edit.Setup
[Resolved] [Resolved]
private IBindable<WorkingBeatmap> working { get; set; } = null!; private IBindable<WorkingBeatmap> working { get; set; } = null!;
[Resolved]
private EditorBeatmap editorBeatmap { get; set; } = null!;
[Resolved] [Resolved]
private Editor? editor { get; set; } private Editor? editor { get; set; }
@ -114,25 +111,17 @@ namespace osu.Game.Screens.Edit.Setup
{ {
newFilename = $"{baseFilename}{source.Extension}"; newFilename = $"{baseFilename}{source.Extension}";
foreach (var beatmapInSet in set.Beatmaps) foreach (var beatmap in set.Beatmaps)
{ {
string filenameInBeatmap = readFilename(beatmapInSet.Metadata); if (set.GetFile(readFilename(beatmap.Metadata)) is RealmNamedFileUsage otherExistingFile)
beatmaps.DeleteFile(set, otherExistingFile);
if (set.GetFile(filenameInBeatmap) is RealmNamedFileUsage existingFile) writeFilename(beatmap.Metadata, newFilename);
beatmaps.DeleteFile(set, existingFile);
if (filenameInBeatmap != newFilename)
{
writeFilename(beatmapInSet.Metadata, newFilename);
if (!beatmapInSet.Equals(working.Value.BeatmapInfo))
beatmaps.Save(beatmapInSet, beatmaps.GetWorkingBeatmap(beatmapInSet).Beatmap);
}
} }
} }
else else
{ {
var beatmap = working.Value.BeatmapInfo; var thisBeatmap = working.Value.BeatmapInfo;
string[] filenames = set.Files.Select(f => f.Filename).Where(f => string[] filenames = set.Files.Select(f => f.Filename).Where(f =>
f.StartsWith(baseFilename, StringComparison.OrdinalIgnoreCase) && f.StartsWith(baseFilename, StringComparison.OrdinalIgnoreCase) &&
@ -142,7 +131,7 @@ namespace osu.Game.Screens.Edit.Setup
var oldFile = set.GetFile(currentFilename); var oldFile = set.GetFile(currentFilename);
if (oldFile != null && set.Beatmaps.Where(b => !b.Equals(beatmap)).All(b => readFilename(b.Metadata) != currentFilename)) if (oldFile != null && set.Beatmaps.Where(b => !b.Equals(thisBeatmap)).All(b => readFilename(b.Metadata) != currentFilename))
{ {
beatmaps.DeleteFile(set, oldFile); beatmaps.DeleteFile(set, oldFile);
newFilename = currentFilename; newFilename = currentFilename;
@ -157,7 +146,9 @@ namespace osu.Game.Screens.Edit.Setup
using (var stream = source.OpenRead()) using (var stream = source.OpenRead())
beatmaps.AddFile(set, stream, newFilename); beatmaps.AddFile(set, stream, newFilename);
editorBeatmap.SaveState(); // editor change handler cannot be aware of any file changes or other difficulties having their metadata modified.
// for simplicity's sake, trigger a save when changing any resource to ensure the change is correctly saved.
editor?.Save();
} }
private void backgroundChanged(ValueChangedEvent<FileInfo?> file) private void backgroundChanged(ValueChangedEvent<FileInfo?> file)