From 5e0cb9d4b9e5cc6d752da0ff7ad317fd6ba72b40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Feb 2018 19:12:29 +0900
Subject: [PATCH] Simplify beatmap store retrieval

---
 osu.Game/Beatmaps/BeatmapManager.cs | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 049be49e44..63d9874d53 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -67,7 +67,9 @@ namespace osu.Game.Beatmaps
 
         private readonly Storage storage;
 
-        private BeatmapStore createBeatmapStore(Func<OsuDbContext> context)
+        private BeatmapStore getBeatmapStoreWithContext(OsuDbContext context) => getBeatmapStoreWithContext(() => context);
+
+        private BeatmapStore getBeatmapStoreWithContext(Func<OsuDbContext> context)
         {
             var store = new BeatmapStore(context);
             store.BeatmapSetAdded += s => BeatmapSetAdded?.Invoke(s);
@@ -123,7 +125,7 @@ namespace osu.Game.Beatmaps
 
             refreshImportContext();
 
-            beatmaps = createBeatmapStore(context);
+            beatmaps = getBeatmapStoreWithContext(context);
             files = new FileStore(context, storage);
 
             this.storage = files.Storage;
@@ -368,14 +370,10 @@ namespace osu.Game.Beatmaps
                     // re-fetch the beatmap set on the import context.
                     beatmapSet = context.BeatmapSetInfo.Include(s => s.Files).ThenInclude(f => f.FileInfo).First(s => s.ID == beatmapSet.ID);
 
-                    // create local stores so we can isolate and thread safely, and share a context/transaction.
-                    var iFiles = new FileStore(() => context, storage);
-                    var iBeatmaps = createBeatmapStore(() => context);
-
-                    if (iBeatmaps.Delete(beatmapSet))
+                    if (getBeatmapStoreWithContext(context).Delete(beatmapSet))
                     {
                         if (!beatmapSet.Protected)
-                            iFiles.Dereference(beatmapSet.Files.Select(f => f.FileInfo).ToArray());
+                            new FileStore(() => context, storage).Dereference(beatmapSet.Files.Select(f => f.FileInfo).ToArray());
                     }
 
                     context.ChangeTracker.AutoDetectChangesEnabled = true;
@@ -428,10 +426,7 @@ namespace osu.Game.Beatmaps
                 {
                     context.ChangeTracker.AutoDetectChangesEnabled = false;
 
-                    var iFiles = new FileStore(() => context, storage);
-                    var iBeatmaps = createBeatmapStore(() => context);
-
-                    undelete(iBeatmaps, iFiles, beatmapSet);
+                    undelete(getBeatmapStoreWithContext(context), new FileStore(() => context, storage), beatmapSet);
 
                     context.ChangeTracker.AutoDetectChangesEnabled = true;
                     context.SaveChanges(transaction);
@@ -522,7 +517,7 @@ namespace osu.Game.Beatmaps
         /// <returns>Results from the provided query.</returns>
         public IEnumerable<BeatmapInfo> QueryBeatmaps(Expression<Func<BeatmapInfo, bool>> query) => beatmaps.Beatmaps.AsNoTracking().Where(query);
 
-        private void import(BeatmapSetInfo beatmapSet, OsuDbContext context) => createBeatmapStore(() => context).Add(beatmapSet);
+        private void import(BeatmapSetInfo beatmapSet, OsuDbContext context) => getBeatmapStoreWithContext(context).Add(beatmapSet);
 
         /// <summary>
         /// Creates an <see cref="ArchiveReader"/> from a valid storage path.