Merge remote-tracking branch 'upstream/master' into accent-colour-properties

osu.Game.Rulesets.Catch/Objects/JuiceStream.cs

@@ -64,52 +64,57 @@ namespace osu.Game.Rulesets.Catch.Objects
                 X = X
             });
 
-            for (var span = 0; span < this.SpanCount(); span++)
+            double lastDropletTime = StartTime;
+
+            for (int span = 0; span < this.SpanCount(); span++)
             {
                 var spanStartTime = StartTime + span * spanDuration;
                 var reversed = span % 2 == 1;
 
-                for (var d = tickDistance; d <= length; d += tickDistance)
+                for (double d = 0; d <= length; d += tickDistance)
                 {
-                    if (d > length - minDistanceFromEnd)
-                        break;
-
                     var timeProgress = d / length;
                     var distanceProgress = reversed ? 1 - timeProgress : timeProgress;
 
-                    var lastTickTime = spanStartTime + timeProgress * spanDuration;
+                    double time = spanStartTime + timeProgress * spanDuration;
-                    AddNested(new Droplet
+
+                    double tinyTickInterval = time - lastDropletTime;
+                    while (tinyTickInterval > 100)
+                        tinyTickInterval /= 2;
+
+                    for (double t = lastDropletTime + tinyTickInterval; t < time; t += tinyTickInterval)
                     {
-                        StartTime = lastTickTime,
+                        double progress = reversed ? 1 - (t - spanStartTime) / spanDuration : (t - spanStartTime) / spanDuration;
-                        X = X + Curve.PositionAt(distanceProgress).X / CatchPlayfield.BASE_WIDTH,
+
-                        Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
+                        AddNested(new TinyDroplet
                         {
-                            Bank = s.Bank,
+                            StartTime = t,
-                            Name = @"slidertick",
+                            X = X + Curve.PositionAt(progress).X / CatchPlayfield.BASE_WIDTH,
-                            Volume = s.Volume
+                            Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
-                        }))
+                            {
-                    });
+                                Bank = s.Bank,
-                }
+                                Name = @"slidertick",
+                                Volume = s.Volume
+                            }))
+                        });
+                    }
 
-                double tinyTickInterval = tickDistance / length * spanDuration;
+                    if (d > minDistanceFromEnd && Math.Abs(d - length) > minDistanceFromEnd)
-                while (tinyTickInterval > 100)
-                    tinyTickInterval /= 2;
-
-                for (double t = 0; t < spanDuration; t += tinyTickInterval)
-                {
-                    double progress = reversed ? 1 - t / spanDuration : t / spanDuration;
-
-                    AddNested(new TinyDroplet
                     {
-                        StartTime = spanStartTime + t,
+                        AddNested(new Droplet
-                        X = X + Curve.PositionAt(progress).X / CatchPlayfield.BASE_WIDTH,
-                        Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
                         {
-                            Bank = s.Bank,
+                            StartTime = time,
-                            Name = @"slidertick",
+                            X = X + Curve.PositionAt(distanceProgress).X / CatchPlayfield.BASE_WIDTH,
-                            Volume = s.Volume
+                            Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
-                        }))
+                            {
-                    });
+                                Bank = s.Bank,
+                                Name = @"slidertick",
+                                Volume = s.Volume
+                            }))
+                        });
+                    }
+
+                    lastDropletTime = time;
                 }
 
                 AddNested(new Fruit

osu.Game.Rulesets.Catch/Tests/CatchBeatmapConversionTest.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";
 
-        [TestCase("basic"), Ignore("See: https://github.com/ppy/osu/issues/2149")]
+        [TestCase("basic"), Ignore("See: https://github.com/ppy/osu/issues/2232")]
         public new void Test(string name)
         {
             base.Test(name);

osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs

@@ -96,7 +96,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleGeneral(string line)
         {
-            var pair = SplitKeyVal(line, ':');
+            var pair = SplitKeyVal(line);
 
             var metadata = beatmap.BeatmapInfo.Metadata;
             switch (pair.Key)
@@ -155,7 +155,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleEditor(string line)
         {
-            var pair = SplitKeyVal(line, ':');
+            var pair = SplitKeyVal(line);
 
             switch (pair.Key)
             {
@@ -179,7 +179,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleMetadata(string line)
         {
-            var pair = SplitKeyVal(line, ':');
+            var pair = SplitKeyVal(line);
 
             var metadata = beatmap.BeatmapInfo.Metadata;
             switch (pair.Key)
@@ -220,7 +220,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleDifficulty(string line)
         {
-            var pair = SplitKeyVal(line, ':');
+            var pair = SplitKeyVal(line);
 
             var difficulty = beatmap.BeatmapInfo.BaseDifficulty;
             switch (pair.Key)

osu.Game/Beatmaps/Formats/LegacyDecoder.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using osu.Framework.Logging;
 using OpenTK.Graphics;
 
 namespace osu.Game.Beatmaps.Formats
@@ -31,7 +32,11 @@ namespace osu.Game.Beatmaps.Formats
                 if (line.StartsWith(@"[") && line.EndsWith(@"]"))
                 {
                     if (!Enum.TryParse(line.Substring(1, line.Length - 2), out section))
-                        throw new InvalidDataException($@"Unknown osu section {line}");
+                    {
+                        Logger.Log($"Unknown section \"{line}\" in {beatmap}");
+                        section = Section.None;
+                    }
+
                     continue;
                 }
 
@@ -55,7 +60,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleColours(T output, string line)
         {
-            var pair = SplitKeyVal(line, ':');
+            var pair = SplitKeyVal(line);
 
             bool isCombo = pair.Key.StartsWith(@"Combo");
 
@@ -89,7 +94,7 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
-        protected KeyValuePair<string, string> SplitKeyVal(string line, char separator)
+        protected KeyValuePair<string, string> SplitKeyVal(string line, char separator = ':')
         {
             var split = line.Trim().Split(new[] { separator }, 2);
 

osu.Game/Database/ArchiveModelManager.cs

@@ -13,6 +13,7 @@ using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.IPC;
 using osu.Game.Overlays.Notifications;
+using SharpCompress.Common;
 using FileInfo = osu.Game.IO.FileInfo;
 
 namespace osu.Game.Database
@@ -331,7 +332,9 @@ namespace osu.Game.Database
         {
             if (ZipFile.IsZipFile(path))
                 return new ZipArchiveReader(Files.Storage.GetStream(path), Path.GetFileName(path));
-            return new LegacyFilesystemReader(path);
+            if (Directory.Exists(path))
+                return new LegacyFilesystemReader(path);
+            throw new InvalidFormatException($"{path} is not a valid archive");
         }
     }
 }

osu.Game/Overlays/Settings/Sections/SkinSection.cs

@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 },
             };
 
-            void reloadSkins() => skinDropdown.Items = skins.GetAllUsableSkins().Select(s => new KeyValuePair<string, int>(s.Name, s.ID));
+            void reloadSkins() => skinDropdown.Items = skins.GetAllUsableSkins().Select(s => new KeyValuePair<string, int>(s.ToString(), s.ID));
             skins.ItemAdded += _ => reloadSkins();
             skins.ItemRemoved += _ => reloadSkins();
 

osu.Game/Screens/Menu/OsuLogo.cs

@@ -337,12 +337,10 @@ namespace osu.Game.Screens.Menu
             }
         }
 
-        private bool interactive => Action != null && Alpha > 0.2f;
+        public override bool HandleMouseInput => base.HandleMouseInput && Action != null && Alpha > 0.2f;
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
-            if (!interactive) return false;
-
             logoBounceContainer.ScaleTo(0.9f, 1000, Easing.Out);
             return true;
         }
@@ -355,8 +353,6 @@ namespace osu.Game.Screens.Menu
 
         protected override bool OnClick(InputState state)
         {
-            if (!interactive) return false;
-
             if (Action?.Invoke() ?? true)
                 sampleClick.Play();
 
@@ -368,8 +364,6 @@ namespace osu.Game.Screens.Menu
 
         protected override bool OnHover(InputState state)
         {
-            if (!interactive) return false;
-
             logoHoverContainer.ScaleTo(1.1f, 500, Easing.OutElastic);
             return true;
         }

osu.Game/Skinning/DefaultSkin.cs

@@ -11,6 +11,7 @@ namespace osu.Game.Skinning
         public DefaultSkin()
             : base(SkinInfo.Default)
         {
+            Configuration = new SkinConfiguration();
         }
 
         public override Drawable GetDrawableComponent(string componentName)

osu.Game/Skinning/LegacySkin.cs

@@ -25,6 +25,14 @@ namespace osu.Game.Skinning
             storage = new LegacySkinResourceStore(skin, storage);
             samples = audioManager.GetSampleManager(storage);
             textures = new TextureStore(new RawTextureLoaderStore(storage));
+
+            Stream stream = storage.GetStream("skin.ini");
+
+            if (stream != null)
+                using (StreamReader reader = new StreamReader(stream))
+                    Configuration = new LegacySkinDecoder().Decode(reader);
+            else
+                Configuration = new SkinConfiguration();
         }
 
         public override Drawable GetDrawableComponent(string componentName)
@@ -60,10 +68,12 @@ namespace osu.Game.Skinning
 
             private string getPathForFile(string filename)
             {
+                bool hasExtension = filename.Contains('.');
+
                 string lastPiece = filename.Split('/').Last();
 
                 var file = skin.Files.FirstOrDefault(f =>
-                    string.Equals(Path.GetFileNameWithoutExtension(f.Filename), lastPiece, StringComparison.InvariantCultureIgnoreCase));
+                    string.Equals(hasExtension ? f.Filename : Path.GetFileNameWithoutExtension(f.Filename), lastPiece, StringComparison.InvariantCultureIgnoreCase));
                 return file?.FileInfo.StoragePath;
             }
 
@@ -73,9 +83,17 @@ namespace osu.Game.Skinning
                 this.underlyingStore = underlyingStore;
             }
 
-            public Stream GetStream(string name) => underlyingStore.GetStream(getPathForFile(name));
+            public Stream GetStream(string name)
+            {
+                string path = getPathForFile(name);
+                return path == null ? null : underlyingStore.GetStream(path);
+            }
 
-            byte[] IResourceStore<byte[]>.Get(string name) => underlyingStore.Get(getPathForFile(name));
+            byte[] IResourceStore<byte[]>.Get(string name)
+            {
+                string path = getPathForFile(name);
+                return path == null ? null : underlyingStore.Get(path);
+            }
         }
     }
 }

osu.Game/Skinning/LegacySkinDecoder.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps.Formats;
+
+namespace osu.Game.Skinning
+{
+    public class LegacySkinDecoder : LegacyDecoder<SkinConfiguration>
+    {
+        public LegacySkinDecoder()
+            : base(1)
+        {
+        }
+
+        protected override void ParseLine(SkinConfiguration output, Section section, string line)
+        {
+            switch (section)
+            {
+                case Section.General:
+                    var pair = SplitKeyVal(line);
+
+                    switch (pair.Key)
+                    {
+                        case @"Name":
+                            output.SkinInfo.Name = pair.Value;
+                            break;
+                        case @"Author":
+                            output.SkinInfo.Creator = pair.Value;
+                            break;
+                    }
+
+                    break;
+            }
+
+            base.ParseLine(output, section, line);
+        }
+    }
+}

osu.Game/Skinning/Skin.cs

@@ -10,6 +10,8 @@ namespace osu.Game.Skinning
     {
         public readonly SkinInfo SkinInfo;
 
+        public virtual SkinConfiguration Configuration { get; protected set; }
+
         public abstract Drawable GetDrawableComponent(string componentName);
 
         public abstract SampleChannel GetSample(string sampleName);

osu.Game/Skinning/SkinConfiguration.cs

@@ -0,0 +1,18 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Game.Beatmaps.Formats;
+using OpenTK.Graphics;
+
+namespace osu.Game.Skinning
+{
+    public class SkinConfiguration : IHasComboColours, IHasCustomColours
+    {
+        public readonly SkinInfo SkinInfo = new SkinInfo();
+
+        public List<Color4> ComboColours { get; set; } = new List<Color4>();
+
+        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
+    }
+}

osu.Game/Skinning/SkinInfo.cs

@@ -24,5 +24,7 @@ namespace osu.Game.Skinning
         public static SkinInfo Default { get; } = new SkinInfo { Name = "osu!lazer", Creator = "team osu!" };
 
         public bool Equals(SkinInfo other) => other != null && ID == other.ID;
+
+        public override string ToString() => $"\"{Name}\" by {Creator}";
     }
 }

osu.Game/Skinning/SkinManager.cs

@@ -39,6 +39,31 @@ namespace osu.Game.Skinning
             Name = archive.Name
         };
 
+        protected override void Populate(SkinInfo model, ArchiveReader archive)
+        {
+            base.Populate(model, archive);
+            populate(model);
+        }
+
+        /// <summary>
+        /// Populate a <see cref="SkinInfo"/> from its <see cref="SkinConfiguration"/> (if possible).
+        /// </summary>
+        /// <param name="model"></param>
+        private void populate(SkinInfo model)
+        {
+            Skin reference = GetSkin(model);
+            if (!string.IsNullOrEmpty(reference.Configuration.SkinInfo.Name))
+            {
+                model.Name = reference.Configuration.SkinInfo.Name;
+                model.Creator = reference.Configuration.SkinInfo.Creator;
+            }
+            else
+            {
+                model.Name = model.Name.Replace(".osk", "");
+                model.Creator = "Unknown";
+            }
+        }
+
         /// <summary>
         /// Retrieve a <see cref="Skin"/> instance for the provided <see cref="SkinInfo"/>
         /// </summary>
@@ -65,6 +90,16 @@ namespace osu.Game.Skinning
                 if (skin.SkinInfo != CurrentSkinInfo.Value)
                     throw new InvalidOperationException($"Setting {nameof(CurrentSkin)}'s value directly is not supported. Use {nameof(CurrentSkinInfo)} instead.");
             };
+
+            // migrate older imports which didn't have access to skin.ini
+            using (ContextFactory.GetForWrite())
+            {
+                foreach (var skinInfo in ModelStore.ConsumableItems.Where(s => s.Name.EndsWith(".osk")))
+                {
+                    populate(skinInfo);
+                    Update(skinInfo);
+                }
+            }
         }
 
         /// <summary>

osu.Game/osu.Game.csproj

@@ -874,7 +874,9 @@
     <Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
     <Compile Include="Skinning\DefaultSkin.cs" />
     <Compile Include="Skinning\LegacySkin.cs" />
+    <Compile Include="Skinning\LegacySkinDecoder.cs" />
     <Compile Include="Skinning\Skin.cs" />
+    <Compile Include="Skinning\SkinConfiguration.cs" />
     <Compile Include="Skinning\SkinFileInfo.cs" />
     <Compile Include="Skinning\SkinInfo.cs" />
     <Compile Include="Skinning\SkinManager.cs" />