sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-10 12:49:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Reduce code duplication

Browse Source
This commit is contained in:
smoogipoo
2018-12-26 20:32:01 +09:00
parent be9ba78d47
commit 9d305ba024
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
osu.Game/Screens/Multi/RoomManager.cs
View File

@ -47,7 +47,12 @@ namespace osu.Game.Screens.Multi
room.Host.Value = api.LocalUser; room.Host.Value = api.LocalUser;
var req = new CreateRoomRequest(room); var req = new CreateRoomRequest(room);
req.Success += result => addRoom(room, result); req.Success += result =>
{
update(room, result);
addRoom(room);
};
req.Failure += exception => req.Failure += exception =>
{ {
if (req.Result != null) if (req.Result != null)
@ -114,13 +119,8 @@ namespace osu.Game.Screens.Multi
// Add new matches, or update existing // Add new matches, or update existing
foreach (var r in result) foreach (var r in result)
{ {
processPlaylist(r); update(r, r);
addRoom(r);
var existing = rooms.FirstOrDefault(e => e.RoomID.Value == r.RoomID.Value);
if (existing == null)
rooms.Add(r);
else
existing.CopyFrom(r);
} }
tcs.SetResult(true); tcs.SetResult(true);
@ -133,22 +133,29 @@ namespace osu.Game.Screens.Multi
return tcs.Task; return tcs.Task;
} }
private void addRoom(Room local, Room remote) /// <summary>
/// Updates a local <see cref="Room"/> with a remote copy.
/// </summary>
/// <param name="local">The local <see cref="Room"/> to update.</param>
/// <param name="remote">The remote <see cref="Room"/> to update with.</param>
private void update(Room local, Room remote)
{ {
processPlaylist(remote); foreach (var pi in remote.Playlist)
local.CopyFrom(remote);
var existing = rooms.FirstOrDefault(e => e.RoomID.Value == local.RoomID.Value);
if (existing != null)
rooms.Remove(existing);
rooms.Add(local);
}
private void processPlaylist(Room room)
{
foreach (var pi in room.Playlist)
pi.MapObjects(beatmaps, rulesets); pi.MapObjects(beatmaps, rulesets);
local.CopyFrom(remote);
}
/// <summary>
/// Adds a <see cref="Room"/> to the list of available rooms.
/// </summary>
/// <param name="room">The <see cref="Room"/> to add.<</param>
private void addRoom(Room room)
{
var existing = rooms.FirstOrDefault(e => e.RoomID.Value == room.RoomID.Value);
if (existing == null)
rooms.Add(room);
else
existing.CopyFrom(room);
} }
} }
} }