From 183b95cbc21b0b56b44937a76410689921355024 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 24 Nov 2021 18:42:47 +0900 Subject: [PATCH] Rename `BeatmapSetOnlineStatus` to `BeatmapOnlineStatus` This variable is used at more than just a set level. --- .../Beatmaps/IO/ImportBeatmapTest.cs | 2 +- .../Database/BeatmapImporterTests.cs | 2 +- .../NonVisual/Filtering/FilterMatchingTest.cs | 2 +- .../Filtering/FilterQueryParserTest.cs | 4 ++-- .../Visual/Beatmaps/TestSceneBeatmapCard.cs | 6 +++--- .../TestSceneBeatmapSetOnlineStatusPill.cs | 2 +- .../TestSceneBeatmapSetOverlayDetails.cs | 2 +- .../Visual/Ranking/TestSceneResultsScreen.cs | 2 +- .../SongSelect/TestSceneBeatmapInfoWedge.cs | 2 +- .../SongSelect/TestSceneBeatmapLeaderboard.cs | 4 ++-- .../UserInterface/TestSceneLabelledDropdown.cs | 2 +- .../UserInterface/TestSceneOsuDropdown.cs | 2 +- osu.Game/Beatmaps/BeatmapInfo.cs | 2 +- osu.Game/Beatmaps/BeatmapOnlineLookupQueue.cs | 4 ++-- ...tOnlineStatus.cs => BeatmapOnlineStatus.cs} | 6 +++--- osu.Game/Beatmaps/BeatmapSetInfo.cs | 2 +- .../Drawables/BeatmapSetOnlineStatusPill.cs | 12 ++++++------ .../Statistics/BeatmapCardDateStatistic.cs | 8 ++++---- osu.Game/Beatmaps/IBeatmapSetOnlineInfo.cs | 4 ++-- osu.Game/Graphics/OsuColour.cs | 18 +++++++++--------- osu.Game/Models/RealmBeatmap.cs | 4 ++-- .../API/Requests/Responses/APIBeatmap.cs | 2 +- .../API/Requests/Responses/APIBeatmapSet.cs | 2 +- .../BeatmapSet/Scores/ScoresContainer.cs | 2 +- osu.Game/Screens/Ranking/SoloResultsScreen.cs | 2 +- osu.Game/Screens/Select/FilterCriteria.cs | 2 +- .../Select/Leaderboards/BeatmapLeaderboard.cs | 2 +- osu.Game/Tests/Visual/OsuTestScene.cs | 2 +- 28 files changed, 53 insertions(+), 53 deletions(-) rename osu.Game/Beatmaps/{BeatmapSetOnlineStatus.cs => BeatmapOnlineStatus.cs} (84%) diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index a404a54ee4..cac1bf05a6 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -596,7 +596,7 @@ namespace osu.Game.Tests.Beatmaps.IO { OnlineID = 2, Metadata = metadata, - Status = BeatmapSetOnlineStatus.Loved, + Status = BeatmapOnlineStatus.Loved, BaseDifficulty = difficulty } } diff --git a/osu.Game.Tests/Database/BeatmapImporterTests.cs b/osu.Game.Tests/Database/BeatmapImporterTests.cs index 71e5e9081c..9ee237cfd9 100644 --- a/osu.Game.Tests/Database/BeatmapImporterTests.cs +++ b/osu.Game.Tests/Database/BeatmapImporterTests.cs @@ -550,7 +550,7 @@ namespace osu.Game.Tests.Database new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), metadata) { OnlineID = 2, - Status = BeatmapSetOnlineStatus.Loved, + Status = BeatmapOnlineStatus.Loved, } } }; diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs index e49b0d3a67..55378043e6 100644 --- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs +++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs @@ -38,7 +38,7 @@ namespace osu.Game.Tests.NonVisual.Filtering Length = 2500, BPM = 160, BeatDivisor = 12, - Status = BeatmapSetOnlineStatus.Loved + Status = BeatmapOnlineStatus.Loved }; [Test] diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs index df42c70c87..460f89528b 100644 --- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs +++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs @@ -162,9 +162,9 @@ namespace osu.Game.Tests.NonVisual.Filtering FilterQueryParser.ApplyQueries(filterCriteria, query); Assert.AreEqual("I want the pp", filterCriteria.SearchText.Trim()); Assert.AreEqual(4, filterCriteria.SearchTerms.Length); - Assert.AreEqual(BeatmapSetOnlineStatus.Ranked, filterCriteria.OnlineStatus.Min); + Assert.AreEqual(BeatmapOnlineStatus.Ranked, filterCriteria.OnlineStatus.Min); Assert.IsTrue(filterCriteria.OnlineStatus.IsLowerInclusive); - Assert.AreEqual(BeatmapSetOnlineStatus.Ranked, filterCriteria.OnlineStatus.Max); + Assert.AreEqual(BeatmapOnlineStatus.Ranked, filterCriteria.OnlineStatus.Max); Assert.IsTrue(filterCriteria.OnlineStatus.IsUpperInclusive); } diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs index addec15881..cae7781db7 100644 --- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs +++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs @@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Beatmaps var withStatistics = CreateAPIBeatmapSet(Ruleset.Value); withStatistics.Title = withStatistics.TitleUnicode = "play favourite stats"; - withStatistics.Status = BeatmapSetOnlineStatus.Approved; + withStatistics.Status = BeatmapOnlineStatus.Approved; withStatistics.FavouriteCount = 284_239; withStatistics.PlayCount = 999_001; withStatistics.Ranked = DateTimeOffset.Now.AddDays(-45); @@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Beatmaps var someDifficulties = getManyDifficultiesBeatmapSet(11); someDifficulties.Title = someDifficulties.TitleUnicode = "favourited"; someDifficulties.Title = someDifficulties.TitleUnicode = "some difficulties"; - someDifficulties.Status = BeatmapSetOnlineStatus.Qualified; + someDifficulties.Status = BeatmapOnlineStatus.Qualified; someDifficulties.HasFavourited = true; someDifficulties.FavouriteCount = 1; someDifficulties.NominationStatus = new BeatmapSetNominationStatus @@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.Beatmaps }; var manyDifficulties = getManyDifficultiesBeatmapSet(100); - manyDifficulties.Status = BeatmapSetOnlineStatus.Pending; + manyDifficulties.Status = BeatmapOnlineStatus.Pending; var explicitMap = CreateAPIBeatmapSet(Ruleset.Value); explicitMap.Title = someDifficulties.TitleUnicode = "explicit beatmap"; diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs index c48b63ac89..8132fe6ab8 100644 --- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs +++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs @@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Beatmaps Origin = Anchor.Centre, Direction = FillDirection.Vertical, Spacing = new Vector2(0, 10), - ChildrenEnumerable = Enum.GetValues(typeof(BeatmapSetOnlineStatus)).Cast().Select(status => new BeatmapSetOnlineStatusPill + ChildrenEnumerable = Enum.GetValues(typeof(BeatmapOnlineStatus)).Cast().Select(status => new BeatmapSetOnlineStatusPill { AutoSizeAxes = Axes.Both, Anchor = Anchor.Centre, diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs index 9c0c67b1d8..629c413d85 100644 --- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs +++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs @@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Online } }, Ratings = Enumerable.Range(0, 11).Select(_ => RNG.Next(10)).ToArray(), - Status = BeatmapSetOnlineStatus.Ranked + Status = BeatmapOnlineStatus.Ranked }; } diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs index 423c0a048c..94700bac6a 100644 --- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs +++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs @@ -338,7 +338,7 @@ namespace osu.Game.Tests.Visual.Ranking : base(score, true) { Score.BeatmapInfo.OnlineID = 0; - Score.BeatmapInfo.Status = BeatmapSetOnlineStatus.Pending; + Score.BeatmapInfo.Status = BeatmapOnlineStatus.Pending; } protected override void LoadComplete() diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs index 1b070c00bf..e7c54efa8c 100644 --- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs @@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual.SongSelect Title = "Verrrrry long Title" }, DifficultyName = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Version", - Status = BeatmapSetOnlineStatus.Graveyard, + Status = BeatmapOnlineStatus.Graveyard, }, }; } diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs index a8a7a5d350..2a2df777f7 100644 --- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs @@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual.SongSelect [Test] public void TestBeatmapStates() { - foreach (BeatmapSetOnlineStatus status in Enum.GetValues(typeof(BeatmapSetOnlineStatus))) + foreach (BeatmapOnlineStatus status in Enum.GetValues(typeof(BeatmapOnlineStatus))) AddStep($"{status} beatmap", () => showBeatmapWithStatus(status)); } @@ -384,7 +384,7 @@ namespace osu.Game.Tests.Visual.SongSelect }; } - private void showBeatmapWithStatus(BeatmapSetOnlineStatus status) + private void showBeatmapWithStatus(BeatmapOnlineStatus status) { leaderboard.BeatmapInfo = new BeatmapInfo { diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDropdown.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDropdown.cs index 4b74e37ec4..a9aaefdf6c 100644 --- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDropdown.cs +++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDropdown.cs @@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.UserInterface [Test] public void TestLabelledEnumDropdown() - => AddStep(@"create dropdown", () => Child = new LabelledEnumDropdown + => AddStep(@"create dropdown", () => Child = new LabelledEnumDropdown { Label = @"Beatmap status", Description = @"This is a description" diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs index 9e77fcf675..cce0295413 100644 --- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs +++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs @@ -10,7 +10,7 @@ namespace osu.Game.Tests.Visual.UserInterface public class TestSceneOsuDropdown : ThemeComparisonTestScene { protected override Drawable CreateContent() => - new OsuEnumDropdown + new OsuEnumDropdown { Anchor = Anchor.Centre, Origin = Anchor.Centre, diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs index 782944c28e..36f82ac56c 100644 --- a/osu.Game/Beatmaps/BeatmapInfo.cs +++ b/osu.Game/Beatmaps/BeatmapInfo.cs @@ -35,7 +35,7 @@ namespace osu.Game.Beatmaps [JsonIgnore] public int BeatmapSetInfoID { get; set; } - public BeatmapSetOnlineStatus Status { get; set; } = BeatmapSetOnlineStatus.None; + public BeatmapOnlineStatus Status { get; set; } = BeatmapOnlineStatus.None; [Required] public BeatmapSetInfo BeatmapSet { get; set; } diff --git a/osu.Game/Beatmaps/BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapOnlineLookupQueue.cs index 7c80d8ad56..76232c2932 100644 --- a/osu.Game/Beatmaps/BeatmapOnlineLookupQueue.cs +++ b/osu.Game/Beatmaps/BeatmapOnlineLookupQueue.cs @@ -83,7 +83,7 @@ namespace osu.Game.Beatmaps if (res != null) { beatmapInfo.Status = res.Status; - beatmapInfo.BeatmapSet.Status = res.BeatmapSet?.Status ?? BeatmapSetOnlineStatus.None; + beatmapInfo.BeatmapSet.Status = res.BeatmapSet?.Status ?? BeatmapOnlineStatus.None; beatmapInfo.BeatmapSet.OnlineID = res.OnlineBeatmapSetID; beatmapInfo.OnlineID = res.OnlineID; @@ -182,7 +182,7 @@ namespace osu.Game.Beatmaps { if (reader.Read()) { - var status = (BeatmapSetOnlineStatus)reader.GetByte(2); + var status = (BeatmapOnlineStatus)reader.GetByte(2); beatmapInfo.Status = status; beatmapInfo.BeatmapSet.Status = status; diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs b/osu.Game/Beatmaps/BeatmapOnlineStatus.cs similarity index 84% rename from osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs rename to osu.Game/Beatmaps/BeatmapOnlineStatus.cs index edaf044466..7ac25b7b75 100644 --- a/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs +++ b/osu.Game/Beatmaps/BeatmapOnlineStatus.cs @@ -6,7 +6,7 @@ using osu.Game.Resources.Localisation.Web; namespace osu.Game.Beatmaps { - public enum BeatmapSetOnlineStatus + public enum BeatmapOnlineStatus { None = -3, @@ -34,7 +34,7 @@ namespace osu.Game.Beatmaps public static class BeatmapSetOnlineStatusExtensions { - public static bool GrantsPerformancePoints(this BeatmapSetOnlineStatus status) - => status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved; + public static bool GrantsPerformancePoints(this BeatmapOnlineStatus status) + => status == BeatmapOnlineStatus.Ranked || status == BeatmapOnlineStatus.Approved; } } diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs index 71bca48c2c..5bb9eefc6e 100644 --- a/osu.Game/Beatmaps/BeatmapSetInfo.cs +++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs @@ -34,7 +34,7 @@ namespace osu.Game.Beatmaps [NotNull] public List Beatmaps { get; } = new List(); - public BeatmapSetOnlineStatus Status { get; set; } = BeatmapSetOnlineStatus.None; + public BeatmapOnlineStatus Status { get; set; } = BeatmapOnlineStatus.None; [NotNull] public List Files { get; set; } = new List(); diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs index ec098f4ca2..6345085069 100644 --- a/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs +++ b/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs @@ -18,9 +18,9 @@ namespace osu.Game.Beatmaps.Drawables { public class BeatmapSetOnlineStatusPill : CircularContainer { - private BeatmapSetOnlineStatus status; + private BeatmapOnlineStatus status; - public BeatmapSetOnlineStatus Status + public BeatmapOnlineStatus Status { get => status; set @@ -75,7 +75,7 @@ namespace osu.Game.Beatmaps.Drawables }, }; - Status = BeatmapSetOnlineStatus.None; + Status = BeatmapOnlineStatus.None; TextPadding = new MarginPadding { Horizontal = 5, Bottom = 1 }; } @@ -87,14 +87,14 @@ namespace osu.Game.Beatmaps.Drawables private void updateState() { - Alpha = Status == BeatmapSetOnlineStatus.None ? 0 : 1; + Alpha = Status == BeatmapOnlineStatus.None ? 0 : 1; statusText.Text = Status.GetLocalisableDescription().ToUpper(); if (colourProvider != null) - statusText.Colour = status == BeatmapSetOnlineStatus.Graveyard ? colourProvider.Background1 : colourProvider.Background3; + statusText.Colour = status == BeatmapOnlineStatus.Graveyard ? colourProvider.Background1 : colourProvider.Background3; else - statusText.Colour = status == BeatmapSetOnlineStatus.Graveyard ? colours.GreySeafoamLight : Color4.Black; + statusText.Colour = status == BeatmapOnlineStatus.Graveyard ? colours.GreySeafoamLight : Color4.Black; background.Colour = OsuColour.ForBeatmapSetOnlineStatus(Status) ?? colourProvider?.Light1 ?? colours.GreySeafoamLighter; } diff --git a/osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardDateStatistic.cs b/osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardDateStatistic.cs index 8f2c4b538c..9dbe5a9114 100644 --- a/osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardDateStatistic.cs +++ b/osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardDateStatistic.cs @@ -41,10 +41,10 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Statistics // reference: https://github.com/ppy/osu-web/blob/ef432c11719fd1207bec5f9194b04f0033bdf02c/resources/assets/lib/beatmapset-panel.tsx#L36-L44 switch (beatmapSetInfo.Status) { - case BeatmapSetOnlineStatus.Ranked: - case BeatmapSetOnlineStatus.Approved: - case BeatmapSetOnlineStatus.Loved: - case BeatmapSetOnlineStatus.Qualified: + case BeatmapOnlineStatus.Ranked: + case BeatmapOnlineStatus.Approved: + case BeatmapOnlineStatus.Loved: + case BeatmapOnlineStatus.Qualified: return beatmapSetInfo.Ranked; default: diff --git a/osu.Game/Beatmaps/IBeatmapSetOnlineInfo.cs b/osu.Game/Beatmaps/IBeatmapSetOnlineInfo.cs index 2982cf9c3a..0510770d5b 100644 --- a/osu.Game/Beatmaps/IBeatmapSetOnlineInfo.cs +++ b/osu.Game/Beatmaps/IBeatmapSetOnlineInfo.cs @@ -30,7 +30,7 @@ namespace osu.Game.Beatmaps /// /// The status of this beatmap set. /// - BeatmapSetOnlineStatus Status { get; } + BeatmapOnlineStatus Status { get; } /// /// Whether or not this beatmap set has explicit content. @@ -105,7 +105,7 @@ namespace osu.Game.Beatmaps /// /// Contains the current hype status of the beatmap set. - /// Non-null only for , , and sets. + /// Non-null only for , , and sets. /// /// /// See: https://github.com/ppy/osu-web/blob/93930cd02cfbd49724929912597c727c9fbadcd1/app/Models/Beatmapset.php#L155 diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs index d3afb21933..69dfd3a7a1 100644 --- a/osu.Game/Graphics/OsuColour.cs +++ b/osu.Game/Graphics/OsuColour.cs @@ -122,34 +122,34 @@ namespace osu.Game.Graphics } /// - /// Retrieves a colour for the given . + /// Retrieves a colour for the given . /// A value indicates that a "background" shade from the local /// (or another fallback colour) should be used. /// /// /// Sourced from web: https://github.com/ppy/osu-web/blob/007eebb1916ed5cb6a7866d82d8011b1060a945e/resources/assets/less/layout.less#L36-L50 /// - public static Color4? ForBeatmapSetOnlineStatus(BeatmapSetOnlineStatus status) + public static Color4? ForBeatmapSetOnlineStatus(BeatmapOnlineStatus status) { switch (status) { - case BeatmapSetOnlineStatus.Ranked: - case BeatmapSetOnlineStatus.Approved: + case BeatmapOnlineStatus.Ranked: + case BeatmapOnlineStatus.Approved: return Color4Extensions.FromHex(@"b3ff66"); - case BeatmapSetOnlineStatus.Loved: + case BeatmapOnlineStatus.Loved: return Color4Extensions.FromHex(@"ff66ab"); - case BeatmapSetOnlineStatus.Qualified: + case BeatmapOnlineStatus.Qualified: return Color4Extensions.FromHex(@"66ccff"); - case BeatmapSetOnlineStatus.Pending: + case BeatmapOnlineStatus.Pending: return Color4Extensions.FromHex(@"ffd966"); - case BeatmapSetOnlineStatus.WIP: + case BeatmapOnlineStatus.WIP: return Color4Extensions.FromHex(@"ff9966"); - case BeatmapSetOnlineStatus.Graveyard: + case BeatmapOnlineStatus.Graveyard: return Color4.Black; default: diff --git a/osu.Game/Models/RealmBeatmap.cs b/osu.Game/Models/RealmBeatmap.cs index 4e3f96ee5f..005a7ac2a8 100644 --- a/osu.Game/Models/RealmBeatmap.cs +++ b/osu.Game/Models/RealmBeatmap.cs @@ -39,9 +39,9 @@ namespace osu.Game.Models [Ignored] public RealmNamedFileUsage? File => BeatmapSet?.Files.First(f => f.File.Hash == Hash); - public BeatmapSetOnlineStatus Status + public BeatmapOnlineStatus Status { - get => (BeatmapSetOnlineStatus)StatusInt; + get => (BeatmapOnlineStatus)StatusInt; set => StatusInt = (int)value; } diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs index 243c39ab53..ebbac0dcab 100644 --- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs +++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs @@ -20,7 +20,7 @@ namespace osu.Game.Online.API.Requests.Responses public int OnlineBeatmapSetID { get; set; } [JsonProperty(@"status")] - public BeatmapSetOnlineStatus Status { get; set; } + public BeatmapOnlineStatus Status { get; set; } [JsonProperty("checksum")] public string Checksum { get; set; } = string.Empty; diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs index 8d50f3d7dd..9005fa8eb7 100644 --- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs +++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs @@ -21,7 +21,7 @@ namespace osu.Game.Online.API.Requests.Responses public int OnlineID { get; set; } [JsonProperty(@"status")] - public BeatmapSetOnlineStatus Status { get; set; } + public BeatmapOnlineStatus Status { get; set; } [JsonProperty(@"preview_url")] public string Preview { get; set; } = string.Empty; diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs index 15e700fc91..2fcdc9402d 100644 --- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs +++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs @@ -244,7 +244,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores noScoresPlaceholder.Hide(); - if (Beatmap.Value == null || Beatmap.Value.OnlineID <= 0 || (Beatmap.Value?.BeatmapSet as IBeatmapSetOnlineInfo)?.Status <= BeatmapSetOnlineStatus.Pending) + if (Beatmap.Value == null || Beatmap.Value.OnlineID <= 0 || (Beatmap.Value?.BeatmapSet as IBeatmapSetOnlineInfo)?.Status <= BeatmapOnlineStatus.Pending) { Scores = null; Hide(); diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs index 425e6f983b..929bda6508 100644 --- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs +++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs @@ -27,7 +27,7 @@ namespace osu.Game.Screens.Ranking protected override APIRequest FetchScores(Action> scoresCallback) { - if (Score.BeatmapInfo.OnlineID == null || Score.BeatmapInfo.Status <= BeatmapSetOnlineStatus.Pending) + if (Score.BeatmapInfo.OnlineID == null || Score.BeatmapInfo.Status <= BeatmapOnlineStatus.Pending) return null; getScoreRequest = new GetScoresRequest(Score.BeatmapInfo, Score.Ruleset); diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs index f47bc5f466..1f6e99f0c6 100644 --- a/osu.Game/Screens/Select/FilterCriteria.cs +++ b/osu.Game/Screens/Select/FilterCriteria.cs @@ -28,7 +28,7 @@ namespace osu.Game.Screens.Select public OptionalRange Length; public OptionalRange BPM; public OptionalRange BeatDivisor; - public OptionalRange OnlineStatus; + public OptionalRange OnlineStatus; public OptionalTextFilter Creator; public OptionalTextFilter Artist; diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs index 03da930c5c..1fd6d8c921 100644 --- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs +++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs @@ -154,7 +154,7 @@ namespace osu.Game.Screens.Select.Leaderboards return null; } - if (BeatmapInfo.OnlineID == null || BeatmapInfo?.Status <= BeatmapSetOnlineStatus.Pending) + if (BeatmapInfo.OnlineID == null || BeatmapInfo?.Status <= BeatmapOnlineStatus.Pending) { PlaceholderState = PlaceholderState.Unavailable; return null; diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs index d774514dda..7bc63a8c26 100644 --- a/osu.Game/Tests/Visual/OsuTestScene.cs +++ b/osu.Game/Tests/Visual/OsuTestScene.cs @@ -226,7 +226,7 @@ namespace osu.Game.Tests.Visual return new APIBeatmapSet { OnlineID = ((IBeatmapSetInfo)beatmap.BeatmapSet).OnlineID, - Status = BeatmapSetOnlineStatus.Ranked, + Status = BeatmapOnlineStatus.Ranked, Covers = new BeatmapSetOnlineCovers { Cover = "https://assets.ppy.sh/beatmaps/163112/covers/cover.jpg",