sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into realm-fix-async-write-after-disposal

Browse Source
This commit is contained in:
Dean Herbert
2022-06-29 22:39:05 +09:00
parent 32af4e41ea 68d4676ad0
commit a3b4a515fc
149 changed files with 542 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using osu.Framework.Platform;
@ -46,6 +47,7 @@ namespace osu.Game.Database
Realm.Realm.Write(realm =>
{
var managed = realm.Find<TModel>(item.ID);
Debug.Assert(managed != null);
operation(managed);
item.Files.Clear();

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

@ -128,7 +128,7 @@ namespace osu.Game.Database
Logger.Log(@$"Opened realm ""{updateRealm.Config.DatabasePath}"" at version {updateRealm.Config.SchemaVersion}");
// Resubscribe any subscriptions
foreach (var action in customSubscriptionsResetMap.Keys)
foreach (var action in customSubscriptionsResetMap.Keys.ToArray())
registerSubscription(action);
}

3
osu.Game/Database/RealmArchiveModelImporter.cs
View File

@ -296,7 +296,8 @@ namespace osu.Game.Database
try
{
LogForModel(item, @"Beginning import...");
// Log output here will be missing a valid hash in non-batch imports.
LogForModel(item, $@"Beginning import from {archive?.Name ?? "unknown"}...");
// TODO: do we want to make the transaction this local? not 100% sure, will need further investigation.
using (var transaction = realm.BeginWrite())