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

Make Populate abstract to avoid unnecessary base call async complexity

Browse Source
This commit is contained in:
Dean Herbert
2021-06-27 13:06:20 +09:00
parent f6919b70c9
commit d1f852d102
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Database/ArchiveModelManager.cs
View File

@ -727,7 +727,7 @@ namespace osu.Game.Database
/// <param name="model">The model to populate.</param> /// <param name="model">The model to populate.</param>
/// <param name="archive">The archive to use as a reference for population. May be null.</param> /// <param name="archive">The archive to use as a reference for population. May be null.</param>
/// <param name="cancellationToken">An optional cancellation token.</param> /// <param name="cancellationToken">An optional cancellation token.</param>
protected virtual Task Populate(TModel model, [CanBeNull] ArchiveReader archive, CancellationToken cancellationToken = default) => Task.CompletedTask; protected abstract Task Populate(TModel model, [CanBeNull] ArchiveReader archive, CancellationToken cancellationToken = default);
/// <summary> /// <summary>
/// Perform any final actions before the import to database executes. /// Perform any final actions before the import to database executes.

4
osu.Game/Scoring/ScoreManager.cs
View File

@ -7,6 +7,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -72,6 +73,9 @@ namespace osu.Game.Scoring
} }
} }
protected override Task Populate(ScoreInfo model, ArchiveReader archive, CancellationToken cancellationToken = default)
=> Task.CompletedTask;
protected override void ExportModelTo(ScoreInfo model, Stream outputStream) protected override void ExportModelTo(ScoreInfo model, Stream outputStream)
{ {
var file = model.Files.SingleOrDefault(); var file = model.Files.SingleOrDefault();

6
osu.Game/Skinning/SkinManager.cs
View File

@ -142,16 +142,16 @@ namespace osu.Game.Skinning
return base.ComputeHash(item, reader); return base.ComputeHash(item, reader);
} }
protected override async Task Populate(SkinInfo model, ArchiveReader archive, CancellationToken cancellationToken = default) protected override Task Populate(SkinInfo model, ArchiveReader archive, CancellationToken cancellationToken = default)
{ {
await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
var instance = GetSkin(model); var instance = GetSkin(model);
model.InstantiationInfo ??= instance.GetType().GetInvariantInstantiationInfo(); model.InstantiationInfo ??= instance.GetType().GetInvariantInstantiationInfo();
if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true) if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
populateMetadata(model, instance); populateMetadata(model, instance);
return Task.CompletedTask;
} }
private void populateMetadata(SkinInfo item, Skin instance) private void populateMetadata(SkinInfo item, Skin instance)