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

Add playlist item change event

Browse Source
This commit is contained in:
smoogipoo 2021-10-22 20:53:45 +09:00
parent 4e6a02bde9
commit ec02e16c81
2 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Online/Multiplayer/IMultiplayerClient.cs
View File

@ -118,5 +118,11 @@ namespace osu.Game.Online.Multiplayer
/// </summary> /// </summary>
/// <param name="item">The removed item.</param> /// <param name="item">The removed item.</param>
Task PlaylistItemRemoved(APIPlaylistItem item); Task PlaylistItemRemoved(APIPlaylistItem item);
/// <summary>
/// Signals that an item has been changed in the playlist.
/// </summary>
/// <param name="item">The changed item.</param>
Task PlaylistItemChanged(APIPlaylistItem item);
} }
} }

62
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -577,12 +577,7 @@ namespace osu.Game.Online.Multiplayer
if (Room == null) if (Room == null)
return; return;
var set = await GetOnlineBeatmapSet(item.BeatmapID).ConfigureAwait(false); var playlistItem = await createPlaylistItem(item).ConfigureAwait(false);
var beatmap = set.Beatmaps.Single(b => b.OnlineBeatmapID == item.BeatmapID);
beatmap.MD5Hash = item.BeatmapChecksum;
var ruleset = Rulesets.GetRuleset(item.RulesetID);
await scheduleAsync(() => await scheduleAsync(() =>
{ {
@ -591,18 +586,6 @@ namespace osu.Game.Online.Multiplayer
Debug.Assert(APIRoom != null); Debug.Assert(APIRoom != null);
var playlistItem = new PlaylistItem
{
ID = item.ID,
Beatmap = { Value = beatmap },
Ruleset = { Value = ruleset },
};
var rulesetInstance = ruleset.CreateInstance();
playlistItem.RequiredMods.AddRange(item.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
playlistItem.AllowedMods.AddRange(item.AllowedMods.Select(m => m.ToMod(rulesetInstance)));
APIRoom.Playlist.Add(playlistItem); APIRoom.Playlist.Add(playlistItem);
RoomUpdated?.Invoke(); RoomUpdated?.Invoke();
}).ConfigureAwait(false); }).ConfigureAwait(false);
@ -625,6 +608,26 @@ namespace osu.Game.Online.Multiplayer
}); });
} }
public async Task PlaylistItemChanged(APIPlaylistItem item)
{
if (Room == null)
return;
var playlistItem = await createPlaylistItem(item).ConfigureAwait(false);
await scheduleAsync(() =>
{
if (Room == null)
return;
Debug.Assert(APIRoom != null);
int index = APIRoom.Playlist.Where(p => p.ID == item.ID).Select((_, i) => i).Single();
APIRoom.Playlist.RemoveAt(index);
APIRoom.Playlist.Insert(index, playlistItem);
}).ConfigureAwait(false);
}
/// <summary> /// <summary>
/// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>. /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
/// </summary> /// </summary>
@ -663,6 +666,29 @@ namespace osu.Game.Online.Multiplayer
/// <returns>The <see cref="BeatmapSetInfo"/> retrieval task.</returns> /// <returns>The <see cref="BeatmapSetInfo"/> retrieval task.</returns>
protected abstract Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default); protected abstract Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default);
private async Task<PlaylistItem> createPlaylistItem(APIPlaylistItem item)
{
var set = await GetOnlineBeatmapSet(item.BeatmapID).ConfigureAwait(false);
var beatmap = set.Beatmaps.Single(b => b.OnlineBeatmapID == item.BeatmapID);
beatmap.MD5Hash = item.BeatmapChecksum;
var ruleset = Rulesets.GetRuleset(item.RulesetID);
var rulesetInstance = ruleset.CreateInstance();
var playlistItem = new PlaylistItem
{
ID = item.ID,
Beatmap = { Value = beatmap },
Ruleset = { Value = ruleset },
};
playlistItem.RequiredMods.AddRange(item.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
playlistItem.AllowedMods.AddRange(item.AllowedMods.Select(m => m.ToMod(rulesetInstance)));
return playlistItem;
}
/// <summary> /// <summary>
/// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>. /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
/// </summary> /// </summary>