Merge pull request #27234 from brandondong/delete_none_message

Add feedback to delete button even when no-op

osu.Game/Beatmaps/BeatmapManager.cs

@@ -361,13 +361,20 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public void DeleteVideos(List<BeatmapSetInfo> items, bool silent = false)
         {
-            if (items.Count == 0) return;
+            const string no_videos_message = "No videos found to delete!";
+
+            if (items.Count == 0)
+            {
+                if (!silent)
+                    PostNotification?.Invoke(new ProgressCompletionNotification { Text = no_videos_message });
+                return;
+            }
 
             var notification = new ProgressNotification
             {
                 Progress = 0,
                 Text = $"Preparing to delete all {HumanisedModelName} videos...",
-                CompletionText = "No videos found to delete!",
+                CompletionText = no_videos_message,
                 State = ProgressNotificationState.Active,
             };
 

osu.Game/Database/ModelManager.cs

@@ -105,7 +105,12 @@ namespace osu.Game.Database
         /// </summary>
         public void Delete(List<TModel> items, bool silent = false)
         {
-            if (items.Count == 0) return;
+            if (items.Count == 0)
+            {
+                if (!silent)
+                    PostNotification?.Invoke(new ProgressCompletionNotification { Text = $"No {HumanisedModelName}s found to delete!" });
+                return;
+            }
 
             var notification = new ProgressNotification
             {
@@ -142,7 +147,12 @@ namespace osu.Game.Database
         /// </summary>
         public void Undelete(List<TModel> items, bool silent = false)
         {
-            if (!items.Any()) return;
+            if (!items.Any())
+            {
+                if (!silent)
+                    PostNotification?.Invoke(new ProgressCompletionNotification { Text = $"No {HumanisedModelName}s found to restore!" });
+                return;
+            }
 
             var notification = new ProgressNotification
             {

osu.Game/Localisation/MaintenanceSettingsStrings.cs

@@ -104,16 +104,31 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString DeletedAllCollections => new TranslatableString(getKey(@"deleted_all_collections"), @"Deleted all collections!");
 
+        /// <summary>
+        /// "No collections found to delete!"
+        /// </summary>
+        public static LocalisableString NoCollectionsFoundToDelete => new TranslatableString(getKey(@"no_collections_found_to_delete"), @"No collections found to delete!");
+
         /// <summary>
         /// "Deleted all mod presets!"
         /// </summary>
         public static LocalisableString DeletedAllModPresets => new TranslatableString(getKey(@"deleted_all_mod_presets"), @"Deleted all mod presets!");
 
+        /// <summary>
+        /// "No mod presets found to delete!"
+        /// </summary>
+        public static LocalisableString NoModPresetsFoundToDelete => new TranslatableString(getKey(@"no_mod_presets_found_to_delete"), @"No mod presets found to delete!");
+
         /// <summary>
         /// "Restored all deleted mod presets!"
         /// </summary>
         public static LocalisableString RestoredAllDeletedModPresets => new TranslatableString(getKey(@"restored_all_deleted_mod_presets"), @"Restored all deleted mod presets!");
 
+        /// <summary>
+        /// "No mod presets found to restore!"
+        /// </summary>
+        public static LocalisableString NoModPresetsFoundToRestore => new TranslatableString(getKey(@"no_mod_presets_found_to_restore"), @"No mod presets found to restore!");
+
         /// <summary>
         /// "Please select your osu!stable install location"
         /// </summary>

osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Localisation;
 using osu.Game.Collections;
@@ -35,8 +36,20 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         private void deleteAllCollections()
         {
-            realm.Write(r => r.RemoveAll<BeatmapCollection>());
-            notificationOverlay?.Post(new ProgressCompletionNotification { Text = MaintenanceSettingsStrings.DeletedAllCollections });
+            bool anyDeleted = realm.Write(r =>
+            {
+                if (r.All<BeatmapCollection>().Any())
+                {
+                    r.RemoveAll<BeatmapCollection>();
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            });
+
+            notificationOverlay?.Post(new ProgressCompletionNotification { Text = anyDeleted ? MaintenanceSettingsStrings.DeletedAllCollections : MaintenanceSettingsStrings.NoCollectionsFoundToDelete });
         }
     }
 }

osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
@@ -52,36 +53,50 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             });
         }
 
-        private void deleteAllModPresets() =>
+        private bool deleteAllModPresets() =>
             realm.Write(r =>
             {
+                bool anyDeleted = false;
+
                 foreach (var preset in r.All<ModPreset>())
+                {
+                    anyDeleted |= !preset.DeletePending;
                     preset.DeletePending = true;
+                }
+
+                return anyDeleted;
             });
 
-        private void onAllModPresetsDeleted(Task deletionTask)
+        private void onAllModPresetsDeleted(Task<bool> deletionTask)
         {
             deleteAllButton.Enabled.Value = true;
 
             if (deletionTask.IsCompletedSuccessfully)
-                notificationOverlay?.Post(new ProgressCompletionNotification { Text = MaintenanceSettingsStrings.DeletedAllModPresets });
+                notificationOverlay?.Post(new ProgressCompletionNotification { Text = deletionTask.GetResultSafely() ? MaintenanceSettingsStrings.DeletedAllModPresets : MaintenanceSettingsStrings.NoModPresetsFoundToDelete });
             else if (deletionTask.IsFaulted)
                 Logger.Error(deletionTask.Exception, "Failed to delete all mod presets");
         }
 
-        private void undeleteModPresets() =>
+        private bool undeleteModPresets() =>
             realm.Write(r =>
             {
+                bool anyRestored = false;
+
                 foreach (var preset in r.All<ModPreset>().Where(preset => preset.DeletePending))
+                {
+                    anyRestored |= preset.DeletePending;
                     preset.DeletePending = false;
+                }
+
+                return anyRestored;
             });
 
-        private void onModPresetsUndeleted(Task undeletionTask)
+        private void onModPresetsUndeleted(Task<bool> undeletionTask)
         {
             undeleteButton.Enabled.Value = true;
 
             if (undeletionTask.IsCompletedSuccessfully)
-                notificationOverlay?.Post(new ProgressCompletionNotification { Text = MaintenanceSettingsStrings.RestoredAllDeletedModPresets });
+                notificationOverlay?.Post(new ProgressCompletionNotification { Text = undeletionTask.GetResultSafely() ? MaintenanceSettingsStrings.RestoredAllDeletedModPresets : MaintenanceSettingsStrings.NoModPresetsFoundToRestore });
             else if (undeletionTask.IsFaulted)
                 Logger.Error(undeletionTask.Exception, "Failed to restore mod presets");
         }