RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-24 15:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move logging and early return into UndeleteForReuse method itself

Browse Source
This commit is contained in:
Dean Herbert 2022-04-13 14:33:28 +09:00
parent 6dbfc26158
commit 56427becbb
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Stores/RealmArchiveModelImporter.cs
View File

@ -351,7 +351,6 @@ namespace osu.Game.Stores
using (var transaction = realm.BeginWrite())
{
if (existing.DeletePending)
UndeleteForReuse(existing);
transaction.Commit();
}
@ -388,12 +387,7 @@ namespace osu.Game.Stores
{
LogForModel(item, @$"Found existing {HumanisedModelName} for {item} (ID {existing.ID}) – skipping import.");
if (existing.DeletePending)
{
LogForModel(item, $@"Existing {HumanisedModelName}'s deletion flag has been removed");
UndeleteForReuse(existing);
}
transaction.Commit();
return existing.ToLive(Realm);
@ -539,6 +533,10 @@ namespace osu.Game.Stores
/// <param name="existing">The existing model.</param>
protected virtual void UndeleteForReuse(TModel existing)
{
if (!existing.DeletePending)
return;
LogForModel(existing, $@"Existing {HumanisedModelName}'s deletion flag has been removed to allow for reuse.");
existing.DeletePending = false;
}