From 04e4c5ef8867a043ce722e8067fa27d6fc629d80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Jun 2022 18:26:13 +0900
Subject: [PATCH] Move and adjust implementation regions to restore sanity

---
 osu.Game/Beatmaps/BeatmapManager.cs | 65 ++++++++++-------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 63bd7dc710..a4ac161223 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -260,8 +260,6 @@ namespace osu.Game.Beatmaps
             return realm.Run(r => r.All<BeatmapSetInfo>().FirstOrDefault(query)?.ToLive(realm));
         }
 
-        #region Delegation to BeatmapImporter (methods which previously existed locally).
-
         /// <summary>
         /// Perform a lookup query on available <see cref="BeatmapInfo"/>s.
         /// </summary>
@@ -283,38 +281,6 @@ namespace osu.Game.Beatmaps
             set => beatmapImporter.PostNotification = value;
         }
 
-        #endregion
-
-        #region Implementation of IModelManager<BeatmapSetInfo>
-
-        public bool IsAvailableLocally(BeatmapSetInfo model)
-        {
-            return beatmapImporter.IsAvailableLocally(model);
-        }
-
-        public bool Delete(BeatmapSetInfo item)
-        {
-            return beatmapImporter.Delete(item);
-        }
-
-        public void Delete(List<BeatmapSetInfo> items, bool silent = false)
-        {
-            beatmapImporter.Delete(items, silent);
-        }
-
-        public void Delete(Expression<Func<BeatmapSetInfo, bool>>? filter = null, bool silent = false)
-        {
-            realm.Run(r =>
-            {
-                var items = r.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected);
-
-                if (filter != null)
-                    items = items.Where(filter);
-
-                beatmapImporter.Delete(items.ToList(), silent);
-            });
-        }
-
         /// <summary>
         /// Saves an <see cref="IBeatmap"/> file against a given <see cref="BeatmapInfo"/>.
         /// </summary>
@@ -381,6 +347,19 @@ namespace osu.Game.Beatmaps
             });
         }
 
+        public void Delete(Expression<Func<BeatmapSetInfo, bool>>? filter = null, bool silent = false)
+        {
+            realm.Run(r =>
+            {
+                var items = r.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected);
+
+                if (filter != null)
+                    items = items.Where(filter);
+
+                beatmapImporter.Delete(items.ToList(), silent);
+            });
+        }
+
         /// <summary>
         /// Delete videos from a list of beatmaps.
         /// This will post notifications tracking progress.
@@ -431,15 +410,17 @@ namespace osu.Game.Beatmaps
             realm.Run(r => beatmapImporter.Undelete(r.All<BeatmapSetInfo>().Where(s => s.DeletePending).ToList()));
         }
 
-        public void Undelete(List<BeatmapSetInfo> items, bool silent = false)
-        {
-            beatmapImporter.Undelete(items, silent);
-        }
+        #region Implementation of IModelManager<BeatmapSetInfo>
 
-        public void Undelete(BeatmapSetInfo item)
-        {
-            beatmapImporter.Undelete(item);
-        }
+        public bool IsAvailableLocally(BeatmapSetInfo model) => beatmapImporter.IsAvailableLocally(model);
+
+        public bool Delete(BeatmapSetInfo item) => beatmapImporter.Delete(item);
+
+        public void Delete(List<BeatmapSetInfo> items, bool silent = false) => beatmapImporter.Delete(items, silent);
+
+        public void Undelete(List<BeatmapSetInfo> items, bool silent = false) => beatmapImporter.Undelete(items, silent);
+
+        public void Undelete(BeatmapSetInfo item) => beatmapImporter.Undelete(item);
 
         #endregion