RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-29 18:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move skin requery logic into extension methods

Browse Source
This commit is contained in:
Dean Herbert 2021-03-15 12:47:58 +09:00
parent 900da7b891
commit 2bdffd1004
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,36 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Scoring;
using osu.Game.Skinning;
namespace osu.Game.Database
{
/// <summary>
/// Extension methods which contain workarounds to make EFcore 5.x work with our existing (incorrect) thread safety.
/// The intention is to avoid blocking package updates while we consider the future of the database backend, with a potential backend switch imminent.
/// </summary>
public static class DatabaseWorkaroundExtensions
{
/// <summary>
/// Re-query the provided model to ensure it is in a sane state. This method requires explicit implementation per model type.
/// </summary>
/// <param name="model"></param>
/// <param name="contextFactory"></param>
public static void Requery(this IHasPrimaryKey model, IDatabaseContextFactory contextFactory)
{
switch (model)
{
case SkinInfo skinInfo:
requeryFiles(skinInfo.Files, contextFactory);
break;
case ScoreInfo scoreInfo:
scoreInfo.Beatmap.BeatmapSet.Requery(contextFactory);
scoreInfo.Files.RequeryFiles(contextFactory);
requeryFiles(scoreInfo.Files, contextFactory);
break;
case BeatmapSetInfo beatmapSetInfo:
@ -33,7 +48,7 @@ namespace osu.Game.Database
}
}
public static void RequeryFiles<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
private static void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
{
var dbContext = databaseContextFactory.Get();

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

@ -144,7 +144,7 @@ namespace osu.Game.Skinning
protected override void PreImport(SkinInfo model)
{
model.Files.Requery(ContextFactory);
model.Requery(ContextFactory);
}
/// <summary>