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

Move API lookup from BeatmapDetailArea to Leaderboard.

Browse Source
This commit is contained in:
Dean Herbert 2017-04-11 13:48:43 +09:00
parent ecfe68d6fb
commit dc3a2d45fe
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Screens/Select/BeatmapDetailArea.cs
View File

@ -1,13 +1,10 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Screens.Select.Leaderboards; using osu.Game.Screens.Select.Leaderboards;
namespace osu.Game.Screens.Select namespace osu.Game.Screens.Select
@ -20,8 +17,6 @@ namespace osu.Game.Screens.Select
public readonly Container Details; //todo: replace with a real details view when added public readonly Container Details; //todo: replace with a real details view when added
public readonly Leaderboard Leaderboard; public readonly Leaderboard Leaderboard;
private APIAccess api;
private WorkingBeatmap beatmap; private WorkingBeatmap beatmap;
public WorkingBeatmap Beatmap public WorkingBeatmap Beatmap
{ {
@ -32,7 +27,7 @@ namespace osu.Game.Screens.Select
set set
{ {
beatmap = value; beatmap = value;
if (IsLoaded) Schedule(updateScores); Leaderboard.Beatmap = beatmap?.BeatmapInfo;
} }
} }
@ -56,9 +51,6 @@ namespace osu.Game.Screens.Select
Leaderboard.Show(); Leaderboard.Show();
break; break;
} }
//for now let's always update scores.
updateScores();
}, },
}, },
content = new Container content = new Container
@ -77,35 +69,9 @@ namespace osu.Game.Screens.Select
Leaderboard = new Leaderboard Leaderboard = new Leaderboard
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
} }
}); });
} }
protected override void LoadComplete()
{
base.LoadComplete();
updateScores();
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(APIAccess api)
{
this.api = api;
}
private GetScoresRequest getScoresRequest;
private void updateScores()
{
if (!IsLoaded) return;
Leaderboard.Scores = null;
getScoresRequest?.Cancel();
if (api == null || beatmap?.BeatmapInfo == null || !Leaderboard.IsPresent) return;
getScoresRequest = new GetScoresRequest(beatmap.BeatmapInfo);
getScoresRequest.Success += r => Leaderboard.Scores = r.Scores;
api.Queue(getScoresRequest);
}
} }
} }

40
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -10,7 +10,11 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using System; using System;
using osu.Framework.Allocation;
using osu.Game.Database;
using osu.Game.Modes.Scoring; using osu.Game.Modes.Scoring;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
namespace osu.Game.Screens.Select.Leaderboards namespace osu.Game.Screens.Select.Leaderboards
{ {
@ -26,6 +30,7 @@ namespace osu.Game.Screens.Select.Leaderboards
set set
{ {
scores = value; scores = value;
getScoresRequest?.Cancel();
int i = 150; int i = 150;
if (scores == null) if (scores == null)
@ -81,6 +86,41 @@ namespace osu.Game.Screens.Select.Leaderboards
}; };
} }
private APIAccess api;
private BeatmapInfo beatmap;
public BeatmapInfo Beatmap
{
get { return beatmap; }
set
{
beatmap = value;
Schedule(updateScores);
}
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(APIAccess api)
{
this.api = api;
}
private GetScoresRequest getScoresRequest;
private void updateScores()
{
if (!IsLoaded) return;
Scores = null;
getScoresRequest?.Cancel();
if (api == null || Beatmap == null) return;
getScoresRequest = new GetScoresRequest(Beatmap);
getScoresRequest.Success += r => Scores = r.Scores;
api.Queue(getScoresRequest);
}
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();