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

Add beatmap deletion support.

Browse Source 
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
This commit is contained in:
Dean Herbert
2017-02-24 14:37:54 +09:00
parent 3a89348413
commit 6c3bda18b6
4 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -139,6 +139,7 @@ namespace osu.Game.Screens.Select
database = beatmaps;
database.BeatmapSetAdded += onDatabaseOnBeatmapSetAdded;
database.BeatmapSetRemoved += onDatabaseOnBeatmapSetRemoved;
trackManager = audio.Track;
@ -189,6 +190,11 @@ namespace osu.Game.Screens.Select
Schedule(() => addBeatmapSet(s, Game, true));
}
private void onDatabaseOnBeatmapSetRemoved(BeatmapSetInfo s)
{
Schedule(() => removeBeatmapSet(s));
}
protected override void OnEntering(Screen last)
{
base.OnEntering(last);
@ -247,6 +253,7 @@ namespace osu.Game.Screens.Select
playMode.ValueChanged -= playMode_ValueChanged;
database.BeatmapSetAdded -= onDatabaseOnBeatmapSetAdded;
database.BeatmapSetRemoved -= onDatabaseOnBeatmapSetRemoved;
initialAddSetsTask.Cancel();
}
@ -278,7 +285,7 @@ namespace osu.Game.Screens.Select
//todo: change background in selectionChanged instead; support per-difficulty backgrounds.
changeBackground(beatmap);
carousel.SelectBeatmap(beatmap.BeatmapInfo);
carousel.SelectBeatmap(beatmap?.BeatmapInfo);
}
/// <summary>
@ -353,6 +360,21 @@ namespace osu.Game.Screens.Select
}));
}
private void removeBeatmapSet(BeatmapSetInfo beatmapSet)
{
var group = beatmapGroups.Find(b => b.BeatmapSet.ID == beatmapSet.ID);
if (group == null) return;
if (carousel.SelectedGroup == group)
carousel.SelectNext();
beatmapGroups.Remove(group);
carousel.RemoveGroup(group);
if (beatmapGroups.Count == 0)
Beatmap = null;
}
private void addBeatmapSets(Framework.Game game, CancellationToken token)
{
foreach (var beatmapSet in database.Query<BeatmapSetInfo>())
@ -369,6 +391,13 @@ namespace osu.Game.Screens.Select
case Key.Enter:
footer.StartButton.TriggerClick();
return true;
case Key.Delete:
if (Beatmap != null)
{
Beatmap.Dispose();
database.Delete(Beatmap.BeatmapSetInfo);
}
return true;
}
return base.OnKeyDown(state, args);