From b448603d6c33f9aa68d9dba92cac3c2227b0080b Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Tue, 11 Jul 2017 01:42:51 -0300 Subject: [PATCH] CI fixes. --- osu.Desktop.VisualTests/Tests/TestCaseDirect.cs | 8 ++++---- osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs | 4 ++-- osu.Game/Database/BeatmapSetOnlineInfo.cs | 6 +++--- osu.Game/Overlays/Direct/DirectPanel.cs | 2 +- osu.Game/Overlays/Direct/Header.cs | 6 +++--- osu.Game/Overlays/DirectOverlay.cs | 1 + osu.Game/Screens/Multiplayer/RoomInspector.cs | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs b/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs index acd243d9af..fb1dbf01ee 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs @@ -53,7 +53,7 @@ namespace osu.Desktop.VisualTests.Tests 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", + Card2X = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390", }, Preview = @"https://b.ppy.sh/preview/578332.mp3", PlayCount = 97, @@ -83,7 +83,7 @@ namespace osu.Desktop.VisualTests.Tests 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", + Card2X = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318", }, Preview = @"https//b.ppy.sh/preview/599627.mp3", PlayCount = 3082, @@ -113,7 +113,7 @@ namespace osu.Desktop.VisualTests.Tests 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", + Card2X = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863", }, Preview = @"https//b.ppy.sh/preview/513268.mp3", PlayCount = 2762, @@ -158,7 +158,7 @@ namespace osu.Desktop.VisualTests.Tests 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", + Card2X = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741", }, Preview = @"https//b.ppy.sh/preview/586841.mp3", PlayCount = 62317, diff --git a/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs b/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs index 6f01234d02..0b5fa2384b 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", }, }, }, @@ -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/Database/BeatmapSetOnlineInfo.cs b/osu.Game/Database/BeatmapSetOnlineInfo.cs index aad565eff9..d581137a97 100644 --- a/osu.Game/Database/BeatmapSetOnlineInfo.cs +++ b/osu.Game/Database/BeatmapSetOnlineInfo.cs @@ -40,16 +40,16 @@ namespace osu.Game.Database public string Cover { get; set; } [JsonProperty(@"cover@2x")] - public string Cover2x { get; set; } + public string Cover2X { get; set; } public string Card { get; set; } [JsonProperty(@"card@2x")] - public string Card2x { get; set; } + public string Card2X { get; set; } public string List { get; set; } [JsonProperty(@"list@2x")] - public string List2x { get; set; } + public string List2X { get; set; } } } diff --git a/osu.Game/Overlays/Direct/DirectPanel.cs b/osu.Game/Overlays/Direct/DirectPanel.cs index f2373cb97e..1c2ecd767c 100644 --- a/osu.Game/Overlays/Direct/DirectPanel.cs +++ b/osu.Game/Overlays/Direct/DirectPanel.cs @@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Direct private void load(TextureStore textures) { if (set.OnlineInfo?.Covers?.Card != null) - Texture = textures.Get(doubleSize ? set.OnlineInfo.Covers.Card2x : set.OnlineInfo.Covers.Card); + Texture = textures.Get(doubleSize ? set.OnlineInfo.Covers.Card2X : set.OnlineInfo.Covers.Card); } } } diff --git a/osu.Game/Overlays/Direct/Header.cs b/osu.Game/Overlays/Direct/Header.cs index 4310a9329f..2c50fb453f 100644 --- a/osu.Game/Overlays/Direct/Header.cs +++ b/osu.Game/Overlays/Direct/Header.cs @@ -30,10 +30,10 @@ namespace osu.Game.Overlays.Direct { Search, [Description("Newest Maps")] - NewestMaps = (int)DirectSortCriteria.Ranked, + NewestMaps = DirectSortCriteria.Ranked, [Description("Top Rated")] - TopRated = (int)DirectSortCriteria.Rating, + TopRated = DirectSortCriteria.Rating, [Description("Most Played")] - MostPlayed = (int)DirectSortCriteria.Plays, + MostPlayed = DirectSortCriteria.Plays, } } diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs index 252c542328..f186d954d1 100644 --- a/osu.Game/Overlays/DirectOverlay.cs +++ b/osu.Game/Overlays/DirectOverlay.cs @@ -195,6 +195,7 @@ namespace osu.Game.Overlays getSetsRequest.Success += r => { BeatmapSets = r?.Select(response => response.ToBeatmapSet(rulesets)); + if (BeatmapSets == null) return; var artists = new List(); var songs = new List(); diff --git a/osu.Game/Screens/Multiplayer/RoomInspector.cs b/osu.Game/Screens/Multiplayer/RoomInspector.cs index 2a3b2cca61..d488b1f5a1 100644 --- a/osu.Game/Screens/Multiplayer/RoomInspector.cs +++ b/osu.Game/Screens/Multiplayer/RoomInspector.cs @@ -539,8 +539,8 @@ namespace osu.Game.Screens.Multiplayer [BackgroundDependencyLoader] private void load(TextureStore textures) { - if (set.OnlineInfo?.Covers?.Cover2x != null) - Texture = textures.Get(set.OnlineInfo.Covers.Cover2x); + if (set.OnlineInfo?.Covers?.Cover2X != null) + Texture = textures.Get(set.OnlineInfo.Covers.Cover2X); } } }