fixed duplicates and cleaned up code

This commit is contained in:
Supersonicboss1 2022-06-21 23:41:25 +01:00
parent e4931f977c
commit 4aa86b0a80
4 changed files with 64 additions and 89 deletions

View File

@ -11,7 +11,6 @@ using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Localisation;
using osu.Game.Scoring;
namespace osu.Game.Overlays.Settings.Sections.Maintenance
{
@ -19,15 +18,13 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
{
protected override LocalisableString Header => "Beatmaps";
private SettingsButton importBeatmapsButton;
private SettingsButton importScoresButton;
private SettingsButton deleteBeatmapsButton;
private SettingsButton deleteBeatmapVideosButton;
private SettingsButton deleteScoresButton;
private SettingsButton restoreButton;
private SettingsButton undeleteButton;
[BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapManager beatmaps, ScoreManager scores, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
private void load(BeatmapManager beatmaps, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
{
if (legacyImportManager?.SupportsImportFromStable == true)
{
@ -40,16 +37,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
legacyImportManager.ImportFromStableAsync(StableContent.Beatmaps).ContinueWith(t => Schedule(() => importBeatmapsButton.Enabled.Value = true));
}
});
Add(importScoresButton = new SettingsButton
{
Text = MaintenanceSettingsStrings.ImportScoresFromStable,
Action = () =>
{
importScoresButton.Enabled.Value = false;
legacyImportManager.ImportFromStableAsync(StableContent.Scores).ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
}
});
}
Add(deleteBeatmapsButton = new DangerousSettingsButton
{
@ -76,19 +63,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
}));
}
});
Add(deleteScoresButton = new DangerousSettingsButton
{
Text = MaintenanceSettingsStrings.DeleteAllScores,
Action = () =>
{
dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
{
deleteScoresButton.Enabled.Value = false;
Task.Run(() => scores.Delete()).ContinueWith(t => Schedule(() => deleteScoresButton.Enabled.Value = true));
}));
}
});
AddRange(new Drawable[]
{
restoreButton = new SettingsButton
@ -108,8 +82,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
undeleteButton.Enabled.Value = false;
Task.Run(beatmaps.UndeleteAll).ContinueWith(t => Schedule(() => undeleteButton.Enabled.Value = true));
}
},
}
});
}
}
}
}

View File

@ -20,9 +20,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
[BackgroundDependencyLoader(permitNulls: true)]
private void load([CanBeNull] CollectionManager collectionManager, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
{
if (collectionManager != null)
{
if (collectionManager == null) return;
if (legacyImportManager?.SupportsImportFromStable == true)
{
Add(importCollectionsButton = new SettingsButton
{
@ -46,4 +47,3 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
}
}
}
}