Merge branch 'master' into spinner-judgement-fix

osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs

@@ -0,0 +1,65 @@
+// 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 Newtonsoft.Json;
+using NUnit.Framework;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Tests.NonVisual
+{
+    [TestFixture]
+    public class LadderInfoSerialisationTest
+    {
+        [Test]
+        public void TestDeserialise()
+        {
+            var ladder = createSampleLadder();
+            string serialised = JsonConvert.SerializeObject(ladder);
+
+            JsonConvert.DeserializeObject<LadderInfo>(serialised, new JsonPointConverter());
+        }
+
+        [Test]
+        public void TestSerialise()
+        {
+            var ladder = createSampleLadder();
+            JsonConvert.SerializeObject(ladder);
+        }
+
+        private static LadderInfo createSampleLadder()
+        {
+            var match = TournamentTestScene.CreateSampleMatch();
+
+            return new LadderInfo
+            {
+                PlayersPerTeam = { Value = 4 },
+                Teams =
+                {
+                    match.Team1.Value,
+                    match.Team2.Value,
+                },
+                Rounds =
+                {
+                    new TournamentRound
+                    {
+                        Beatmaps =
+                        {
+                            new RoundBeatmap { BeatmapInfo = TournamentTestScene.CreateSampleBeatmapInfo() },
+                            new RoundBeatmap { BeatmapInfo = TournamentTestScene.CreateSampleBeatmapInfo() },
+                        }
+                    }
+                },
+
+                Matches =
+                {
+                    match,
+                },
+                Progressions =
+                {
+                    new TournamentProgression(1, 2),
+                    new TournamentProgression(1, 3, true),
+                }
+            };
+        }
+    }
+}

osu.Game.Tournament.Tests/TournamentTestScene.cs

@@ -152,7 +152,16 @@ namespace osu.Game.Tournament.Tests
         };
 
         public static BeatmapInfo CreateSampleBeatmapInfo() =>
-            new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist", ID = RNG.Next(0, 1000000) } };
+            new BeatmapInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = "Test Title",
+                    Artist = "Test Artist",
+                    ID = RNG.Next(0, 1000000)
+                },
+                OnlineInfo = new BeatmapOnlineInfo(),
+            };
 
         protected override ITestSceneTestRunner CreateRunner() => new TournamentTestSceneTestRunner();
 

osu.Game.Tournament/TournamentGame.cs

@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Handlers.Mouse;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
@@ -60,7 +61,23 @@ namespace osu.Game.Tournament
 
             loadingSpinner.Show();
 
-            BracketLoadTask.ContinueWith(_ => LoadComponentsAsync(new[]
+            BracketLoadTask.ContinueWith(t =>
+            {
+                if (t.IsFaulted)
+                {
+                    Schedule(() =>
+                    {
+                        loadingSpinner.Hide();
+                        loadingSpinner.Expire();
+
+                        Logger.Error(t.Exception, "Couldn't load bracket with error");
+                        Add(new WarningBox("Your bracket.json file could not be parsed. Please check runtime.log for more details."));
+                    });
+
+                    return;
+                }
+
+                LoadComponentsAsync(new[]
                 {
                     new Container
                     {
@@ -125,7 +142,8 @@ namespace osu.Game.Tournament
                     {
                         windowMode.Value = WindowMode.Windowed;
                     }), true);
-            }));
+                });
+            });
         }
     }
 }

osu.Game.Tournament/TournamentGameBase.cs

@@ -57,6 +57,8 @@ namespace osu.Game.Tournament
         }
 
         private void readBracket()
+        {
+            try
             {
                 if (storage.Exists(bracket_filename))
                 {
@@ -127,6 +129,12 @@ namespace osu.Game.Tournament
                     SaveChanges();
 
                 ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
+            }
+            catch (Exception e)
+            {
+                taskCompletionSource.SetException(e);
+                return;
+            }
 
             Schedule(() =>
             {

osu.Game.Tournament/TournamentSceneManager.cs

@@ -237,7 +237,7 @@ namespace osu.Game.Tournament
             {
                 Type = type;
                 BackgroundColour = OsuColour.Gray(0.2f);
-                Action = () => RequestSelection(type);
+                Action = () => RequestSelection?.Invoke(type);
 
                 RelativeSizeAxes = Axes.X;
             }

osu.Game/Beatmaps/BeatmapSetInfo.cs

@@ -117,7 +117,6 @@ namespace osu.Game.Beatmaps
         [JsonIgnore]
         public DateTimeOffset? LastUpdated => OnlineInfo.LastUpdated;
 
-        [NotMapped]
         [JsonIgnore]
         public BeatmapSetOnlineStatus Status { get; set; } = BeatmapSetOnlineStatus.None;
 

osu.Game/Online/API/Requests/Responses/APIBeatmap.cs

@@ -54,7 +54,7 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"accuracy")]
         private float overallDifficulty { get; set; }
 
-        public double Length => lengthInSeconds * 1000;
+        public double Length => TimeSpan.FromSeconds(lengthInSeconds).TotalMilliseconds;
 
         [JsonProperty(@"total_length")]
         private double lengthInSeconds { get; set; }
@@ -86,7 +86,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 OnlineBeatmapID = OnlineID,
                 Version = DifficultyName,
                 // this is actually an incorrect mapping (Length is calculated as drain length in lazer's import process, see BeatmapManager.calculateLength).
-                Length = TimeSpan.FromSeconds(Length).TotalMilliseconds,
+                Length = Length,
                 Status = Status,
                 MD5Hash = Checksum,
                 BeatmapSet = set,