From a4208f35c49c55ea1bbe4907d374e17a497cde30 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Apr 2020 19:36:04 +0900
Subject: [PATCH] Make versionless skins fallback to version 1.0

---
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs |  2 +-
 osu.Game/Skinning/LegacyBeatmapSkin.cs        | 15 +++++++++++++++
 osu.Game/Skinning/LegacySkin.cs               |  7 ++-----
 osu.Game/Skinning/LegacySkinDecoder.cs        |  7 +++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index cef38bbbb8..aedf26ee75 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -106,7 +106,7 @@ public void TestDecodeNoVersion()
             var decoder = new LegacySkinDecoder();
             using (var resStream = TestResources.OpenResource("skin-empty.ini"))
             using (var stream = new LineBufferedReader(resStream))
-                Assert.IsNull(decoder.Decode(stream).LegacyVersion);
+                Assert.That(decoder.Decode(stream).LegacyVersion, Is.EqualTo(1.0m));
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 1c39fc41bb..1190a330fe 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
 using osu.Game.Beatmaps;
 
@@ -18,6 +19,20 @@ public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, Au
             Configuration.AllowDefaultComboColoursFallback = false;
         }
 
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+        {
+            switch (lookup)
+            {
+                case LegacySkinConfiguration.LegacySetting s when s == LegacySkinConfiguration.LegacySetting.Version:
+                    if (Configuration.LegacyVersion is decimal version)
+                        return SkinUtils.As<TValue>(new Bindable<decimal>(version));
+
+                    return null;
+            }
+
+            return base.GetConfig<TLookup, TValue>(lookup);
+        }
+
         private static SkinInfo createSkinInfo(BeatmapInfo beatmap) =>
             new SkinInfo { Name = beatmap.ToString(), Creator = beatmap.Metadata.Author.ToString() };
     }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3d3eac97f6..a68ae11288 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -71,7 +71,7 @@ protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager
                     }
                 }
                 else
-                    Configuration = new LegacySkinConfiguration { LegacyVersion = LegacySkinConfiguration.LATEST_VERSION };
+                    Configuration = new LegacySkinConfiguration();
             }
 
             if (storage != null)
@@ -122,10 +122,7 @@ public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
                     switch (legacy)
                     {
                         case LegacySkinConfiguration.LegacySetting.Version:
-                            if (Configuration.LegacyVersion is decimal version)
-                                return SkinUtils.As<TValue>(new Bindable<decimal>(version));
-
-                            break;
+                            return SkinUtils.As<TValue>(new Bindable<decimal>(Configuration.LegacyVersion ?? LegacySkinConfiguration.LATEST_VERSION));
                     }
 
                     break;
diff --git a/osu.Game/Skinning/LegacySkinDecoder.cs b/osu.Game/Skinning/LegacySkinDecoder.cs
index 88ba7b23b7..5d4b8de7ac 100644
--- a/osu.Game/Skinning/LegacySkinDecoder.cs
+++ b/osu.Game/Skinning/LegacySkinDecoder.cs
@@ -52,5 +52,12 @@ protected override void ParseLine(LegacySkinConfiguration skin, Section section,
 
             base.ParseLine(skin, section, line);
         }
+
+        protected override LegacySkinConfiguration CreateTemplateObject()
+        {
+            var config = base.CreateTemplateObject();
+            config.LegacyVersion = 1.0m;
+            return config;
+        }
     }
 }