h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 19:55:45 +08:00
Code Issues 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

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

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