sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove local file handling from SetupScreen

Browse Source
This commit is contained in:
Dean Herbert 2020-09-25 13:11:34 +09:00
parent 50ba320a51
commit ea971ecb90
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game/Screens/Edit/Setup/SetupScreen.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using System.IO;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -17,10 +18,8 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.IO;
using osu.Game.Overlays; using osu.Game.Overlays;
using osuTK; using osuTK;
using FileInfo = System.IO.FileInfo;
namespace osu.Game.Screens.Edit.Setup namespace osu.Game.Screens.Edit.Setup
{ {
@ -34,10 +33,10 @@ namespace osu.Game.Screens.Edit.Setup
private LabelledTextBox audioTrackTextBox; private LabelledTextBox audioTrackTextBox;
[Resolved] [Resolved]
private FileStore files { get; set; } private MusicController music { get; set; }
[Resolved] [Resolved]
private MusicController music { get; set; } private BeatmapManager beatmaps { get; set; }
[Resolved(canBeNull: true)] [Resolved(canBeNull: true)]
private Editor editor { get; set; } private Editor editor { get; set; }
@ -153,28 +152,19 @@ namespace osu.Game.Screens.Edit.Setup
if (!info.Exists) if (!info.Exists)
return false; return false;
var beatmapFiles = Beatmap.Value.BeatmapSetInfo.Files; var set = Beatmap.Value.BeatmapSetInfo;
// remove the old file // remove the previous audio track for now.
var oldFile = beatmapFiles.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile); // in the future we probably want to check if this is being used elsewhere (other difficulties?)
var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile);
if (oldFile != null)
{
beatmapFiles.Remove(oldFile);
files.Dereference(oldFile.FileInfo);
}
// add the new file
IO.FileInfo osuFileInfo;
using (var stream = info.OpenRead()) using (var stream = info.OpenRead())
osuFileInfo = files.Add(stream);
beatmapFiles.Add(new BeatmapSetFileInfo
{ {
FileInfo = osuFileInfo, if (oldFile != null)
Filename = info.Name beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
}); else
beatmaps.AddFile(set, stream, info.Name);
}
Beatmap.Value.Metadata.AudioFile = info.Name; Beatmap.Value.Metadata.AudioFile = info.Name;