Fix auto-imported maps causing exceptions

InventiveRhythm · Mar 2, 2024 · 415a2d1 · 415a2d1
1 parent 94d6b78
commit 415a2d1
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/fluXis.Game/Map/MapInfo.cs b/fluXis.Game/Map/MapInfo.cs
@@ -9,7 +9,6 @@
 using fluXis.Game.Utils;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using osu.Framework.Logging;
 
 namespace fluXis.Game.Map;
 
@@ -138,20 +137,37 @@ public virtual T GetMapEvents<T>()
         return MapEvents.Load<T>(content);
     }
 
-    public Storyboard GetStoryboard()
+    public virtual Storyboard GetStoryboard()
     {
-        var path = MapFiles.GetFullPath(Map?.MapSet.GetPathForFile(StoryboardFile));
+        var file = Map?.MapSet.GetPathForFile(StoryboardFile);
+
+        if (string.IsNullOrEmpty(file))
+            return new Storyboard();
+
+        var path = MapFiles.GetFullPath(file);
 
-        Logger.Log($"Loading storyboard from {path}");
         if (string.IsNullOrEmpty(path) || !File.Exists(path))
             return new Storyboard();
 
         var json = File.ReadAllText(path);
-        Logger.Log($"Loaded storyboard from {path}");
         return json.Deserialize<Storyboard>();
     }
 
-    public DrawableStoryboard CreateDrawableStoryboard() => new(GetStoryboard(), MapFiles.GetFullPath(Map!.MapSet.ID.ToString()));
+    public virtual DrawableStoryboard CreateDrawableStoryboard()
+    {
+        var sb = GetStoryboard();
+        var folderName = Map?.MapSet.ID.ToString();
+
+        if (string.IsNullOrEmpty(folderName))
+            return new DrawableStoryboard(sb, ".");
+
+        var path = MapFiles.GetFullPath(folderName);
+
+        if (!Directory.Exists(path))
+            return new DrawableStoryboard(sb, ".");
+
+        return new DrawableStoryboard(sb, MapFiles.GetFullPath(Map!.MapSet.ID.ToString()));
+    }
 
     public TimingPoint GetTimingPoint(double time)
     {