From cc2b4c5c5b4cf2c15687ea942c16334a733c91a7 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 05:54:07 -0400
Subject: [PATCH 1/5] Refactor WorkingBeatmap

Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
---
 .../Beatmaps/TestWorkingBeatmap.cs            |  32 +++++
 .../Tests/TestCaseGamefield.cs                |  13 +-
 .../Tests/TestCasePlayer.cs                   |  12 +-
 .../osu.Desktop.VisualTests.csproj            |   4 +
 osu.Game/Beatmaps/WorkingBeatmap.cs           | 124 ++---------------
 osu.Game/Database/BeatmapDatabase.cs          |  15 +--
 osu.Game/Database/DatabaseWorkingBeatmap.cs   | 127 ++++++++++++++++++
 osu.Game/osu.Game.csproj                      |   1 +
 8 files changed, 176 insertions(+), 152 deletions(-)
 create mode 100644 osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
 create mode 100644 osu.Game/Database/DatabaseWorkingBeatmap.cs

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
new file mode 100644
index 0000000000..e6236b041f
--- /dev/null
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -0,0 +1,32 @@
+using System;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.IO;
+
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+        {
+            this.beatmap = beatmap;
+        }
+
+        private Beatmap beatmap;
+        public override Beatmap Beatmap => beatmap;
+        public override Texture Background => null;
+        public override Track Track => null;
+        
+        public override void Dispose()
+        {
+            // This space intentionally left blank
+        }
+        
+        public override void TransferTo(WorkingBeatmap other)
+        {
+            // This space intentionally left blank
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index c2e33f7f32..6de2b36cd0 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -17,6 +17,8 @@ using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using System.Collections.Generic;
+using osu.Framework.Graphics.Textures;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -95,16 +97,5 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             });
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 41bd24b900..21a00ebdf6 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -15,6 +15,7 @@ using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Screens.Play;
 using OpenTK.Graphics;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -97,16 +98,5 @@ namespace osu.Desktop.VisualTests.Tests
                 Beatmap = beatmap
             };
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index 6eb9e5e648..b67b4c4bb3 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -205,9 +205,13 @@
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
     <Compile Include="Tests\TestCaseLeaderboard.cs" />
+    <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Beatmaps\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 16db4fc2a6..3be2a40bb0 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -4,14 +4,11 @@
 using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Mods;
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace osu.Game.Beatmaps
 {
@@ -27,131 +24,26 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public PlayMode? PreferredPlayMode;
 
-        public PlayMode PlayMode => beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;
+        public PlayMode PlayMode => Beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? Beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;
 
         public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>();
 
         public readonly bool WithStoryboard;
 
-        protected abstract ArchiveReader GetReader();
-
         protected WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
         {
             BeatmapInfo = beatmapInfo;
             BeatmapSetInfo = beatmapSetInfo;
             WithStoryboard = withStoryboard;
         }
+        
+        public abstract Beatmap Beatmap { get; }
+        public abstract Texture Background { get; }
+        public abstract Track Track { get; }
 
-        private Texture background;
-        private object backgroundLock = new object();
-        public Texture Background
-        {
-            get
-            {
-                lock (backgroundLock)
-                {
-                    if (background != null) return background;
+        public abstract void TransferTo(WorkingBeatmap other);
+        public abstract void Dispose();
 
-                    if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
-
-                    try
-                    {
-                        using (var reader = GetReader())
-                            background = new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                    }
-                    catch { }
-
-                    return background;
-                }
-            }
-            set { lock (backgroundLock) background = value; }
-        }
-
-        private Beatmap beatmap;
-        private object beatmapLock = new object();
-        public Beatmap Beatmap
-        {
-            get
-            {
-                lock (beatmapLock)
-                {
-                    if (beatmap != null) return beatmap;
-
-                    try
-                    {
-                        using (var reader = GetReader())
-                        {
-                            BeatmapDecoder decoder;
-                            using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                            {
-                                decoder = BeatmapDecoder.GetDecoder(stream);
-                                beatmap = decoder?.Decode(stream);
-                            }
-
-                            if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                                using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                    decoder?.Decode(stream, beatmap);
-                        }
-                    }
-                    catch { }
-
-                    return beatmap;
-                }
-            }
-            set { lock (beatmapLock) beatmap = value; }
-        }
-
-        private ArchiveReader trackReader;
-        private Track track;
-        private object trackLock = new object();
-        public Track Track
-        {
-            get
-            {
-                lock (trackLock)
-                {
-                    if (track != null) return track;
-
-                    try
-                    {
-                        //store a reference to the reader as we may continue accessing the stream in the background.
-                        trackReader = GetReader();
-                        var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                        if (trackData != null)
-                            track = new TrackBass(trackData);
-                    }
-                    catch { }
-
-                    return track;
-                }
-            }
-            set { lock (trackLock) track = value; }
-        }
-
-        public bool TrackLoaded => track != null;
-
-        private bool isDisposed;
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!isDisposed)
-            {
-                track?.Dispose();
-                background?.Dispose();
-                isDisposed = true;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void TransferTo(WorkingBeatmap working)
-        {
-            if (track != null && BeatmapInfo.AudioEquals(working.BeatmapInfo))
-                working.track = track;
-        }
+        public virtual bool TrackLoaded => Track != null;
     }
 }
diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index 3f865d65f1..b115b86547 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -18,7 +18,7 @@ using SQLiteNetExtensions.Extensions;
 
 namespace osu.Game.Database
 {
-    public class BeatmapDatabase
+    public partial class BeatmapDatabase
     {
         private SQLiteConnection connection { get; }
         private Storage storage;
@@ -342,18 +342,5 @@ namespace osu.Game.Database
         }
 
         public bool Exists(BeatmapSetInfo beatmapSet) => storage.Exists(beatmapSet.Path);
-
-        private class DatabaseWorkingBeatmap : WorkingBeatmap
-        {
-            private readonly BeatmapDatabase database;
-
-            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
-                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
-            {
-                this.database = database;
-            }
-
-            protected override ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
-        }
     }
 }
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
new file mode 100644
index 0000000000..1584b9137b
--- /dev/null
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -0,0 +1,127 @@
+using System.IO;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.Beatmaps.IO;
+
+namespace osu.Game.Database
+{
+    public partial class BeatmapDatabase
+    {
+        private class DatabaseWorkingBeatmap : WorkingBeatmap
+        {
+            private readonly BeatmapDatabase database;
+
+            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
+                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
+            {
+                this.database = database;
+            }
+
+            private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
+
+            private Beatmap beatmap;
+            private object beatmapLock = new object();
+            public override Beatmap Beatmap
+            {
+                get
+                {
+                    lock (beatmapLock)
+                    {
+                        if (beatmap != null) return beatmap;
+    
+                        try
+                        {
+                            using (var reader = GetReader())
+                            {
+                                BeatmapDecoder decoder;
+                                using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
+                                {
+                                    decoder = BeatmapDecoder.GetDecoder(stream);
+                                    beatmap = decoder?.Decode(stream);
+                                }
+    
+                                if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                                    using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                                        decoder?.Decode(stream, beatmap);
+                            }
+                        }
+                        catch { return null; }
+    
+                        return beatmap;
+                    }
+                }
+            }
+
+            private object backgroundLock = new object();
+            private Texture background;
+            public override Texture Background
+            {
+                get
+                {
+                    lock (backgroundLock)
+                    {
+                        if (background != null) return background;
+    
+                        if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
+    
+                        try
+                        {
+                            using (var reader = GetReader())
+                            {
+                                background = new TextureStore(
+                                    new RawTextureLoaderStore(reader),
+                                    false).Get(BeatmapInfo.Metadata.BackgroundFile);
+                            }
+                        }
+                        catch { return null; }
+    
+                        return background;
+                    }
+                }
+            }
+
+            private ArchiveReader trackReader;
+            private Track track;
+            private object trackLock = new object();
+            public override Track Track
+            {
+                get
+                {
+                    lock (trackLock)
+                    {
+                        if (track != null) return track;
+    
+                        try
+                        {
+                            //store a reference to the reader as we may continue accessing the stream in the background.
+                            trackReader = GetReader();
+                            var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                            if (trackData != null)
+                                track = new TrackBass(trackData);
+                        }
+                        catch { return null; }
+    
+                        return track;
+                    }
+                }
+            }
+            
+            public override bool TrackLoaded => track != null;
+
+            public override void TransferTo(WorkingBeatmap other)
+            {
+                var _other = (DatabaseWorkingBeatmap)other;
+                if (track != null && BeatmapInfo.AudioEquals(_other.BeatmapInfo))
+                    _other.track = track;
+            }
+            
+            public override void Dispose()
+            {
+                background?.Dispose();
+                background = null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9cedaa1b09..5b31962f21 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -363,6 +363,7 @@
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabItem.cs" />
+    <Compile Include="Database\DatabaseWorkingBeatmap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">

From 267238dc270cbc01b47545f34e594fe728e59471 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:15:32 -0400
Subject: [PATCH 2/5] Simplify derived classes of WorkingBeatmap

---
 .../Beatmaps/TestWorkingBeatmap.cs            |  46 +++----
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  62 ++++++++-
 osu.Game/Database/DatabaseWorkingBeatmap.cs   | 123 ++++++------------
 3 files changed, 116 insertions(+), 115 deletions(-)

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
index e6236b041f..0db9991cb8 100644
--- a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -1,32 +1,26 @@
-using System;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.IO;
 
-namespace osu.Desktop.VisualTests.Beatmaps
-{
-    public class TestWorkingBeatmap : WorkingBeatmap
-    {
-        public TestWorkingBeatmap(Beatmap beatmap)
-            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-        {
-            this.beatmap = beatmap;
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+        {
+            this.beatmap = beatmap;
         }
-
-        private Beatmap beatmap;
-        public override Beatmap Beatmap => beatmap;
-        public override Texture Background => null;
-        public override Track Track => null;
-        
-        public override void Dispose()
-        {
-            // This space intentionally left blank
-        }
-        
-        public override void TransferTo(WorkingBeatmap other)
-        {
-            // This space intentionally left blank
-        }
-    }
-}
+
+        private Beatmap beatmap;
+        
+        protected override Beatmap GetBeatmap() => beatmap;
+        protected override Texture GetBackground() => null;
+        protected override Track GetTrack() => null;
+    }
+}
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 3be2a40bb0..2a2de1b6ef 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -36,14 +36,64 @@ namespace osu.Game.Beatmaps
             BeatmapSetInfo = beatmapSetInfo;
             WithStoryboard = withStoryboard;
         }
+
+        protected abstract Beatmap GetBeatmap();
+        protected abstract Texture GetBackground();
+        protected abstract Track GetTrack();
         
-        public abstract Beatmap Beatmap { get; }
-        public abstract Texture Background { get; }
-        public abstract Track Track { get; }
+        private Beatmap beatmap;
+        private object beatmapLock = new object();
+        public Beatmap Beatmap
+        {
+            get
+            {
+                lock (beatmapLock)
+                {
+                    return beatmap ?? (beatmap = GetBeatmap());
+                }
+            }
+        }
+        
+        private object backgroundLock = new object();
+        private Texture background;
+        public Texture Background
+        {
+            get
+            {
+                lock (backgroundLock)
+                {
+                    return background ?? (background = GetBackground());
+                }
+            }
+        }
 
-        public abstract void TransferTo(WorkingBeatmap other);
-        public abstract void Dispose();
+        private Track track;
+        private object trackLock = new object();
+        public Track Track
+        {
+            get
+            {
+                lock (trackLock)
+                {
+                    return track ?? (track = GetTrack());
+                }
+            }
+        }
 
-        public virtual bool TrackLoaded => Track != null;
+        public bool TrackLoaded => track != null;
+
+        public void TransferTo(WorkingBeatmap other)
+        {
+            if (track != null && BeatmapInfo.AudioEquals(other.BeatmapInfo))
+                other.track = track;
+        }
+        
+        public virtual void Dispose()
+        {
+            track?.Dispose();
+            track = null;
+            background?.Dispose();
+            background = null;
+        }
     }
 }
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 1584b9137b..56b4a81980 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -1,4 +1,7 @@
-using System.IO;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
@@ -20,107 +23,61 @@ namespace osu.Game.Database
             }
 
             private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
-
-            private Beatmap beatmap;
-            private object beatmapLock = new object();
-            public override Beatmap Beatmap
+            
+            protected override Beatmap GetBeatmap()
             {
-                get
+                Beatmap beatmap;
+                try
                 {
-                    lock (beatmapLock)
+                    using (var reader = GetReader())
                     {
-                        if (beatmap != null) return beatmap;
-    
-                        try
+                        BeatmapDecoder decoder;
+                        using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
                         {
-                            using (var reader = GetReader())
-                            {
-                                BeatmapDecoder decoder;
-                                using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                                {
-                                    decoder = BeatmapDecoder.GetDecoder(stream);
-                                    beatmap = decoder?.Decode(stream);
-                                }
-    
-                                if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                                    using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                        decoder?.Decode(stream, beatmap);
-                            }
+                            decoder = BeatmapDecoder.GetDecoder(stream);
+                            beatmap = decoder?.Decode(stream);
                         }
-                        catch { return null; }
-    
-                        return beatmap;
+
+                        if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                            using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                                decoder?.Decode(stream, beatmap);
                     }
                 }
+                catch { return null; }
+                return beatmap;
             }
-
-            private object backgroundLock = new object();
-            private Texture background;
-            public override Texture Background
+            
+            protected override Texture GetBackground()
             {
-                get
+                Texture background;
+                if (BeatmapInfo?.Metadata?.BackgroundFile == null)
+                    return null;
+                try
                 {
-                    lock (backgroundLock)
+                    using (var reader = GetReader())
                     {
-                        if (background != null) return background;
-    
-                        if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
-    
-                        try
-                        {
-                            using (var reader = GetReader())
-                            {
-                                background = new TextureStore(
-                                    new RawTextureLoaderStore(reader),
-                                    false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                            }
-                        }
-                        catch { return null; }
-    
-                        return background;
+                        background = new TextureStore(
+                            new RawTextureLoaderStore(reader),
+                            false).Get(BeatmapInfo.Metadata.BackgroundFile);
                     }
                 }
+                catch { return null; }
+                return background;
             }
 
             private ArchiveReader trackReader;
-            private Track track;
-            private object trackLock = new object();
-            public override Track Track
+            protected override Track GetTrack()
             {
-                get
+                Track track;
+                try
                 {
-                    lock (trackLock)
-                    {
-                        if (track != null) return track;
-    
-                        try
-                        {
-                            //store a reference to the reader as we may continue accessing the stream in the background.
-                            trackReader = GetReader();
-                            var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                            if (trackData != null)
-                                track = new TrackBass(trackData);
-                        }
-                        catch { return null; }
-    
-                        return track;
-                    }
+                    //store a reference to the reader as we may continue accessing the stream in the background.
+                    trackReader = GetReader();
+                    var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                    track = trackData == null ? null : new TrackBass(trackData);
                 }
-            }
-            
-            public override bool TrackLoaded => track != null;
-
-            public override void TransferTo(WorkingBeatmap other)
-            {
-                var _other = (DatabaseWorkingBeatmap)other;
-                if (track != null && BeatmapInfo.AudioEquals(_other.BeatmapInfo))
-                    _other.track = track;
-            }
-            
-            public override void Dispose()
-            {
-                background?.Dispose();
-                background = null;
+                catch { return null; }
+                return track;
             }
         }
     }

From 2b1d31e69c222afd25335dcd27b86fec050e6de0 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:25:49 -0400
Subject: [PATCH 3/5] Address linting issues

---
 osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs |  2 --
 osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs     |  2 --
 osu.Desktop.VisualTests/Tests/TestCasePlayer.cs        |  2 --
 osu.Game/Database/DatabaseWorkingBeatmap.cs            | 10 +++++-----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
index 0db9991cb8..babca8ee06 100644
--- a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -1,11 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.IO;
 
 namespace osu.Desktop.VisualTests.Beatmaps
 {
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index 6de2b36cd0..e876c21a12 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -8,7 +8,6 @@ using osu.Framework.MathUtils;
 using osu.Framework.Screens.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Mania.UI;
@@ -17,7 +16,6 @@ using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using System.Collections.Generic;
-using osu.Framework.Graphics.Textures;
 using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 21a00ebdf6..a08cb3e97e 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Screens.Testing;
 using osu.Game.Beatmaps;
 using OpenTK;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Objects;
@@ -24,7 +23,6 @@ namespace osu.Desktop.VisualTests.Tests
         protected Player Player;
         private BeatmapDatabase db;
 
-
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 56b4a81980..0961d95f03 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -22,14 +22,14 @@ namespace osu.Game.Database
                 this.database = database;
             }
 
-            private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
+            private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
             
             protected override Beatmap GetBeatmap()
             {
                 Beatmap beatmap;
                 try
                 {
-                    using (var reader = GetReader())
+                    using (var reader = getReader())
                     {
                         BeatmapDecoder decoder;
                         using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
@@ -40,7 +40,7 @@ namespace osu.Game.Database
 
                         if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
                             using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                decoder?.Decode(stream, beatmap);
+                                decoder.Decode(stream, beatmap);
                     }
                 }
                 catch { return null; }
@@ -54,7 +54,7 @@ namespace osu.Game.Database
                     return null;
                 try
                 {
-                    using (var reader = GetReader())
+                    using (var reader = getReader())
                     {
                         background = new TextureStore(
                             new RawTextureLoaderStore(reader),
@@ -72,7 +72,7 @@ namespace osu.Game.Database
                 try
                 {
                     //store a reference to the reader as we may continue accessing the stream in the background.
-                    trackReader = GetReader();
+                    trackReader = getReader();
                     var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
                     track = trackData == null ? null : new TrackBass(trackData);
                 }

From 2e1f596b2ad0974665c0f53301cf3a2540097ec5 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:50:48 -0400
Subject: [PATCH 4/5] Move DatabaseWorkingBeatmap out of partial class

---
 osu.Game/Database/BeatmapDatabase.cs        |   2 +-
 osu.Game/Database/DatabaseWorkingBeatmap.cs | 115 ++++++++++----------
 2 files changed, 57 insertions(+), 60 deletions(-)

diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index b115b86547..317467d792 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -18,7 +18,7 @@ using SQLiteNetExtensions.Extensions;
 
 namespace osu.Game.Database
 {
-    public partial class BeatmapDatabase
+    public class BeatmapDatabase
     {
         private SQLiteConnection connection { get; }
         private Storage storage;
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 0961d95f03..0a7779f17b 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -10,75 +10,72 @@ using osu.Game.Beatmaps.IO;
 
 namespace osu.Game.Database
 {
-    public partial class BeatmapDatabase
+    internal class DatabaseWorkingBeatmap : WorkingBeatmap
     {
-        private class DatabaseWorkingBeatmap : WorkingBeatmap
+        private readonly BeatmapDatabase database;
+
+        public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
+            : base(beatmapInfo, beatmapSetInfo, withStoryboard)
         {
-            private readonly BeatmapDatabase database;
+            this.database = database;
+        }
 
-            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
-                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
+        private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
+        
+        protected override Beatmap GetBeatmap()
+        {
+            Beatmap beatmap;
+            try
             {
-                this.database = database;
-            }
-
-            private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
-            
-            protected override Beatmap GetBeatmap()
-            {
-                Beatmap beatmap;
-                try
+                using (var reader = getReader())
                 {
-                    using (var reader = getReader())
+                    BeatmapDecoder decoder;
+                    using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
                     {
-                        BeatmapDecoder decoder;
-                        using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                        {
-                            decoder = BeatmapDecoder.GetDecoder(stream);
-                            beatmap = decoder?.Decode(stream);
-                        }
-
-                        if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                            using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                decoder.Decode(stream, beatmap);
+                        decoder = BeatmapDecoder.GetDecoder(stream);
+                        beatmap = decoder?.Decode(stream);
                     }
-                }
-                catch { return null; }
-                return beatmap;
-            }
-            
-            protected override Texture GetBackground()
-            {
-                Texture background;
-                if (BeatmapInfo?.Metadata?.BackgroundFile == null)
-                    return null;
-                try
-                {
-                    using (var reader = getReader())
-                    {
-                        background = new TextureStore(
-                            new RawTextureLoaderStore(reader),
-                            false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                    }
-                }
-                catch { return null; }
-                return background;
-            }
 
-            private ArchiveReader trackReader;
-            protected override Track GetTrack()
-            {
-                Track track;
-                try
-                {
-                    //store a reference to the reader as we may continue accessing the stream in the background.
-                    trackReader = getReader();
-                    var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                    track = trackData == null ? null : new TrackBass(trackData);
+                    if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                        using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                            decoder.Decode(stream, beatmap);
                 }
-                catch { return null; }
-                return track;
             }
+            catch { return null; }
+            return beatmap;
+        }
+        
+        protected override Texture GetBackground()
+        {
+            Texture background;
+            if (BeatmapInfo?.Metadata?.BackgroundFile == null)
+                return null;
+            try
+            {
+                using (var reader = getReader())
+                {
+                    background = new TextureStore(
+                        new RawTextureLoaderStore(reader),
+                        false).Get(BeatmapInfo.Metadata.BackgroundFile);
+                }
+            }
+            catch { return null; }
+            return background;
+        }
+
+        private ArchiveReader trackReader;
+        protected override Track GetTrack()
+        {
+            Track track;
+            try
+            {
+                //store a reference to the reader as we may continue accessing the stream in the background.
+                trackReader = getReader();
+                var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                track = trackData == null ? null : new TrackBass(trackData);
+            }
+            catch { return null; }
+            return track;
         }
     }
 }
\ No newline at end of file

From 859ee5d316d99f6f74d1c3188fcab9c8138d8071 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 10:07:26 +0900
Subject: [PATCH 5/5] Tidy up DatabaseWorkingBeatmap.

---
 osu.Game/Database/DatabaseWorkingBeatmap.cs | 28 ++++++++-------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 0a7779f17b..1b37cf2fa0 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -21,12 +21,13 @@ namespace osu.Game.Database
         }
 
         private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
-        
+
         protected override Beatmap GetBeatmap()
         {
-            Beatmap beatmap;
             try
             {
+                Beatmap beatmap;
+
                 using (var reader = getReader())
                 {
                     BeatmapDecoder decoder;
@@ -40,42 +41,33 @@ namespace osu.Game.Database
                         using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
                             decoder.Decode(stream, beatmap);
                 }
+
+                return beatmap;
             }
             catch { return null; }
-            return beatmap;
         }
-        
+
         protected override Texture GetBackground()
         {
-            Texture background;
             if (BeatmapInfo?.Metadata?.BackgroundFile == null)
                 return null;
+
             try
             {
                 using (var reader = getReader())
-                {
-                    background = new TextureStore(
-                        new RawTextureLoaderStore(reader),
-                        false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                }
+                    return new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile);
             }
             catch { return null; }
-            return background;
         }
 
-        private ArchiveReader trackReader;
         protected override Track GetTrack()
         {
-            Track track;
             try
             {
-                //store a reference to the reader as we may continue accessing the stream in the background.
-                trackReader = getReader();
-                var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                track = trackData == null ? null : new TrackBass(trackData);
+                var trackData = getReader()?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                return trackData == null ? null : new TrackBass(trackData);
             }
             catch { return null; }
-            return track;
         }
     }
 }
\ No newline at end of file