h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
Code Issues Releases Wiki Activity

Order imports depending on beatmap imports if any is running.

Browse Source
This commit is contained in:
Lucas A 2021-05-09 18:15:21 +02:00
parent 851e33fd15
commit 325a689d65
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Database/StableImportManager.cs
View File

@ -48,18 +48,29 @@ namespace osu.Game.Database
var stableStorage = await getStableStorage().ConfigureAwait(false); var stableStorage = await getStableStorage().ConfigureAwait(false);
var importTasks = new List<Task>(); var importTasks = new List<Task>();
Task beatmapImportTask = default;
if (content.HasFlagFast(StableContent.Beatmaps)) if (content.HasFlagFast(StableContent.Beatmaps))
importTasks.Add(beatmaps.ImportFromStableAsync(stableStorage)); importTasks.Add(beatmapImportTask = beatmaps.ImportFromStableAsync(stableStorage));
if (content.HasFlagFast(StableContent.Collections))
importTasks.Add(collections.ImportFromStableAsync(stableStorage));
if (content.HasFlagFast(StableContent.Scores))
importTasks.Add(scores.ImportFromStableAsync(stableStorage));
if (content.HasFlagFast(StableContent.Skins)) if (content.HasFlagFast(StableContent.Skins))
importTasks.Add(skins.ImportFromStableAsync(stableStorage)); importTasks.Add(skins.ImportFromStableAsync(stableStorage));
if (content.HasFlagFast(StableContent.Collections))
{
if (beatmapImportTask != null)
importTasks.Add(beatmapImportTask.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
else
importTasks.Add(collections.ImportFromStableAsync(stableStorage));
}
if (content.HasFlagFast(StableContent.Scores))
{
if (beatmapImportTask != null)
importTasks.Add(beatmapImportTask.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
else
importTasks.Add(scores.ImportFromStableAsync(stableStorage));
}
await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false); await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
} }