Merge branch 'master' into score-refactor/isolated-serialisation

osu.Game.Tests/Visual/UserInterface/TestSceneDashboardBeatmapListing.cs

@@ -56,11 +56,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Set width to 300", () => content.ResizeWidthTo(300, 500));
         }
 
-        private static readonly List<BeatmapSetInfo> new_beatmaps = new List<BeatmapSetInfo>
+        private static readonly List<APIBeatmapSet> new_beatmaps = new List<APIBeatmapSet>
         {
-            new BeatmapSetInfo
+            new APIBeatmapSet
-            {
-                Metadata = new BeatmapMetadata
             {
                 Title = "Very Long Title (TV size) [TATOE]",
                 Artist = "This artist has a really long name how is this possible",
@@ -68,20 +66,33 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     Username = "author",
                     Id = 100
-                    }
                 },
-                OnlineInfo = new APIBeatmapSet
+                Covers = new BeatmapSetOnlineCovers
                 {
+                    Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
+                },
+                Ranked = DateTimeOffset.Now
+            },
+            new APIBeatmapSet
+            {
+                Title = "Very Long Title (TV size) [TATOE]",
+                Artist = "This artist has a really long name how is this possible",
+                Author = new User
+                {
+                    Username = "author",
+                    Id = 100
+                },
                 Covers = new BeatmapSetOnlineCovers
                 {
                     Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
                 },
                 Ranked = DateTimeOffset.Now
             }
-            },
+        };
-            new BeatmapSetInfo
+
+        private static readonly List<APIBeatmapSet> popular_beatmaps = new List<APIBeatmapSet>
         {
-                Metadata = new BeatmapMetadata
+            new APIBeatmapSet
             {
                 Title = "Very Long Title (TV size) [TATOE]",
                 Artist = "This artist has a really long name how is this possible",
@@ -89,62 +100,27 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     Username = "author",
                     Id = 100
-                    }
                 },
-                OnlineInfo = new APIBeatmapSet
-                {
                 Covers = new BeatmapSetOnlineCovers
                 {
                     Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
                 },
-                    Ranked = DateTimeOffset.MinValue
+                Ranked = DateTimeOffset.Now
-                }
+            },
-            }
+            new APIBeatmapSet
-        };
-
-        private static readonly List<BeatmapSetInfo> popular_beatmaps = new List<BeatmapSetInfo>
             {
-            new BeatmapSetInfo
+                Title = "Very Long Title (TV size) [TATOE]",
-            {
+                Artist = "This artist has a really long name how is this possible",
-                Metadata = new BeatmapMetadata
-                {
-                    Title = "Title",
-                    Artist = "Artist",
                 Author = new User
                 {
                     Username = "author",
                     Id = 100
-                    }
                 },
-                OnlineInfo = new APIBeatmapSet
-                {
                 Covers = new BeatmapSetOnlineCovers
                 {
-                        Cover = "https://assets.ppy.sh/beatmaps/1079428/covers/cover.jpg?1595295586",
+                    Cover = "https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg?1595456608",
                 },
-                    FavouriteCount = 100
+                Ranked = DateTimeOffset.Now
-                }
-            },
-            new BeatmapSetInfo
-            {
-                Metadata = new BeatmapMetadata
-                {
-                    Title = "Title 2",
-                    Artist = "Artist 2",
-                    Author = new User
-                    {
-                        Username = "someone",
-                        Id = 100
-                    }
-                },
-                OnlineInfo = new APIBeatmapSet
-                {
-                    Covers = new BeatmapSetOnlineCovers
-                    {
-                        Cover = "https://assets.ppy.sh/beatmaps/1079428/covers/cover.jpg?1595295586",
-                    },
-                    FavouriteCount = 10
-                }
             }
         };
     }

osu.Game/Database/IHasOnlineID.cs

@@ -8,7 +8,7 @@ namespace osu.Game.Database
     public interface IHasOnlineID<out T>
     {
         /// <summary>
-        /// The server-side ID representing this instance, if one exists. Any value 0 or less denotes a missing ID.
+        /// The server-side ID representing this instance, if one exists. Any value 0 or less denotes a missing ID (except in special cases where autoincrement is not used, like rulesets).
         /// </summary>
         /// <remarks>
         /// Generally we use -1 when specifying "missing" in code, but values of 0 are also considered missing as the online source

osu.Game/Overlays/Dashboard/Home/DashboardBeatmapListing.cs

@@ -5,17 +5,17 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
+using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DashboardBeatmapListing : CompositeDrawable
     {
-        private readonly List<BeatmapSetInfo> newBeatmaps;
+        private readonly List<APIBeatmapSet> newBeatmaps;
-        private readonly List<BeatmapSetInfo> popularBeatmaps;
+        private readonly List<APIBeatmapSet> popularBeatmaps;
 
-        public DashboardBeatmapListing(List<BeatmapSetInfo> newBeatmaps, List<BeatmapSetInfo> popularBeatmaps)
+        public DashboardBeatmapListing(List<APIBeatmapSet> newBeatmaps, List<APIBeatmapSet> popularBeatmaps)
         {
             this.newBeatmaps = newBeatmaps;
             this.popularBeatmaps = popularBeatmaps;

osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs

@@ -7,11 +7,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Home
@@ -24,14 +24,14 @@ namespace osu.Game.Overlays.Dashboard.Home
         [Resolved(canBeNull: true)]
         private BeatmapSetOverlay beatmapOverlay { get; set; }
 
-        protected readonly BeatmapSetInfo SetInfo;
+        protected readonly APIBeatmapSet BeatmapSet;
 
         private Box hoverBackground;
         private SpriteIcon chevron;
 
-        protected DashboardBeatmapPanel(BeatmapSetInfo setInfo)
+        protected DashboardBeatmapPanel(APIBeatmapSet beatmapSet)
         {
-            SetInfo = setInfo;
+            BeatmapSet = beatmapSet;
         }
 
         [BackgroundDependencyLoader]
@@ -82,7 +82,7 @@ namespace osu.Game.Overlays.Dashboard.Home
                                         RelativeSizeAxes = Axes.Both,
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
-                                        OnlineInfo = SetInfo.OnlineInfo
+                                        OnlineInfo = BeatmapSet
                                     }
                                 },
                                 new Container
@@ -103,14 +103,14 @@ namespace osu.Game.Overlays.Dashboard.Home
                                                 RelativeSizeAxes = Axes.X,
                                                 Truncate = true,
                                                 Font = OsuFont.GetFont(weight: FontWeight.Regular),
-                                                Text = SetInfo.Metadata.Title
+                                                Text = BeatmapSet.Title
                                             },
                                             new OsuSpriteText
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 Truncate = true,
                                                 Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
-                                                Text = SetInfo.Metadata.Artist
+                                                Text = BeatmapSet.Artist
                                             },
                                             new LinkFlowContainer(f => f.Font = OsuFont.GetFont(size: 10, weight: FontWeight.Regular))
                                             {
@@ -121,7 +121,7 @@ namespace osu.Game.Overlays.Dashboard.Home
                                             }.With(c =>
                                             {
                                                 c.AddText("by");
-                                                c.AddUserLink(SetInfo.Metadata.Author);
+                                                c.AddUserLink(BeatmapSet.Author);
                                                 c.AddArbitraryDrawable(CreateInfo());
                                             })
                                         }
@@ -143,8 +143,8 @@ namespace osu.Game.Overlays.Dashboard.Home
 
             Action = () =>
             {
-                if (SetInfo.OnlineBeatmapSetID.HasValue)
+                if (BeatmapSet.OnlineID > 0)
-                    beatmapOverlay?.FetchAndShowBeatmapSet(SetInfo.OnlineBeatmapSetID.Value);
+                    beatmapOverlay?.FetchAndShowBeatmapSet(BeatmapSet.OnlineID);
             };
         }
 

osu.Game/Overlays/Dashboard/Home/DashboardNewBeatmapPanel.cs

@@ -3,19 +3,19 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DashboardNewBeatmapPanel : DashboardBeatmapPanel
     {
-        public DashboardNewBeatmapPanel(BeatmapSetInfo setInfo)
+        public DashboardNewBeatmapPanel(APIBeatmapSet beatmapSet)
-            : base(setInfo)
+            : base(beatmapSet)
         {
         }
 
-        protected override Drawable CreateInfo() => new DrawableDate(SetInfo.OnlineInfo.Ranked ?? DateTimeOffset.Now, 10, false)
+        protected override Drawable CreateInfo() => new DrawableDate(BeatmapSet.Ranked ?? DateTimeOffset.Now, 10, false)
         {
             Colour = ColourProvider.Foreground1
         };

osu.Game/Overlays/Dashboard/Home/DashboardPopularBeatmapPanel.cs

@@ -4,17 +4,17 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DashboardPopularBeatmapPanel : DashboardBeatmapPanel
     {
-        public DashboardPopularBeatmapPanel(BeatmapSetInfo setInfo)
+        public DashboardPopularBeatmapPanel(APIBeatmapSet beatmapSet)
-            : base(setInfo)
+            : base(beatmapSet)
         {
         }
 
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Dashboard.Home
                 new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 10, weight: FontWeight.Regular),
-                    Text = SetInfo.OnlineInfo.FavouriteCount.ToString()
+                    Text = BeatmapSet.FavouriteCount.ToString()
                 }
             }
         };

osu.Game/Overlays/Dashboard/Home/DrawableBeatmapList.cs

@@ -6,20 +6,20 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Home
 {
     public abstract class DrawableBeatmapList : CompositeDrawable
     {
-        private readonly List<BeatmapSetInfo> beatmaps;
+        private readonly List<APIBeatmapSet> beatmapSets;
 
-        protected DrawableBeatmapList(List<BeatmapSetInfo> beatmaps)
+        protected DrawableBeatmapList(List<APIBeatmapSet> beatmapSets)
         {
-            this.beatmaps = beatmaps;
+            this.beatmapSets = beatmapSets;
         }
 
         [BackgroundDependencyLoader]
@@ -46,11 +46,11 @@ namespace osu.Game.Overlays.Dashboard.Home
                 }
             };
 
-            flow.AddRange(beatmaps.Select(CreateBeatmapPanel));
+            flow.AddRange(beatmapSets.Select(CreateBeatmapPanel));
         }
 
         protected abstract string Title { get; }
 
-        protected abstract DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo);
+        protected abstract DashboardBeatmapPanel CreateBeatmapPanel(APIBeatmapSet beatmapSet);
     }
 }

osu.Game/Overlays/Dashboard/Home/DrawableNewBeatmapList.cs

@@ -2,18 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
+using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DrawableNewBeatmapList : DrawableBeatmapList
     {
-        public DrawableNewBeatmapList(List<BeatmapSetInfo> beatmaps)
+        public DrawableNewBeatmapList(List<APIBeatmapSet> beatmapSets)
-            : base(beatmaps)
+            : base(beatmapSets)
         {
         }
 
-        protected override DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo) => new DashboardNewBeatmapPanel(setInfo);
+        protected override DashboardBeatmapPanel CreateBeatmapPanel(APIBeatmapSet beatmapSet) => new DashboardNewBeatmapPanel(beatmapSet);
 
         protected override string Title => "New Ranked Beatmaps";
     }

osu.Game/Overlays/Dashboard/Home/DrawablePopularBeatmapList.cs

@@ -2,18 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
+using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Dashboard.Home
 {
     public class DrawablePopularBeatmapList : DrawableBeatmapList
     {
-        public DrawablePopularBeatmapList(List<BeatmapSetInfo> beatmaps)
+        public DrawablePopularBeatmapList(List<APIBeatmapSet> beatmapSets)
-            : base(beatmaps)
+            : base(beatmapSets)
         {
         }
 
-        protected override DashboardBeatmapPanel CreateBeatmapPanel(BeatmapSetInfo setInfo) => new DashboardPopularBeatmapPanel(setInfo);
+        protected override DashboardBeatmapPanel CreateBeatmapPanel(APIBeatmapSet beatmapSet) => new DashboardPopularBeatmapPanel(beatmapSet);
 
         protected override string Title => "Popular Beatmaps";
     }