sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18751 from frenzibyte/tournament-beatmap

Browse Source 
Improve tournament beatmap JSON storage using lightweight model
This commit is contained in:
Dean Herbert
2022-06-18 11:00:26 +09:00
committed by GitHub
parent fbca7c761d 9f97d1a7db
commit f3c9f9a216
16 changed files with 128 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tournament/Models/RoundBeatmap.cs
View File

@ -4,7 +4,6 @@
#nullable disable
using Newtonsoft.Json;
using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Tournament.Models
{
@ -14,6 +13,6 @@ namespace osu.Game.Tournament.Models
public string Mods;
[JsonProperty("BeatmapInfo")]
public APIBeatmap Beatmap;
public TournamentBeatmap Beatmap;
}
}

3
osu.Game.Tournament/Models/SeedingBeatmap.cs
View File

@ -5,7 +5,6 @@
using Newtonsoft.Json;
using osu.Framework.Bindables;
using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Tournament.Models
{
@ -14,7 +13,7 @@ namespace osu.Game.Tournament.Models
public int ID;
[JsonProperty("BeatmapInfo")]
public APIBeatmap Beatmap;
public TournamentBeatmap Beatmap;
public long Score;

99
osu.Game.Tournament/Models/TournamentBeatmap.cs Normal file
View File

@ -0,0 +1,99 @@
// 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 System;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Game.Beatmaps;
using osu.Game.Extensions;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets;
namespace osu.Game.Tournament.Models
{
public class TournamentBeatmap : IBeatmapInfo, IBeatmapSetOnlineInfo
{
public int OnlineID { get; set; }
public string DifficultyName { get; set; } = string.Empty;
public double BPM { get; set; }
public double Length { get; set; }
public double StarRating { get; set; }
public IBeatmapMetadataInfo Metadata { get; set; } = new BeatmapMetadata();
public IBeatmapDifficultyInfo Difficulty { get; set; } = new BeatmapDifficulty();
public BeatmapSetOnlineCovers Covers { get; set; }
public TournamentBeatmap()
{
}
public TournamentBeatmap(APIBeatmap beatmap)
{
OnlineID = beatmap.OnlineID;
DifficultyName = beatmap.DifficultyName;
BPM = beatmap.BPM;
Length = beatmap.Length;
StarRating = beatmap.StarRating;
Metadata = beatmap.Metadata;
Difficulty = beatmap.Difficulty;
Covers = beatmap.BeatmapSet.AsNonNull().Covers;
}
public bool Equals(IBeatmapInfo? other) => other is TournamentBeatmap b && this.MatchesOnlineID(b);
#region IBeatmapInfo/IBeatmapSetOnlineInfo explicit implementation
IBeatmapSetInfo IBeatmapInfo.BeatmapSet => throw new NotImplementedException();
string IBeatmapSetOnlineInfo.Preview => throw new NotImplementedException();
double IBeatmapSetOnlineInfo.BPM => throw new NotImplementedException();
int IBeatmapSetOnlineInfo.PlayCount => throw new NotImplementedException();
int IBeatmapSetOnlineInfo.FavouriteCount => throw new NotImplementedException();
bool IBeatmapSetOnlineInfo.HasFavourited => throw new NotImplementedException();
BeatmapSetOnlineAvailability IBeatmapSetOnlineInfo.Availability => throw new NotImplementedException();
BeatmapSetOnlineGenre IBeatmapSetOnlineInfo.Genre => throw new NotImplementedException();
BeatmapSetOnlineLanguage IBeatmapSetOnlineInfo.Language => throw new NotImplementedException();
int? IBeatmapSetOnlineInfo.TrackId => throw new NotImplementedException();
int[] IBeatmapSetOnlineInfo.Ratings => throw new NotImplementedException();
BeatmapSetHypeStatus IBeatmapSetOnlineInfo.HypeStatus => throw new NotImplementedException();
BeatmapSetNominationStatus IBeatmapSetOnlineInfo.NominationStatus => throw new NotImplementedException();
string IBeatmapInfo.Hash => throw new NotImplementedException();
string IBeatmapInfo.MD5Hash => throw new NotImplementedException();
IRulesetInfo IBeatmapInfo.Ruleset => throw new NotImplementedException();
DateTimeOffset IBeatmapSetOnlineInfo.Submitted => throw new NotImplementedException();
DateTimeOffset? IBeatmapSetOnlineInfo.Ranked => throw new NotImplementedException();
DateTimeOffset? IBeatmapSetOnlineInfo.LastUpdated => throw new NotImplementedException();
BeatmapOnlineStatus IBeatmapSetOnlineInfo.Status => throw new NotImplementedException();
bool IBeatmapSetOnlineInfo.HasExplicitContent => throw new NotImplementedException();
bool IBeatmapSetOnlineInfo.HasVideo => throw new NotImplementedException();
bool IBeatmapSetOnlineInfo.HasStoryboard => throw new NotImplementedException();
#endregion
}
}