From ee8045d5079b8cda129910297d00baa26c3420ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 15 Jun 2022 06:31:26 +0300
Subject: [PATCH] Add failing test case

---
 .../Database/LegacyBeatmapImporterTest.cs     | 67 +++++++++++++++++++
 osu.Game/IO/StableStorage.cs                  |  4 +-
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
new file mode 100644
index 0000000000..145ba2c730
--- /dev/null
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -0,0 +1,67 @@
+// 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.Collections.Generic;
+using System.IO;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Database;
+using osu.Game.IO;
+
+namespace osu.Game.Tests.Database
+{
+    [TestFixture]
+    public class LegacyBeatmapImporterTest
+    {
+        private readonly TestLegacyBeatmapImporter importer = new TestLegacyBeatmapImporter();
+
+        [Test]
+        public void TestSongsSubdirectories()
+        {
+            using (var storage = new TemporaryNativeStorage("stable-songs-folder"))
+            {
+                var songsStorage = storage.GetStorageForDirectory(StableStorage.STABLE_DEFAULT_SONGS_PATH);
+
+                // normal beatmap folder
+                var beatmap1 = songsStorage.GetStorageForDirectory("beatmap1");
+                beatmap1.CreateFileSafely("beatmap.osu");
+
+                // songs subdirectory
+                var subdirectory = songsStorage.GetStorageForDirectory("subdirectory");
+                subdirectory.CreateFileSafely(subdirectory.GetFullPath(Path.Combine("beatmap2", "beatmap.osu"), true));
+                subdirectory.CreateFileSafely(subdirectory.GetFullPath(Path.Combine("beatmap3", "beatmap.osu"), true));
+                subdirectory.CreateFileSafely(subdirectory.GetFullPath(Path.Combine("sub-subdirectory", "beatmap4", "beatmap.osu"), true));
+
+                // songs subdirectory with system file
+                var subdirectory2 = songsStorage.GetStorageForDirectory("subdirectory2");
+                subdirectory2.CreateFileSafely(subdirectory2.GetFullPath(".DS_Store"));
+                subdirectory2.CreateFileSafely(subdirectory2.GetFullPath(Path.Combine("beatmap5", "beatmap.osu"), true));
+                subdirectory2.CreateFileSafely(subdirectory2.GetFullPath(Path.Combine("beatmap6", "beatmap.osu"), true));
+
+                // empty songs subdirectory
+                songsStorage.GetStorageForDirectory("subdirectory3");
+
+                string[] paths = importer.GetStableImportPaths(songsStorage).ToArray();
+                Assert.That(paths.Length, Is.EqualTo(6));
+                Assert.That(paths.Contains(songsStorage.GetFullPath("beatmap1")));
+                Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap2"))));
+                Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap3"))));
+                Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "sub-subdirectory", "beatmap4"))));
+                Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap5"))));
+                Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap6"))));
+            }
+        }
+
+        private class TestLegacyBeatmapImporter : LegacyBeatmapImporter
+        {
+            public TestLegacyBeatmapImporter()
+                : base(null)
+            {
+            }
+
+            public new IEnumerable<string> GetStableImportPaths(Storage storage) => base.GetStableImportPaths(storage);
+        }
+    }
+}
diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index 84b7da91fc..d4ff8fcdda 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -14,7 +14,7 @@ namespace osu.Game.IO
     /// </summary>
     public class StableStorage : DesktopStorage
     {
-        private const string stable_default_songs_path = "Songs";
+        public const string STABLE_DEFAULT_SONGS_PATH = "Songs";
 
         private readonly DesktopGameHost host;
         private readonly Lazy<string> songsPath;
@@ -62,7 +62,7 @@ private string locateSongsDirectory()
                 }
             }
 
-            return GetFullPath(stable_default_songs_path);
+            return GetFullPath(STABLE_DEFAULT_SONGS_PATH);
         }
     }
 }