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

Abstractify resource change logic and share between background and audio

Browse Source
This commit is contained in:
Salman Alshamrani 2024-11-28 17:57:47 -05:00
parent b1d0939142
commit 311f0947e4
1 changed files with 29 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,57 +82,12 @@ namespace osu.Game.Screens.Edit.Setup
if (!source.Exists) if (!source.Exists)
return false; return false;
var set = working.Value.BeatmapSetInfo; changeResource(source, applyToAllDifficulties, @"bg",
metadata => metadata.BackgroundFile,
if (applyToAllDifficulties) (metadata, name) => metadata.BackgroundFile = name);
{
string newFilename = $@"bg{source.Extension}";
foreach (var beatmapInSet in set.Beatmaps)
{
if (set.GetFile(beatmapInSet.Metadata.BackgroundFile) is RealmNamedFileUsage existingFile)
beatmaps.DeleteFile(set, existingFile);
if (beatmapInSet.Metadata.BackgroundFile != newFilename)
{
beatmapInSet.Metadata.BackgroundFile = newFilename;
if (!beatmapInSet.Equals(working.Value.BeatmapInfo))
beatmaps.Save(beatmapInSet, beatmaps.GetWorkingBeatmap(beatmapInSet).Beatmap);
}
}
}
else
{
var beatmap = working.Value.BeatmapInfo;
string[] filenames = set.Files.Select(f => f.Filename).Where(f =>
f.StartsWith(@"bg", StringComparison.OrdinalIgnoreCase) &&
f.EndsWith(source.Extension, StringComparison.OrdinalIgnoreCase)).ToArray();
string currentFilename = working.Value.Metadata.BackgroundFile;
var oldFile = set.GetFile(currentFilename);
string? newFilename = null;
if (oldFile != null && set.Beatmaps.Where(b => !b.Equals(beatmap)).All(b => b.Metadata.BackgroundFile != currentFilename))
{
beatmaps.DeleteFile(set, oldFile);
newFilename = currentFilename;
}
newFilename ??= NamingUtils.GetNextBestFilename(filenames, $@"bg{source.Extension}");
working.Value.Metadata.BackgroundFile = newFilename;
}
using (var stream = source.OpenRead())
beatmaps.AddFile(set, stream, working.Value.Metadata.BackgroundFile);
editorBeatmap.SaveState();
headerBackground.UpdateBackground(); headerBackground.UpdateBackground();
editor?.ApplyToBackground(bg => bg.RefreshBackground()); editor?.ApplyToBackground(bg => bg.RefreshBackground());
return true; return true;
} }
@ -141,20 +96,34 @@ namespace osu.Game.Screens.Edit.Setup
if (!source.Exists) if (!source.Exists)
return false; return false;
changeResource(source, applyToAllDifficulties, @"audio",
metadata => metadata.AudioFile,
(metadata, name) => metadata.AudioFile = name);
music.ReloadCurrentTrack();
return true;
}
private void changeResource(FileInfo source, bool applyToAllDifficulties, string baseFilename, Func<BeatmapMetadata, string> readFilename, Action<BeatmapMetadata, string> writeFilename)
{
var set = working.Value.BeatmapSetInfo; var set = working.Value.BeatmapSetInfo;
string newFilename = string.Empty;
if (applyToAllDifficulties) if (applyToAllDifficulties)
{ {
string newFilename = $@"audio{source.Extension}"; newFilename = $"{baseFilename}{source.Extension}";
foreach (var beatmapInSet in set.Beatmaps) foreach (var beatmapInSet in set.Beatmaps)
{ {
if (set.GetFile(beatmapInSet.Metadata.AudioFile) is RealmNamedFileUsage existingFile) string filenameInBeatmap = readFilename(beatmapInSet.Metadata);
if (set.GetFile(filenameInBeatmap) is RealmNamedFileUsage existingFile)
beatmaps.DeleteFile(set, existingFile); beatmaps.DeleteFile(set, existingFile);
if (beatmapInSet.Metadata.AudioFile != newFilename) if (filenameInBeatmap != newFilename)
{ {
beatmapInSet.Metadata.AudioFile = newFilename; writeFilename(beatmapInSet.Metadata, newFilename);
if (!beatmapInSet.Equals(working.Value.BeatmapInfo)) if (!beatmapInSet.Equals(working.Value.BeatmapInfo))
beatmaps.Save(beatmapInSet, beatmaps.GetWorkingBeatmap(beatmapInSet).Beatmap); beatmaps.Save(beatmapInSet, beatmaps.GetWorkingBeatmap(beatmapInSet).Beatmap);
@ -166,31 +135,29 @@ namespace osu.Game.Screens.Edit.Setup
var beatmap = working.Value.BeatmapInfo; var beatmap = 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(@"audio", StringComparison.OrdinalIgnoreCase) && f.StartsWith(baseFilename, StringComparison.OrdinalIgnoreCase) &&
f.EndsWith(source.Extension, StringComparison.OrdinalIgnoreCase)).ToArray(); f.EndsWith(source.Extension, StringComparison.OrdinalIgnoreCase)).ToArray();
string currentFilename = working.Value.Metadata.AudioFile; string currentFilename = readFilename(working.Value.Metadata);
var oldFile = set.GetFile(currentFilename); var oldFile = set.GetFile(currentFilename);
string? newFilename = null;
if (oldFile != null && set.Beatmaps.Where(b => !b.Equals(beatmap)).All(b => b.Metadata.AudioFile != currentFilename)) if (oldFile != null && set.Beatmaps.Where(b => !b.Equals(beatmap)).All(b => readFilename(b.Metadata) != currentFilename))
{ {
beatmaps.DeleteFile(set, oldFile); beatmaps.DeleteFile(set, oldFile);
newFilename = currentFilename; newFilename = currentFilename;
} }
newFilename ??= NamingUtils.GetNextBestFilename(filenames, $@"audio{source.Extension}"); if (string.IsNullOrEmpty(newFilename))
working.Value.Metadata.AudioFile = newFilename; newFilename = NamingUtils.GetNextBestFilename(filenames, $@"{baseFilename}{source.Extension}");
writeFilename(working.Value.Metadata, newFilename);
} }
using (var stream = source.OpenRead()) using (var stream = source.OpenRead())
beatmaps.AddFile(set, stream, working.Value.Metadata.AudioFile); beatmaps.AddFile(set, stream, newFilename);
editorBeatmap.SaveState(); editorBeatmap.SaveState();
music.ReloadCurrentTrack();
return true;
} }
private void backgroundChanged(ValueChangedEvent<FileInfo?> file) private void backgroundChanged(ValueChangedEvent<FileInfo?> file)