From fbe414d780b6db6c0dfbf4f8320d2ff1c2803e9c Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Tue, 11 Jul 2017 01:03:38 -0300 Subject: [PATCH] Cleanup. --- .../Tests/TestCaseDirect.cs | 24 +++++++++++++++---- .../Tests/TestCaseRoomInspector.cs | 8 +++---- .../API/Requests/GetBeatmapSetsRequest.cs | 2 +- osu.Game/Overlays/DirectOverlay.cs | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs b/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs index 6cbcb7ef94..acd243d9af 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs @@ -50,7 +50,11 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapSetOnlineInfo { - Covers = new BeatmapSetOnlineCovers { Card = @"https://assets.ppy.sh//beatmaps/578332/covers/cover.jpg?1494591390" }, + Covers = new BeatmapSetOnlineCovers + { + Card = @"https://assets.ppy.sh/beatmaps/578332/covers/card.jpg?1494591390", + Card2x = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390", + }, Preview = @"https://b.ppy.sh/preview/578332.mp3", PlayCount = 97, FavouriteCount = 72, @@ -76,7 +80,11 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapSetOnlineInfo { - Covers = new BeatmapSetOnlineCovers { Card = @"https://assets.ppy.sh//beatmaps/599627/covers/cover.jpg?1494539318" }, + Covers = new BeatmapSetOnlineCovers + { + Card = @"https://assets.ppy.sh/beatmaps/599627/covers/card.jpg?1494539318", + Card2x = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318", + }, Preview = @"https//b.ppy.sh/preview/599627.mp3", PlayCount = 3082, FavouriteCount = 14, @@ -102,7 +110,11 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapSetOnlineInfo { - Covers = new BeatmapSetOnlineCovers { Card = @"https://assets.ppy.sh//beatmaps/513268/covers/cover.jpg?1494502863" }, + Covers = new BeatmapSetOnlineCovers + { + Card = @"https://assets.ppy.sh/beatmaps/513268/covers/card.jpg?1494502863", + Card2x = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863", + }, Preview = @"https//b.ppy.sh/preview/513268.mp3", PlayCount = 2762, FavouriteCount = 15, @@ -143,7 +155,11 @@ namespace osu.Desktop.VisualTests.Tests }, OnlineInfo = new BeatmapSetOnlineInfo { - Covers = new BeatmapSetOnlineCovers { Card = @"https://assets.ppy.sh//beatmaps/586841/covers/cover.jpg?1494052741" }, + Covers = new BeatmapSetOnlineCovers + { + Card = @"https://assets.ppy.sh/beatmaps/586841/covers/card.jpg?1494052741", + Card2x = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741", + }, Preview = @"https//b.ppy.sh/preview/586841.mp3", PlayCount = 62317, FavouriteCount = 161, diff --git a/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs b/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs index df5dbe2add..6f01234d02 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs @@ -45,7 +45,7 @@ namespace osu.Desktop.VisualTests.Tests { Covers = new BeatmapSetOnlineCovers { - Cover2x = @"https://assets.ppy.sh//beatmaps/560573/covers/cover.jpg?1492722343", + Cover2x = @"https://assets.ppy.sh/beatmaps/560573/covers/cover.jpg?1492722343", }, }, }, @@ -102,8 +102,8 @@ namespace osu.Desktop.VisualTests.Tests Ruleset = rulesets.GetRuleset(0), Metadata = new BeatmapMetadata { - Title = @"xi", - Artist = @"FREEDOM DIVE", + Title = @"FREEDOM DIVE", + Artist = @"xi", Author = @"Nakagawa-Kanon", }, BeatmapSet = new BeatmapSetInfo @@ -112,7 +112,7 @@ namespace osu.Desktop.VisualTests.Tests { Covers = new BeatmapSetOnlineCovers { - Cover2x = @"https://assets.ppy.sh//beatmaps/39804/covers/cover.jpg?1456506845", + Cover2x = @"https://assets.ppy.sh/beatmaps/39804/covers/cover.jpg?1456506845", }, }, }, diff --git a/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs index f3f670138a..f6f9bf69fd 100644 --- a/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs +++ b/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs @@ -48,7 +48,7 @@ namespace osu.Game.Online.API.Requests [JsonProperty(@"beatmaps")] private IEnumerable beatmaps { get; set; } - public BeatmapSetInfo ToSetInfo(RulesetDatabase rulesets) + public BeatmapSetInfo ToBeatmapSet(RulesetDatabase rulesets) { return new BeatmapSetInfo { diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs index 68a41c06a8..252c542328 100644 --- a/osu.Game/Overlays/DirectOverlay.cs +++ b/osu.Game/Overlays/DirectOverlay.cs @@ -194,7 +194,7 @@ namespace osu.Game.Overlays getSetsRequest.Success += r => { - BeatmapSets = r?.Select(response => response.ToSetInfo(rulesets)); + BeatmapSets = r?.Select(response => response.ToBeatmapSet(rulesets)); var artists = new List(); var songs = new List();