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

Use new API endpoint to do batch lookups

Browse Source
This commit is contained in:
Dean Herbert
2021-12-01 17:45:41 +09:00
parent 0fae10500a
commit 81f82c24c3
3 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Database/BeatmapLookupCache.cs
View File

@ -85,7 +85,7 @@ namespace osu.Game.Database
// Grab at most 50 unique beatmap IDs from the queue.
lock (taskAssignmentLock)
{
while (pendingBeatmapTasks.Count > 0 && beatmapTasks.Count < 1)
while (pendingBeatmapTasks.Count > 0 && beatmapTasks.Count < 50)
{
(int id, TaskCompletionSource<APIBeatmap> task) next = pendingBeatmapTasks.Dequeue();
@ -103,7 +103,7 @@ namespace osu.Game.Database
}
// Query the beatmaps.
var request = new GetBeatmapRequest(new APIBeatmap { OnlineID = beatmapTasks.Keys.First() });
var request = new GetBeatmapsRequest(beatmapTasks.Keys.ToArray());
// rather than queueing, we maintain our own single-threaded request stream.
// todo: we probably want retry logic here.
@ -117,16 +117,19 @@ namespace osu.Game.Database
createNewTask();
}
List<APIBeatmap> foundBeatmaps = new List<APIBeatmap> { request.Response };
List<APIBeatmap> foundBeatmaps = request.Response?.Beatmaps;
foreach (var beatmap in foundBeatmaps)
if (foundBeatmaps != null)
{
if (beatmapTasks.TryGetValue(beatmap.OnlineID, out var tasks))
foreach (var beatmap in foundBeatmaps)
{
foreach (var task in tasks)
task.SetResult(beatmap);
if (beatmapTasks.TryGetValue(beatmap.OnlineID, out var tasks))
{
foreach (var task in tasks)
task.SetResult(beatmap);
beatmapTasks.Remove(beatmap.OnlineID);
beatmapTasks.Remove(beatmap.OnlineID);
}
}
}