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

Use unified filename for background and track during editor import

Browse Source
This commit is contained in:
Salman Ahmed 2022-06-15 09:02:48 +03:00
parent 674a9bb399
commit f3f0960335
2 changed files with 20 additions and 12 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

@ -101,6 +101,9 @@ namespace osu.Game.Tests.Visual.Editing
File.Delete(temp);
Directory.Delete(extractedFolder, true);
// ensure audio file is copied to beatmap as "audio.mp3" rather than original filename.
Assert.That(Beatmap.Value.Metadata.AudioFile == "audio.mp3");
return success;
});

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

@ -64,26 +64,28 @@ namespace osu.Game.Screens.Edit.Setup
public bool ChangeBackgroundImage(string path)
{
var info = new FileInfo(path);
var source = new FileInfo(path);
if (!info.Exists)
if (!source.Exists)
return false;
var set = working.Value.BeatmapSetInfo;
var destination = new FileInfo($@"bg{source.Extension}");
// remove the previous background for now.
// in the future we probably want to check if this is being used elsewhere (other difficulties?)
var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
var oldFile = set.Files.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f.Filename) == destination.Name);
using (var stream = info.OpenRead())
using (var stream = source.OpenRead())
{
if (oldFile != null)
beatmaps.DeleteFile(set, oldFile);
beatmaps.AddFile(set, stream, info.Name);
beatmaps.AddFile(set, stream, destination.Name);
}
working.Value.Metadata.BackgroundFile = info.Name;
working.Value.Metadata.BackgroundFile = destination.Name;
header.Background.UpdateBackground();
return true;
@ -91,25 +93,28 @@ namespace osu.Game.Screens.Edit.Setup
public bool ChangeAudioTrack(string path)
{
var info = new FileInfo(path);
var source = new FileInfo(path);
if (!info.Exists)
if (!source.Exists)
return false;
var set = working.Value.BeatmapSetInfo;
var destination = new FileInfo($@"audio{source.Extension}");
// remove the previous audio track for now.
// in the future we probably want to check if this is being used elsewhere (other difficulties?)
var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.AudioFile);
var oldFile = set.Files.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f.Filename) == destination.Name);
using (var stream = info.OpenRead())
using (var stream = source.OpenRead())
{
if (oldFile != null)
beatmaps.DeleteFile(set, oldFile);
beatmaps.AddFile(set, stream, info.Name);
beatmaps.AddFile(set, stream, destination.Name);
}
working.Value.Metadata.AudioFile = info.Name;
working.Value.Metadata.AudioFile = destination.Name;
music.ReloadCurrentTrack();