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

Fix some realm pieces not being cleaned up

Browse Source
This commit is contained in:
Dean Herbert 2022-07-25 19:51:10 +09:00
parent 92dd1bcddb
commit 8a0c8f5fd8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Beatmaps/BeatmapImporter.cs
View File

@ -49,9 +49,11 @@ namespace osu.Game.Beatmaps
imported.First().PerformWrite(updated => imported.First().PerformWrite(updated =>
{ {
Logger.Log($"Beatmap \"{updated}\"update completed successfully", LoggingTarget.Database); var realm = updated.Realm;
original = updated.Realm.Find<BeatmapSetInfo>(original.ID); Logger.Log($"Beatmap \"{updated}\" update completed successfully", LoggingTarget.Database);
original = realm.Find<BeatmapSetInfo>(original.ID);
// Generally the import process will do this for us if the OnlineIDs match, // Generally the import process will do this for us if the OnlineIDs match,
// but that isn't a guarantee (ie. if the .osu file doesn't have OnlineIDs populated). // but that isn't a guarantee (ie. if the .osu file doesn't have OnlineIDs populated).
@ -80,6 +82,9 @@ namespace osu.Game.Beatmaps
// interactions, like restoring the outdated beatmap then updating a second time // interactions, like restoring the outdated beatmap then updating a second time
// (causing user data to be wiped). // (causing user data to be wiped).
original.Beatmaps.Remove(beatmap); original.Beatmaps.Remove(beatmap);
realm.Remove(beatmap.Metadata);
realm.Remove(beatmap);
} }
else else
{ {
@ -89,6 +94,10 @@ namespace osu.Game.Beatmaps
beatmap.ResetOnlineInfo(); beatmap.ResetOnlineInfo();
} }
} }
// If the original has no beatmaps left, delete the set as well.
if (!original.Beatmaps.Any())
realm.Remove(original);
}); });
return imported; return imported;

1
osu.Game/Database/RealmAccess.cs
View File

@ -278,7 +278,6 @@ namespace osu.Game.Database
realm.Remove(score); realm.Remove(score);
realm.Remove(beatmap.Metadata); realm.Remove(beatmap.Metadata);
realm.Remove(beatmap); realm.Remove(beatmap);
} }