RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 19:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix beatmap mass deletion flow

Browse Source
This commit is contained in:
Dean Herbert 2022-01-11 22:57:47 +09:00
parent d5239d550a
commit 46206f70d6
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -234,6 +234,19 @@ namespace osu.Game.Beatmaps
beatmapModelManager.Delete(items, silent); beatmapModelManager.Delete(items, silent);
} }
public void Delete(Expression<Func<BeatmapSetInfo, bool>>? filter = null, bool silent = false)
{
using (var context = contextFactory.CreateContext())
{
var items = context.All<BeatmapSetInfo>().Where(s => !s.DeletePending);
if (filter != null)
items = items.Where(filter);
beatmapModelManager.Delete(items.ToList(), silent);
}
}
public void Undelete(List<BeatmapSetInfo> items, bool silent = false) public void Undelete(List<BeatmapSetInfo> items, bool silent = false)
{ {
beatmapModelManager.Undelete(items, silent); beatmapModelManager.Undelete(items, silent);

2
osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
dialogOverlay?.Push(new MassDeleteConfirmationDialog(() => dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
{ {
deleteBeatmapsButton.Enabled.Value = false; deleteBeatmapsButton.Enabled.Value = false;
Task.Run(() => beatmaps.Delete(beatmaps.GetAllUsableBeatmapSets())).ContinueWith(t => Schedule(() => deleteBeatmapsButton.Enabled.Value = true)); Task.Run(() => beatmaps.Delete()).ContinueWith(t => Schedule(() => deleteBeatmapsButton.Enabled.Value = true));
})); }));
} }
}); });