h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Rename RealmContextFactory to RealmAccess

Browse Source
This commit is contained in:
Dean Herbert 2022-01-24 19:59:58 +09:00
parent bb54ad9ad8
commit 6eb2c28e41
76 changed files with 516 additions and 516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Benchmarks/BenchmarkRealmReads.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Benchmarks
public class BenchmarkRealmReads : BenchmarkTest public class BenchmarkRealmReads : BenchmarkTest
{ {
private TemporaryNativeStorage storage; private TemporaryNativeStorage storage;
private RealmContextFactory realmFactory; private RealmAccess realm;
private UpdateThread updateThread; private UpdateThread updateThread;
[Params(1, 100, 1000)] [Params(1, 100, 1000)]
@ -27,9 +27,9 @@ namespace osu.Game.Benchmarks
storage = new TemporaryNativeStorage("realm-benchmark"); storage = new TemporaryNativeStorage("realm-benchmark");
storage.DeleteDirectory(string.Empty); storage.DeleteDirectory(string.Empty);
realmFactory = new RealmContextFactory(storage, "client"); realm = new RealmAccess(storage, "client");
realmFactory.Run(realm => realm.Run(realm =>
{ {
realm.Write(c => c.Add(TestResources.CreateTestBeatmapSetInfo(rulesets: new[] { new OsuRuleset().RulesetInfo }))); realm.Write(c => c.Add(TestResources.CreateTestBeatmapSetInfo(rulesets: new[] { new OsuRuleset().RulesetInfo })));
}); });
@ -41,7 +41,7 @@ namespace osu.Game.Benchmarks
[Benchmark] [Benchmark]
public void BenchmarkDirectPropertyRead() public void BenchmarkDirectPropertyRead()
{ {
realmFactory.Run(realm => realm.Run(realm =>
{ {
var beatmapSet = realm.All<BeatmapSetInfo>().First(); var beatmapSet = realm.All<BeatmapSetInfo>().First();
@ -61,7 +61,7 @@ namespace osu.Game.Benchmarks
{ {
try try
{ {
var beatmapSet = realmFactory.Context.All<BeatmapSetInfo>().First(); var beatmapSet = realm.Realm.All<BeatmapSetInfo>().First();
for (int i = 0; i < ReadsPerFetch; i++) for (int i = 0; i < ReadsPerFetch; i++)
{ {
@ -80,9 +80,9 @@ namespace osu.Game.Benchmarks
[Benchmark] [Benchmark]
public void BenchmarkRealmLivePropertyRead() public void BenchmarkRealmLivePropertyRead()
{ {
realmFactory.Run(realm => realm.Run(r =>
{ {
var beatmapSet = realm.All<BeatmapSetInfo>().First().ToLive(realmFactory); var beatmapSet = r.All<BeatmapSetInfo>().First().ToLive(realm);
for (int i = 0; i < ReadsPerFetch; i++) for (int i = 0; i < ReadsPerFetch; i++)
{ {
@ -100,7 +100,7 @@ namespace osu.Game.Benchmarks
{ {
try try
{ {
var beatmapSet = realmFactory.Context.All<BeatmapSetInfo>().First().ToLive(realmFactory); var beatmapSet = realm.Realm.All<BeatmapSetInfo>().First().ToLive(realm);
for (int i = 0; i < ReadsPerFetch; i++) for (int i = 0; i < ReadsPerFetch; i++)
{ {
@ -119,7 +119,7 @@ namespace osu.Game.Benchmarks
[Benchmark] [Benchmark]
public void BenchmarkDetachedPropertyRead() public void BenchmarkDetachedPropertyRead()
{ {
realmFactory.Run(realm => realm.Run(realm =>
{ {
var beatmapSet = realm.All<BeatmapSetInfo>().First().Detach(); var beatmapSet = realm.All<BeatmapSetInfo>().First().Detach();
@ -133,7 +133,7 @@ namespace osu.Game.Benchmarks
[GlobalCleanup] [GlobalCleanup]
public void Cleanup() public void Cleanup()
{ {
realmFactory?.Dispose(); realm?.Dispose();
storage?.Dispose(); storage?.Dispose();
updateThread?.Exit(); updateThread?.Exit();
} }

4
osu.Game.Tests/Beatmaps/IO/BeatmapImportHelper.cs
View File

@ -53,9 +53,9 @@ namespace osu.Game.Tests.Beatmaps.IO
private static void ensureLoaded(OsuGameBase osu, int timeout = 60000) private static void ensureLoaded(OsuGameBase osu, int timeout = 60000)
{ {
var realmContextFactory = osu.Dependencies.Get<RealmContextFactory>(); var realm = osu.Dependencies.Get<RealmAccess>();
realmContextFactory.Run(realm => BeatmapImporterTests.EnsureLoaded(realm, timeout)); realm.Run(r => BeatmapImporterTests.EnsureLoaded(r, timeout));
// TODO: add back some extra checks outside of the realm ones? // TODO: add back some extra checks outside of the realm ones?
// var set = queryBeatmapSets().First(); // var set = queryBeatmapSets().First();

258
osu.Game.Tests/Database/BeatmapImporterTests.cs
View File

@ -38,10 +38,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestDetachBeatmapSet() public void TestDetachBeatmapSet()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using (var importer = new BeatmapModelManager(realmFactory, storage)) using (var importer = new BeatmapModelManager(realm, storage))
using (new RulesetStore(realmFactory, storage)) using (new RulesetStore(realm, storage))
{ {
ILive<BeatmapSetInfo>? beatmapSet; ILive<BeatmapSetInfo>? beatmapSet;
@ -82,10 +82,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestUpdateDetachedBeatmapSet() public void TestUpdateDetachedBeatmapSet()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using (var importer = new BeatmapModelManager(realmFactory, storage)) using (var importer = new BeatmapModelManager(realm, storage))
using (new RulesetStore(realmFactory, storage)) using (new RulesetStore(realm, storage))
{ {
ILive<BeatmapSetInfo>? beatmapSet; ILive<BeatmapSetInfo>? beatmapSet;
@ -139,53 +139,53 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportBeatmapThenCleanup() public void TestImportBeatmapThenCleanup()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using (var importer = new BeatmapModelManager(realmFactory, storage)) using (var importer = new BeatmapModelManager(realm, storage))
using (new RulesetStore(realmFactory, storage)) using (new RulesetStore(realm, storage))
{ {
ILive<BeatmapSetInfo>? imported; ILive<BeatmapSetInfo>? imported;
using (var reader = new ZipArchiveReader(TestResources.GetTestBeatmapStream())) using (var reader = new ZipArchiveReader(TestResources.GetTestBeatmapStream()))
imported = await importer.Import(reader); imported = await importer.Import(reader);
Assert.AreEqual(1, realmFactory.Context.All<BeatmapSetInfo>().Count()); Assert.AreEqual(1, realm.Realm.All<BeatmapSetInfo>().Count());
Assert.NotNull(imported); Assert.NotNull(imported);
Debug.Assert(imported != null); Debug.Assert(imported != null);
imported.PerformWrite(s => s.DeletePending = true); imported.PerformWrite(s => s.DeletePending = true);
Assert.AreEqual(1, realmFactory.Context.All<BeatmapSetInfo>().Count(s => s.DeletePending)); Assert.AreEqual(1, realm.Realm.All<BeatmapSetInfo>().Count(s => s.DeletePending));
} }
}); });
Logger.Log("Running with no work to purge pending deletions"); Logger.Log("Running with no work to purge pending deletions");
RunTestWithRealm((realmFactory, _) => { Assert.AreEqual(0, realmFactory.Context.All<BeatmapSetInfo>().Count()); }); RunTestWithRealm((realm, _) => { Assert.AreEqual(0, realm.Realm.All<BeatmapSetInfo>().Count()); });
} }
[Test] [Test]
public void TestImportWhenClosed() public void TestImportWhenClosed()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
await LoadOszIntoStore(importer, realmFactory.Context); await LoadOszIntoStore(importer, realm.Realm);
}); });
} }
[Test] [Test]
public void TestAccessFileAfterImport() public void TestAccessFileAfterImport()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
var beatmap = imported.Beatmaps.First(); var beatmap = imported.Beatmaps.First();
var file = beatmap.File; var file = beatmap.File;
@ -198,24 +198,24 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportThenDelete() public void TestImportThenDelete()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
deleteBeatmapSet(imported, realmFactory.Context); deleteBeatmapSet(imported, realm.Realm);
}); });
} }
[Test] [Test]
public void TestImportThenDeleteFromStream() public void TestImportThenDeleteFromStream()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? tempPath = TestResources.GetTestBeatmapForImport(); string? tempPath = TestResources.GetTestBeatmapForImport();
@ -224,7 +224,7 @@ namespace osu.Game.Tests.Database
using (var stream = File.OpenRead(tempPath)) using (var stream = File.OpenRead(tempPath))
{ {
importedSet = await importer.Import(new ImportTask(stream, Path.GetFileName(tempPath))); importedSet = await importer.Import(new ImportTask(stream, Path.GetFileName(tempPath)));
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
} }
Assert.NotNull(importedSet); Assert.NotNull(importedSet);
@ -233,39 +233,39 @@ namespace osu.Game.Tests.Database
Assert.IsTrue(File.Exists(tempPath), "Stream source file somehow went missing"); Assert.IsTrue(File.Exists(tempPath), "Stream source file somehow went missing");
File.Delete(tempPath); File.Delete(tempPath);
var imported = realmFactory.Context.All<BeatmapSetInfo>().First(beatmapSet => beatmapSet.ID == importedSet.ID); var imported = realm.Realm.All<BeatmapSetInfo>().First(beatmapSet => beatmapSet.ID == importedSet.ID);
deleteBeatmapSet(imported, realmFactory.Context); deleteBeatmapSet(imported, realm.Realm);
}); });
} }
[Test] [Test]
public void TestImportThenImport() public void TestImportThenImport()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
var importedSecondTime = await LoadOszIntoStore(importer, realmFactory.Context); var importedSecondTime = await LoadOszIntoStore(importer, realm.Realm);
// check the newly "imported" beatmap is actually just the restored previous import. since it matches hash. // check the newly "imported" beatmap is actually just the restored previous import. since it matches hash.
Assert.IsTrue(imported.ID == importedSecondTime.ID); Assert.IsTrue(imported.ID == importedSecondTime.ID);
Assert.IsTrue(imported.Beatmaps.First().ID == importedSecondTime.Beatmaps.First().ID); Assert.IsTrue(imported.Beatmaps.First().ID == importedSecondTime.Beatmaps.First().ID);
checkBeatmapSetCount(realmFactory.Context, 1); checkBeatmapSetCount(realm.Realm, 1);
checkSingleReferencedFileCount(realmFactory.Context, 18); checkSingleReferencedFileCount(realm.Realm, 18);
}); });
} }
[Test] [Test]
public void TestImportThenImportWithReZip() public void TestImportThenImportWithReZip()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
@ -274,7 +274,7 @@ namespace osu.Game.Tests.Database
try try
{ {
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
string hashBefore = hashFile(temp); string hashBefore = hashFile(temp);
@ -292,7 +292,7 @@ namespace osu.Game.Tests.Database
var importedSecondTime = await importer.Import(new ImportTask(temp)); var importedSecondTime = await importer.Import(new ImportTask(temp));
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
Assert.NotNull(importedSecondTime); Assert.NotNull(importedSecondTime);
Debug.Assert(importedSecondTime != null); Debug.Assert(importedSecondTime != null);
@ -311,10 +311,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportThenImportWithChangedHashedFile() public void TestImportThenImportWithChangedHashedFile()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
@ -323,9 +323,9 @@ namespace osu.Game.Tests.Database
try try
{ {
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
await createScoreForBeatmap(realmFactory.Context, imported.Beatmaps.First()); await createScoreForBeatmap(realm.Realm, imported.Beatmaps.First());
using (var zip = ZipArchive.Open(temp)) using (var zip = ZipArchive.Open(temp))
zip.WriteToDirectory(extractedFolder); zip.WriteToDirectory(extractedFolder);
@ -343,7 +343,7 @@ namespace osu.Game.Tests.Database
var importedSecondTime = await importer.Import(new ImportTask(temp)); var importedSecondTime = await importer.Import(new ImportTask(temp));
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
// check the newly "imported" beatmap is not the original. // check the newly "imported" beatmap is not the original.
Assert.NotNull(importedSecondTime); Assert.NotNull(importedSecondTime);
@ -363,10 +363,10 @@ namespace osu.Game.Tests.Database
[Ignore("intentionally broken by import optimisations")] [Ignore("intentionally broken by import optimisations")]
public void TestImportThenImportWithChangedFile() public void TestImportThenImportWithChangedFile()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
@ -375,7 +375,7 @@ namespace osu.Game.Tests.Database
try try
{ {
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
using (var zip = ZipArchive.Open(temp)) using (var zip = ZipArchive.Open(temp))
zip.WriteToDirectory(extractedFolder); zip.WriteToDirectory(extractedFolder);
@ -392,7 +392,7 @@ namespace osu.Game.Tests.Database
var importedSecondTime = await importer.Import(new ImportTask(temp)); var importedSecondTime = await importer.Import(new ImportTask(temp));
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
Assert.NotNull(importedSecondTime); Assert.NotNull(importedSecondTime);
Debug.Assert(importedSecondTime != null); Debug.Assert(importedSecondTime != null);
@ -411,10 +411,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportThenImportWithDifferentFilename() public void TestImportThenImportWithDifferentFilename()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
@ -423,7 +423,7 @@ namespace osu.Game.Tests.Database
try try
{ {
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
using (var zip = ZipArchive.Open(temp)) using (var zip = ZipArchive.Open(temp))
zip.WriteToDirectory(extractedFolder); zip.WriteToDirectory(extractedFolder);
@ -440,7 +440,7 @@ namespace osu.Game.Tests.Database
var importedSecondTime = await importer.Import(new ImportTask(temp)); var importedSecondTime = await importer.Import(new ImportTask(temp));
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
Assert.NotNull(importedSecondTime); Assert.NotNull(importedSecondTime);
Debug.Assert(importedSecondTime != null); Debug.Assert(importedSecondTime != null);
@ -460,12 +460,12 @@ namespace osu.Game.Tests.Database
[Ignore("intentionally broken by import optimisations")] [Ignore("intentionally broken by import optimisations")]
public void TestImportCorruptThenImport() public void TestImportCorruptThenImport()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
var firstFile = imported.Files.First(); var firstFile = imported.Files.First();
@ -476,7 +476,7 @@ namespace osu.Game.Tests.Database
using (var stream = storage.GetStream(firstFile.File.GetStoragePath(), FileAccess.Write, FileMode.Create)) using (var stream = storage.GetStream(firstFile.File.GetStoragePath(), FileAccess.Write, FileMode.Create))
stream.WriteByte(0); stream.WriteByte(0);
var importedSecondTime = await LoadOszIntoStore(importer, realmFactory.Context); var importedSecondTime = await LoadOszIntoStore(importer, realm.Realm);
using (var stream = storage.GetStream(firstFile.File.GetStoragePath())) using (var stream = storage.GetStream(firstFile.File.GetStoragePath()))
Assert.AreEqual(stream.Length, originalLength, "Corruption was not fixed on second import"); Assert.AreEqual(stream.Length, originalLength, "Corruption was not fixed on second import");
@ -485,18 +485,18 @@ namespace osu.Game.Tests.Database
Assert.IsTrue(imported.ID == importedSecondTime.ID); Assert.IsTrue(imported.ID == importedSecondTime.ID);
Assert.IsTrue(imported.Beatmaps.First().ID == importedSecondTime.Beatmaps.First().ID); Assert.IsTrue(imported.Beatmaps.First().ID == importedSecondTime.Beatmaps.First().ID);
checkBeatmapSetCount(realmFactory.Context, 1); checkBeatmapSetCount(realm.Realm, 1);
checkSingleReferencedFileCount(realmFactory.Context, 18); checkSingleReferencedFileCount(realm.Realm, 18);
}); });
} }
[Test] [Test]
public void TestModelCreationFailureDoesntReturn() public void TestModelCreationFailureDoesntReturn()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var progressNotification = new ImportProgressNotification(); var progressNotification = new ImportProgressNotification();
@ -510,8 +510,8 @@ namespace osu.Game.Tests.Database
new ImportTask(zipStream, string.Empty) new ImportTask(zipStream, string.Empty)
); );
checkBeatmapSetCount(realmFactory.Context, 0); checkBeatmapSetCount(realm.Realm, 0);
checkBeatmapCount(realmFactory.Context, 0); checkBeatmapCount(realm.Realm, 0);
Assert.IsEmpty(imported); Assert.IsEmpty(imported);
Assert.AreEqual(ProgressNotificationState.Cancelled, progressNotification.State); Assert.AreEqual(ProgressNotificationState.Cancelled, progressNotification.State);
@ -521,7 +521,7 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestRollbackOnFailure() public void TestRollbackOnFailure()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
int loggedExceptionCount = 0; int loggedExceptionCount = 0;
@ -531,16 +531,16 @@ namespace osu.Game.Tests.Database
Interlocked.Increment(ref loggedExceptionCount); Interlocked.Increment(ref loggedExceptionCount);
}; };
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
realmFactory.Context.Write(() => imported.Hash += "-changed"); realm.Realm.Write(() => imported.Hash += "-changed");
checkBeatmapSetCount(realmFactory.Context, 1); checkBeatmapSetCount(realm.Realm, 1);
checkBeatmapCount(realmFactory.Context, 12); checkBeatmapCount(realm.Realm, 12);
checkSingleReferencedFileCount(realmFactory.Context, 18); checkSingleReferencedFileCount(realm.Realm, 18);
string? brokenTempFilename = TestResources.GetTestBeatmapForImport(); string? brokenTempFilename = TestResources.GetTestBeatmapForImport();
@ -565,10 +565,10 @@ namespace osu.Game.Tests.Database
{ {
} }
checkBeatmapSetCount(realmFactory.Context, 1); checkBeatmapSetCount(realm.Realm, 1);
checkBeatmapCount(realmFactory.Context, 12); checkBeatmapCount(realm.Realm, 12);
checkSingleReferencedFileCount(realmFactory.Context, 18); checkSingleReferencedFileCount(realm.Realm, 18);
Assert.AreEqual(1, loggedExceptionCount); Assert.AreEqual(1, loggedExceptionCount);
@ -579,18 +579,18 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportThenDeleteThenImportOptimisedPath() public void TestImportThenDeleteThenImportOptimisedPath()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
deleteBeatmapSet(imported, realmFactory.Context); deleteBeatmapSet(imported, realm.Realm);
Assert.IsTrue(imported.DeletePending); Assert.IsTrue(imported.DeletePending);
var importedSecondTime = await LoadOszIntoStore(importer, realmFactory.Context); var importedSecondTime = await LoadOszIntoStore(importer, realm.Realm);
// check the newly "imported" beatmap is actually just the restored previous import. since it matches hash. // check the newly "imported" beatmap is actually just the restored previous import. since it matches hash.
Assert.IsTrue(imported.ID == importedSecondTime.ID); Assert.IsTrue(imported.ID == importedSecondTime.ID);
@ -603,18 +603,18 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportThenDeleteThenImportNonOptimisedPath() public void TestImportThenDeleteThenImportNonOptimisedPath()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new NonOptimisedBeatmapImporter(realmFactory, storage); using var importer = new NonOptimisedBeatmapImporter(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
deleteBeatmapSet(imported, realmFactory.Context); deleteBeatmapSet(imported, realm.Realm);
Assert.IsTrue(imported.DeletePending); Assert.IsTrue(imported.DeletePending);
var importedSecondTime = await LoadOszIntoStore(importer, realmFactory.Context); var importedSecondTime = await LoadOszIntoStore(importer, realm.Realm);
// check the newly "imported" beatmap is actually just the restored previous import. since it matches hash. // check the newly "imported" beatmap is actually just the restored previous import. since it matches hash.
Assert.IsTrue(imported.ID == importedSecondTime.ID); Assert.IsTrue(imported.ID == importedSecondTime.ID);
@ -627,22 +627,22 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportThenDeleteThenImportWithOnlineIDsMissing() public void TestImportThenDeleteThenImportWithOnlineIDsMissing()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var imported = await LoadOszIntoStore(importer, realmFactory.Context); var imported = await LoadOszIntoStore(importer, realm.Realm);
realmFactory.Context.Write(() => realm.Realm.Write(() =>
{ {
foreach (var b in imported.Beatmaps) foreach (var b in imported.Beatmaps)
b.OnlineID = -1; b.OnlineID = -1;
}); });
deleteBeatmapSet(imported, realmFactory.Context); deleteBeatmapSet(imported, realm.Realm);
var importedSecondTime = await LoadOszIntoStore(importer, realmFactory.Context); var importedSecondTime = await LoadOszIntoStore(importer, realm.Realm);
// check the newly "imported" beatmap has been reimported due to mismatch (even though hashes matched) // check the newly "imported" beatmap has been reimported due to mismatch (even though hashes matched)
Assert.IsTrue(imported.ID != importedSecondTime.ID); Assert.IsTrue(imported.ID != importedSecondTime.ID);
@ -653,10 +653,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportWithDuplicateBeatmapIDs() public void TestImportWithDuplicateBeatmapIDs()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
var metadata = new BeatmapMetadata var metadata = new BeatmapMetadata
{ {
@ -667,7 +667,7 @@ namespace osu.Game.Tests.Database
} }
}; };
var ruleset = realmFactory.Context.All<RulesetInfo>().First(); var ruleset = realm.Realm.All<RulesetInfo>().First();
var toImport = new BeatmapSetInfo var toImport = new BeatmapSetInfo
{ {
@ -699,15 +699,15 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportWhenFileOpen() public void TestImportWhenFileOpen()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
using (File.OpenRead(temp)) using (File.OpenRead(temp))
await importer.Import(temp); await importer.Import(temp);
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
File.Delete(temp); File.Delete(temp);
Assert.IsFalse(File.Exists(temp), "We likely held a read lock on the file when we shouldn't"); Assert.IsFalse(File.Exists(temp), "We likely held a read lock on the file when we shouldn't");
}); });
@ -716,10 +716,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportWithDuplicateHashes() public void TestImportWithDuplicateHashes()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
@ -740,7 +740,7 @@ namespace osu.Game.Tests.Database
await importer.Import(temp); await importer.Import(temp);
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
} }
finally finally
{ {
@ -752,10 +752,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportNestedStructure() public void TestImportNestedStructure()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
@ -780,7 +780,7 @@ namespace osu.Game.Tests.Database
Assert.NotNull(imported); Assert.NotNull(imported);
Debug.Assert(imported != null); Debug.Assert(imported != null);
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
Assert.IsFalse(imported.PerformRead(s => s.Files.Any(f => f.Filename.Contains("subfolder"))), "Files contain common subfolder"); Assert.IsFalse(imported.PerformRead(s => s.Files.Any(f => f.Filename.Contains("subfolder"))), "Files contain common subfolder");
} }
@ -794,10 +794,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportWithIgnoredDirectoryInArchive() public void TestImportWithIgnoredDirectoryInArchive()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
@ -830,7 +830,7 @@ namespace osu.Game.Tests.Database
Assert.NotNull(imported); Assert.NotNull(imported);
Debug.Assert(imported != null); Debug.Assert(imported != null);
EnsureLoaded(realmFactory.Context); EnsureLoaded(realm.Realm);
Assert.IsFalse(imported.PerformRead(s => s.Files.Any(f => f.Filename.Contains("__MACOSX"))), "Files contain resource fork folder, which should be ignored"); Assert.IsFalse(imported.PerformRead(s => s.Files.Any(f => f.Filename.Contains("__MACOSX"))), "Files contain resource fork folder, which should be ignored");
Assert.IsFalse(imported.PerformRead(s => s.Files.Any(f => f.Filename.Contains("actual_data"))), "Files contain common subfolder"); Assert.IsFalse(imported.PerformRead(s => s.Files.Any(f => f.Filename.Contains("actual_data"))), "Files contain common subfolder");
@ -845,22 +845,22 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestUpdateBeatmapInfo() public void TestUpdateBeatmapInfo()
{ {
RunTestWithRealmAsync(async (realmFactory, storage) => RunTestWithRealmAsync(async (realm, storage) =>
{ {
using var importer = new BeatmapModelManager(realmFactory, storage); using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realmFactory, storage); using var store = new RulesetStore(realm, storage);
string? temp = TestResources.GetTestBeatmapForImport(); string? temp = TestResources.GetTestBeatmapForImport();
await importer.Import(temp); await importer.Import(temp);
// Update via the beatmap, not the beatmap info, to ensure correct linking // Update via the beatmap, not the beatmap info, to ensure correct linking
BeatmapSetInfo setToUpdate = realmFactory.Context.All<BeatmapSetInfo>().First(); BeatmapSetInfo setToUpdate = realm.Realm.All<BeatmapSetInfo>().First();
var beatmapToUpdate = setToUpdate.Beatmaps.First(); var beatmapToUpdate = setToUpdate.Beatmaps.First();
realmFactory.Context.Write(() => beatmapToUpdate.DifficultyName = "updated"); realm.Realm.Write(() => beatmapToUpdate.DifficultyName = "updated");
BeatmapInfo updatedInfo = realmFactory.Context.All<BeatmapInfo>().First(b => b.ID == beatmapToUpdate.ID); BeatmapInfo updatedInfo = realm.Realm.All<BeatmapInfo>().First(b => b.ID == beatmapToUpdate.ID);
Assert.That(updatedInfo.DifficultyName, Is.EqualTo("updated")); Assert.That(updatedInfo.DifficultyName, Is.EqualTo("updated"));
}); });
} }
@ -1004,8 +1004,8 @@ namespace osu.Game.Tests.Database
public class NonOptimisedBeatmapImporter : BeatmapImporter public class NonOptimisedBeatmapImporter : BeatmapImporter
{ {
public NonOptimisedBeatmapImporter(RealmContextFactory realmFactory, Storage storage) public NonOptimisedBeatmapImporter(RealmAccess realm, Storage storage)
: base(realmFactory, storage) : base(realm, storage)
{ {
} }

24
osu.Game.Tests/Database/FileStoreTests.cs
View File

@ -19,10 +19,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportFile() public void TestImportFile()
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realmAccess, storage) =>
{ {
var realm = realmFactory.Context; var realm = realmAccess.Context;
var files = new RealmFileStore(realmFactory, storage); var files = new RealmFileStore(realmAccess, storage);
var testData = new MemoryStream(new byte[] { 0, 1, 2, 3 }); var testData = new MemoryStream(new byte[] { 0, 1, 2, 3 });
@ -36,10 +36,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestImportSameFileTwice() public void TestImportSameFileTwice()
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realmAccess, storage) =>
{ {
var realm = realmFactory.Context; var realm = realmAccess.Context;
var files = new RealmFileStore(realmFactory, storage); var files = new RealmFileStore(realmAccess, storage);
var testData = new MemoryStream(new byte[] { 0, 1, 2, 3 }); var testData = new MemoryStream(new byte[] { 0, 1, 2, 3 });
@ -53,10 +53,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestDontPurgeReferenced() public void TestDontPurgeReferenced()
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realmAccess, storage) =>
{ {
var realm = realmFactory.Context; var realm = realmAccess.Context;
var files = new RealmFileStore(realmFactory, storage); var files = new RealmFileStore(realmAccess, storage);
var file = realm.Write(() => files.Add(new MemoryStream(new byte[] { 0, 1, 2, 3 }), realm)); var file = realm.Write(() => files.Add(new MemoryStream(new byte[] { 0, 1, 2, 3 }), realm));
@ -92,10 +92,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestPurgeUnreferenced() public void TestPurgeUnreferenced()
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realmAccess, storage) =>
{ {
var realm = realmFactory.Context; var realm = realmAccess.Context;
var files = new RealmFileStore(realmFactory, storage); var files = new RealmFileStore(realmAccess, storage);
var file = realm.Write(() => files.Add(new MemoryStream(new byte[] { 0, 1, 2, 3 }), realm)); var file = realm.Write(() => files.Add(new MemoryStream(new byte[] { 0, 1, 2, 3 }), realm));

22
osu.Game.Tests/Database/GeneralUsageTests.cs
View File

@ -21,15 +21,15 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestConstructRealm() public void TestConstructRealm()
{ {
RunTestWithRealm((realmFactory, _) => { realmFactory.Run(realm => realm.Refresh()); }); RunTestWithRealm((realm, _) => { realm.Run(r => r.Refresh()); });
} }
[Test] [Test]
public void TestBlockOperations() public void TestBlockOperations()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
using (realmFactory.BlockAllOperations()) using (realm.BlockAllOperations())
{ {
} }
}); });
@ -42,22 +42,22 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestNestedContextCreationWithSubscription() public void TestNestedContextCreationWithSubscription()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
bool callbackRan = false; bool callbackRan = false;
realmFactory.RegisterCustomSubscription(realm => realm.RegisterCustomSubscription(r =>
{ {
var subscription = realm.All<BeatmapInfo>().QueryAsyncWithNotifications((sender, changes, error) => var subscription = r.All<BeatmapInfo>().QueryAsyncWithNotifications((sender, changes, error) =>
{ {
realmFactory.Run(_ => realm.Run(_ =>
{ {
callbackRan = true; callbackRan = true;
}); });
}); });
// Force the callback above to run. // Force the callback above to run.
realmFactory.Run(r => r.Refresh()); realm.Run(rr => rr.Refresh());
subscription?.Dispose(); subscription?.Dispose();
return null; return null;
@ -70,14 +70,14 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestBlockOperationsWithContention() public void TestBlockOperationsWithContention()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
ManualResetEventSlim stopThreadedUsage = new ManualResetEventSlim(); ManualResetEventSlim stopThreadedUsage = new ManualResetEventSlim();
ManualResetEventSlim hasThreadedUsage = new ManualResetEventSlim(); ManualResetEventSlim hasThreadedUsage = new ManualResetEventSlim();
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
realmFactory.Run(_ => realm.Run(_ =>
{ {
hasThreadedUsage.Set(); hasThreadedUsage.Set();
@ -89,7 +89,7 @@ namespace osu.Game.Tests.Database
Assert.Throws<TimeoutException>(() => Assert.Throws<TimeoutException>(() =>
{ {
using (realmFactory.BlockAllOperations()) using (realm.BlockAllOperations())
{ {
} }
}); });

60
osu.Game.Tests/Database/RealmLiveTests.cs
View File

@ -21,11 +21,11 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestLiveEquality() public void TestLiveEquality()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
ILive<BeatmapInfo> beatmap = realmFactory.Run(realm => realm.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))).ToLive(realmFactory)); ILive<BeatmapInfo> beatmap = realm.Run(r => r.Write(_ => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))).ToLive(realm));
ILive<BeatmapInfo> beatmap2 = realmFactory.Run(realm => realm.All<BeatmapInfo>().First().ToLive(realmFactory)); ILive<BeatmapInfo> beatmap2 = realm.Run(r => r.All<BeatmapInfo>().First().ToLive(realm));
Assert.AreEqual(beatmap, beatmap2); Assert.AreEqual(beatmap, beatmap2);
}); });
@ -34,20 +34,20 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestAccessAfterStorageMigrate() public void TestAccessAfterStorageMigrate()
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realm, storage) =>
{ {
var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()); var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
ILive<BeatmapInfo>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
realmFactory.Run(realm => realm.Run(r =>
{ {
realm.Write(r => r.Add(beatmap)); r.Write(_ => r.Add(beatmap));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realm);
}); });
using (realmFactory.BlockAllOperations()) using (realm.BlockAllOperations())
{ {
// recycle realm before migrating // recycle realm before migrating
} }
@ -66,13 +66,13 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestAccessAfterAttach() public void TestAccessAfterAttach()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()); var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
var liveBeatmap = beatmap.ToLive(realmFactory); var liveBeatmap = beatmap.ToLive(realm);
realmFactory.Run(realm => realm.Write(r => r.Add(beatmap))); realm.Run(r => r.Write(_ => r.Add(beatmap)));
Assert.IsFalse(liveBeatmap.PerformRead(l => l.Hidden)); Assert.IsFalse(liveBeatmap.PerformRead(l => l.Hidden));
}); });
@ -98,16 +98,16 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestScopedReadWithoutContext() public void TestScopedReadWithoutContext()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
ILive<BeatmapInfo>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
realmFactory.Run(threadContext => realm.Run(threadContext =>
{ {
var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realm);
}); });
}, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely(); }, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely();
@ -127,16 +127,16 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestScopedWriteWithoutContext() public void TestScopedWriteWithoutContext()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
ILive<BeatmapInfo>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
realmFactory.Run(threadContext => realm.Run(threadContext =>
{ {
var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realm);
}); });
}, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely(); }, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely();
@ -153,10 +153,10 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestValueAccessNonManaged() public void TestValueAccessNonManaged()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()); var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
var liveBeatmap = beatmap.ToLive(realmFactory); var liveBeatmap = beatmap.ToLive(realm);
Assert.DoesNotThrow(() => Assert.DoesNotThrow(() =>
{ {
@ -168,17 +168,17 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestValueAccessWithOpenContextFails() public void TestValueAccessWithOpenContextFails()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
ILive<BeatmapInfo>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
realmFactory.Run(threadContext => realm.Run(threadContext =>
{ {
var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realm);
}); });
}, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely(); }, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely();
@ -193,7 +193,7 @@ namespace osu.Game.Tests.Database
}); });
// Can't be used, even from within a valid context. // Can't be used, even from within a valid context.
realmFactory.Run(threadContext => realm.Run(threadContext =>
{ {
Assert.Throws<InvalidOperationException>(() => Assert.Throws<InvalidOperationException>(() =>
{ {
@ -207,16 +207,16 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestValueAccessWithoutOpenContextFails() public void TestValueAccessWithoutOpenContextFails()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
ILive<BeatmapInfo>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
realmFactory.Run(threadContext => realm.Run(threadContext =>
{ {
var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realm);
}); });
}, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely(); }, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely();
@ -235,18 +235,18 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestLiveAssumptions() public void TestLiveAssumptions()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
int changesTriggered = 0; int changesTriggered = 0;
realmFactory.RegisterCustomSubscription(outerRealm => realm.RegisterCustomSubscription(outerRealm =>
{ {
outerRealm.All<BeatmapInfo>().QueryAsyncWithNotifications(gotChange); outerRealm.All<BeatmapInfo>().QueryAsyncWithNotifications(gotChange);
ILive<BeatmapInfo>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
realmFactory.Run(innerRealm => realm.Run(innerRealm =>
{ {
var ruleset = CreateRuleset(); var ruleset = CreateRuleset();
var beatmap = innerRealm.Write(r => r.Add(new BeatmapInfo(ruleset, new BeatmapDifficulty(), new BeatmapMetadata()))); var beatmap = innerRealm.Write(r => r.Add(new BeatmapInfo(ruleset, new BeatmapDifficulty(), new BeatmapMetadata())));
@ -255,7 +255,7 @@ namespace osu.Game.Tests.Database
// not just a refresh from the resolved Live. // not just a refresh from the resolved Live.
innerRealm.Write(r => r.Add(new BeatmapInfo(ruleset, new BeatmapDifficulty(), new BeatmapMetadata()))); innerRealm.Write(r => r.Add(new BeatmapInfo(ruleset, new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realm);
}); });
}, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely(); }, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler).WaitSafely();

42
osu.Game.Tests/Database/RealmSubscriptionRegistrationTests.cs
View File

@ -24,11 +24,11 @@ namespace osu.Game.Tests.Database
IEnumerable<BeatmapSetInfo>? resolvedItems = null; IEnumerable<BeatmapSetInfo>? resolvedItems = null;
ChangeSet? lastChanges = null; ChangeSet? lastChanges = null;
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
realmFactory.Write(realm => realm.Add(TestResources.CreateTestBeatmapSetInfo())); realm.Write(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
var registration = realmFactory.RegisterForNotifications(realm => realm.All<BeatmapSetInfo>(), onChanged); var registration = realm.RegisterForNotifications(r => r.All<BeatmapSetInfo>(), onChanged);
testEventsArriving(true); testEventsArriving(true);
@ -37,10 +37,10 @@ namespace osu.Game.Tests.Database
resolvedItems = null; resolvedItems = null;
lastChanges = null; lastChanges = null;
using (realmFactory.BlockAllOperations()) using (realm.BlockAllOperations())
Assert.That(resolvedItems, Is.Empty); Assert.That(resolvedItems, Is.Empty);
realmFactory.Write(realm => realm.Add(TestResources.CreateTestBeatmapSetInfo())); realm.Write(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
testEventsArriving(true); testEventsArriving(true);
@ -50,34 +50,34 @@ namespace osu.Game.Tests.Database
registration.Dispose(); registration.Dispose();
realmFactory.Write(realm => realm.Add(TestResources.CreateTestBeatmapSetInfo())); realm.Write(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
testEventsArriving(false); testEventsArriving(false);
// And make sure even after another context loss we don't get firings. // And make sure even after another context loss we don't get firings.
using (realmFactory.BlockAllOperations()) using (realm.BlockAllOperations())
Assert.That(resolvedItems, Is.Null); Assert.That(resolvedItems, Is.Null);
realmFactory.Write(realm => realm.Add(TestResources.CreateTestBeatmapSetInfo())); realm.Write(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
testEventsArriving(false); testEventsArriving(false);
void testEventsArriving(bool shouldArrive) void testEventsArriving(bool shouldArrive)
{ {
realmFactory.Run(realm => realm.Refresh()); realm.Run(r => r.Refresh());
if (shouldArrive) if (shouldArrive)
Assert.That(resolvedItems, Has.One.Items); Assert.That(resolvedItems, Has.One.Items);
else else
Assert.That(resolvedItems, Is.Null); Assert.That(resolvedItems, Is.Null);
realmFactory.Write(realm => realm.Write(r =>
{ {
realm.RemoveAll<BeatmapSetInfo>(); r.RemoveAll<BeatmapSetInfo>();
realm.RemoveAll<RulesetInfo>(); r.RemoveAll<RulesetInfo>();
}); });
realmFactory.Run(realm => realm.Refresh()); realm.Run(r => r.Refresh());
if (shouldArrive) if (shouldArrive)
Assert.That(lastChanges?.DeletedIndices, Has.One.Items); Assert.That(lastChanges?.DeletedIndices, Has.One.Items);
@ -98,39 +98,39 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestCustomRegisterWithContextLoss() public void TestCustomRegisterWithContextLoss()
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realm, _) =>
{ {
BeatmapSetInfo? beatmapSetInfo = null; BeatmapSetInfo? beatmapSetInfo = null;
realmFactory.Write(realm => realm.Add(TestResources.CreateTestBeatmapSetInfo())); realm.Write(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
var subscription = realmFactory.RegisterCustomSubscription(realm => var subscription = realm.RegisterCustomSubscription(r =>
{ {
beatmapSetInfo = realm.All<BeatmapSetInfo>().First(); beatmapSetInfo = r.All<BeatmapSetInfo>().First();
return new InvokeOnDisposal(() => beatmapSetInfo = null); return new InvokeOnDisposal(() => beatmapSetInfo = null);
}); });
Assert.That(beatmapSetInfo, Is.Not.Null); Assert.That(beatmapSetInfo, Is.Not.Null);
using (realmFactory.BlockAllOperations()) using (realm.BlockAllOperations())
{ {
// custom disposal action fired when context lost. // custom disposal action fired when context lost.
Assert.That(beatmapSetInfo, Is.Null); Assert.That(beatmapSetInfo, Is.Null);
} }
// re-registration after context restore. // re-registration after context restore.
realmFactory.Run(realm => realm.Refresh()); realm.Run(r => r.Refresh());
Assert.That(beatmapSetInfo, Is.Not.Null); Assert.That(beatmapSetInfo, Is.Not.Null);
subscription.Dispose(); subscription.Dispose();
Assert.That(beatmapSetInfo, Is.Null); Assert.That(beatmapSetInfo, Is.Null);
using (realmFactory.BlockAllOperations()) using (realm.BlockAllOperations())
Assert.That(beatmapSetInfo, Is.Null); Assert.That(beatmapSetInfo, Is.Null);
realmFactory.Run(realm => realm.Refresh()); realm.Run(r => r.Refresh());
Assert.That(beatmapSetInfo, Is.Null); Assert.That(beatmapSetInfo, Is.Null);
}); });
} }

34
osu.Game.Tests/Database/RealmTest.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Tests.Database
storage.DeleteDirectory(string.Empty); storage.DeleteDirectory(string.Empty);
} }
protected void RunTestWithRealm(Action<RealmContextFactory, OsuStorage> testAction, [CallerMemberName] string caller = "") protected void RunTestWithRealm(Action<RealmAccess, OsuStorage> testAction, [CallerMemberName] string caller = "")
{ {
using (HeadlessGameHost host = new CleanRunHeadlessGameHost(callingMethodName: caller)) using (HeadlessGameHost host = new CleanRunHeadlessGameHost(callingMethodName: caller))
{ {
@ -39,22 +39,22 @@ namespace osu.Game.Tests.Database
// ReSharper disable once AccessToDisposedClosure // ReSharper disable once AccessToDisposedClosure
var testStorage = new OsuStorage(host, storage.GetStorageForDirectory(caller)); var testStorage = new OsuStorage(host, storage.GetStorageForDirectory(caller));
using (var realmFactory = new RealmContextFactory(testStorage, "client")) using (var realm = new RealmAccess(testStorage, "client"))
{ {
Logger.Log($"Running test using realm file {testStorage.GetFullPath(realmFactory.Filename)}"); Logger.Log($"Running test using realm file {testStorage.GetFullPath(realm.Filename)}");
testAction(realmFactory, testStorage); testAction(realm, testStorage);
realmFactory.Dispose(); realm.Dispose();
Logger.Log($"Final database size: {getFileSize(testStorage, realmFactory)}"); Logger.Log($"Final database size: {getFileSize(testStorage, realm)}");
realmFactory.Compact(); realm.Compact();
Logger.Log($"Final database size after compact: {getFileSize(testStorage, realmFactory)}"); Logger.Log($"Final database size after compact: {getFileSize(testStorage, realm)}");
} }
})); }));
} }
} }
protected void RunTestWithRealmAsync(Func<RealmContextFactory, Storage, Task> testAction, [CallerMemberName] string caller = "") protected void RunTestWithRealmAsync(Func<RealmAccess, Storage, Task> testAction, [CallerMemberName] string caller = "")
{ {
using (HeadlessGameHost host = new CleanRunHeadlessGameHost(callingMethodName: caller)) using (HeadlessGameHost host = new CleanRunHeadlessGameHost(callingMethodName: caller))
{ {
@ -62,15 +62,15 @@ namespace osu.Game.Tests.Database
{ {
var testStorage = storage.GetStorageForDirectory(caller); var testStorage = storage.GetStorageForDirectory(caller);
using (var realmFactory = new RealmContextFactory(testStorage, "client")) using (var realm = new RealmAccess(testStorage, "client"))
{ {
Logger.Log($"Running test using realm file {testStorage.GetFullPath(realmFactory.Filename)}"); Logger.Log($"Running test using realm file {testStorage.GetFullPath(realm.Filename)}");
await testAction(realmFactory, testStorage); await testAction(realm, testStorage);
realmFactory.Dispose(); realm.Dispose();
Logger.Log($"Final database size: {getFileSize(testStorage, realmFactory)}"); Logger.Log($"Final database size: {getFileSize(testStorage, realm)}");
realmFactory.Compact(); realm.Compact();
} }
})); }));
} }
@ -138,11 +138,11 @@ namespace osu.Game.Tests.Database
} }
} }
private static long getFileSize(Storage testStorage, RealmContextFactory realmFactory) private static long getFileSize(Storage testStorage, RealmAccess realm)
{ {
try try
{ {
using (var stream = testStorage.GetStream(realmFactory.Filename)) using (var stream = testStorage.GetStream(realm.Filename))
return stream?.Length ?? 0; return stream?.Length ?? 0;
} }
catch catch

18
osu.Game.Tests/Database/RulesetStoreTests.cs
View File

@ -12,37 +12,37 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestCreateStore() public void TestCreateStore()
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realm, storage) =>
{ {
var rulesets = new RulesetStore(realmFactory, storage); var rulesets = new RulesetStore(realm, storage);
Assert.AreEqual(4, rulesets.AvailableRulesets.Count()); Assert.AreEqual(4, rulesets.AvailableRulesets.Count());
Assert.AreEqual(4, realmFactory.Context.All<RulesetInfo>().Count()); Assert.AreEqual(4, realm.Realm.All<RulesetInfo>().Count());
}); });
} }
[Test] [Test]
public void TestCreateStoreTwiceDoesntAddRulesetsAgain() public void TestCreateStoreTwiceDoesntAddRulesetsAgain()
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realm, storage) =>
{ {
var rulesets = new RulesetStore(realmFactory, storage); var rulesets = new RulesetStore(realm, storage);
var rulesets2 = new RulesetStore(realmFactory, storage); var rulesets2 = new RulesetStore(realm, storage);
Assert.AreEqual(4, rulesets.AvailableRulesets.Count()); Assert.AreEqual(4, rulesets.AvailableRulesets.Count());
Assert.AreEqual(4, rulesets2.AvailableRulesets.Count()); Assert.AreEqual(4, rulesets2.AvailableRulesets.Count());
Assert.AreEqual(rulesets.AvailableRulesets.First(), rulesets2.AvailableRulesets.First()); Assert.AreEqual(rulesets.AvailableRulesets.First(), rulesets2.AvailableRulesets.First());
Assert.AreEqual(4, realmFactory.Context.All<RulesetInfo>().Count()); Assert.AreEqual(4, realm.Realm.All<RulesetInfo>().Count());
}); });
} }
[Test] [Test]
public void TestRetrievedRulesetsAreDetached() public void TestRetrievedRulesetsAreDetached()
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realm, storage) =>
{ {
var rulesets = new RulesetStore(realmFactory, storage); var rulesets = new RulesetStore(realm, storage);
Assert.IsFalse(rulesets.AvailableRulesets.First().IsManaged); Assert.IsFalse(rulesets.AvailableRulesets.First().IsManaged);
Assert.IsFalse(rulesets.GetRuleset(0)?.IsManaged); Assert.IsFalse(rulesets.GetRuleset(0)?.IsManaged);

16
osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Tests.Database
private RealmKeyBindingStore keyBindingStore; private RealmKeyBindingStore keyBindingStore;
private RealmContextFactory realmContextFactory; private RealmAccess realm;
[SetUp] [SetUp]
public void SetUp() public void SetUp()
@ -33,8 +33,8 @@ namespace osu.Game.Tests.Database
storage = new NativeStorage(directory.FullName); storage = new NativeStorage(directory.FullName);
realmContextFactory = new RealmContextFactory(storage, "test"); realm = new RealmAccess(storage, "test");
keyBindingStore = new RealmKeyBindingStore(realmContextFactory, new ReadableKeyCombinationProvider()); keyBindingStore = new RealmKeyBindingStore(realm, new ReadableKeyCombinationProvider());
} }
[Test] [Test]
@ -60,7 +60,7 @@ namespace osu.Game.Tests.Database
KeyBindingContainer testContainer = new TestKeyBindingContainer(); KeyBindingContainer testContainer = new TestKeyBindingContainer();
// Add some excess bindings for an action which only supports 1. // Add some excess bindings for an action which only supports 1.
realmContextFactory.Write(realm => realm.Write(realm =>
{ {
realm.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.A))); realm.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.A)));
realm.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.S))); realm.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.S)));
@ -76,7 +76,7 @@ namespace osu.Game.Tests.Database
private int queryCount(GlobalAction? match = null) private int queryCount(GlobalAction? match = null)
{ {
return realmContextFactory.Run(realm => return realm.Run(realm =>
{ {
var results = realm.All<RealmKeyBinding>(); var results = realm.All<RealmKeyBinding>();
if (match.HasValue) if (match.HasValue)
@ -92,7 +92,7 @@ namespace osu.Game.Tests.Database
keyBindingStore.Register(testContainer, Enumerable.Empty<RulesetInfo>()); keyBindingStore.Register(testContainer, Enumerable.Empty<RulesetInfo>());
realmContextFactory.Run(outerRealm => realm.Run(outerRealm =>
{ {
var backBinding = outerRealm.All<RealmKeyBinding>().Single(k => k.ActionInt == (int)GlobalAction.Back); var backBinding = outerRealm.All<RealmKeyBinding>().Single(k => k.ActionInt == (int)GlobalAction.Back);
@ -100,7 +100,7 @@ namespace osu.Game.Tests.Database
var tsr = ThreadSafeReference.Create(backBinding); var tsr = ThreadSafeReference.Create(backBinding);
realmContextFactory.Run(innerRealm => realm.Run(innerRealm =>
{ {
var binding = innerRealm.ResolveReference(tsr); var binding = innerRealm.ResolveReference(tsr);
innerRealm.Write(() => binding.KeyCombination = new KeyCombination(InputKey.BackSpace)); innerRealm.Write(() => binding.KeyCombination = new KeyCombination(InputKey.BackSpace));
@ -117,7 +117,7 @@ namespace osu.Game.Tests.Database
[TearDown] [TearDown]
public void TearDown() public void TearDown()
{ {
realmContextFactory.Dispose(); realm.Dispose();
storage.DeleteDirectory(string.Empty); storage.DeleteDirectory(string.Empty);
} }

2
osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
View File

@ -261,7 +261,7 @@ namespace osu.Game.Tests.Gameplay
public AudioManager AudioManager => Audio; public AudioManager AudioManager => Audio;
public IResourceStore<byte[]> Files => null; public IResourceStore<byte[]> Files => null;
public new IResourceStore<byte[]> Resources => base.Resources; public new IResourceStore<byte[]> Resources => base.Resources;
public RealmContextFactory RealmContextFactory => null; public RealmAccess RealmAccess => null;
public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null; public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
#endregion #endregion

20
osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
View File

@ -45,8 +45,8 @@ namespace osu.Game.Tests.Online
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, GameHost host) private void load(AudioManager audio, GameHost host)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.CacheAs<BeatmapManager>(beatmaps = new TestBeatmapManager(LocalStorage, ContextFactory, rulesets, API, audio, Resources, host, Beatmap.Default)); Dependencies.CacheAs<BeatmapManager>(beatmaps = new TestBeatmapManager(LocalStorage, Access, rulesets, API, audio, Resources, host, Beatmap.Default));
Dependencies.CacheAs<BeatmapModelDownloader>(beatmapDownloader = new TestBeatmapModelDownloader(beatmaps, API, host)); Dependencies.CacheAs<BeatmapModelDownloader>(beatmapDownloader = new TestBeatmapModelDownloader(beatmaps, API, host));
} }
@ -60,8 +60,8 @@ namespace osu.Game.Tests.Online
testBeatmapInfo = getTestBeatmapInfo(testBeatmapFile); testBeatmapInfo = getTestBeatmapInfo(testBeatmapFile);
testBeatmapSet = testBeatmapInfo.BeatmapSet; testBeatmapSet = testBeatmapInfo.BeatmapSet;
ContextFactory.Write(r => r.RemoveAll<BeatmapSetInfo>()); Access.Write(r => r.RemoveAll<BeatmapSetInfo>());
ContextFactory.Write(r => r.RemoveAll<BeatmapInfo>()); Access.Write(r => r.RemoveAll<BeatmapInfo>());
selectedItem.Value = new PlaylistItem selectedItem.Value = new PlaylistItem
{ {
@ -166,22 +166,22 @@ namespace osu.Game.Tests.Online
public Task<ILive<BeatmapSetInfo>> CurrentImportTask { get; private set; } public Task<ILive<BeatmapSetInfo>> CurrentImportTask { get; private set; }
public TestBeatmapManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, IResourceStore<byte[]> resources, GameHost host = null, WorkingBeatmap defaultBeatmap = null) public TestBeatmapManager(Storage storage, RealmAccess realm, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, IResourceStore<byte[]> resources, GameHost host = null, WorkingBeatmap defaultBeatmap = null)
: base(storage, contextFactory, rulesets, api, audioManager, resources, host, defaultBeatmap) : base(storage, realm, rulesets, api, audioManager, resources, host, defaultBeatmap)
{ {
} }
protected override BeatmapModelManager CreateBeatmapModelManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, BeatmapOnlineLookupQueue onlineLookupQueue) protected override BeatmapModelManager CreateBeatmapModelManager(Storage storage, RealmAccess realm, RulesetStore rulesets, BeatmapOnlineLookupQueue onlineLookupQueue)
{ {
return new TestBeatmapModelManager(this, storage, contextFactory, rulesets, onlineLookupQueue); return new TestBeatmapModelManager(this, storage, realm, rulesets, onlineLookupQueue);
} }
internal class TestBeatmapModelManager : BeatmapModelManager internal class TestBeatmapModelManager : BeatmapModelManager
{ {
private readonly TestBeatmapManager testBeatmapManager; private readonly TestBeatmapManager testBeatmapManager;
public TestBeatmapModelManager(TestBeatmapManager testBeatmapManager, Storage storage, RealmContextFactory databaseContextFactory, RulesetStore rulesetStore, BeatmapOnlineLookupQueue beatmapOnlineLookupQueue) public TestBeatmapModelManager(TestBeatmapManager testBeatmapManager, Storage storage, RealmAccess databaseAccess, RulesetStore rulesetStore, BeatmapOnlineLookupQueue beatmapOnlineLookupQueue)
: base(databaseContextFactory, storage, beatmapOnlineLookupQueue) : base(databaseAccess, storage, beatmapOnlineLookupQueue)
{ {
this.testBeatmapManager = testBeatmapManager; this.testBeatmapManager = testBeatmapManager;
} }

6
osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
View File

@ -47,10 +47,10 @@ namespace osu.Game.Tests.Visual.Background
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(manager = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(new OsuConfigManager(LocalStorage)); Dependencies.Cache(new OsuConfigManager(LocalStorage));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
manager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely(); manager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();

6
osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
View File

@ -36,9 +36,9 @@ namespace osu.Game.Tests.Visual.Collections
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host) private void load(GameHost host)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, Access, rulesets, null, Audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely(); beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();

6
osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs
View File

@ -47,9 +47,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
} }
public override void SetUpSteps() public override void SetUpSteps()

6
osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
View File

@ -43,9 +43,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(manager = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
} }
[Test] [Test]

6
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
View File

@ -61,9 +61,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, API, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, Access, rulesets, API, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
} }
public override void SetUpSteps() public override void SetUpSteps()

6
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
View File

@ -42,9 +42,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(manager = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
beatmaps = new List<BeatmapInfo>(); beatmaps = new List<BeatmapInfo>();

6
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
View File

@ -38,9 +38,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely(); beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();

6
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs
View File

@ -33,9 +33,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
} }
[SetUp] [SetUp]

6
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs
View File

@ -38,9 +38,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, API, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, Access, rulesets, API, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
} }
public override void SetUpSteps() public override void SetUpSteps()

6
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
View File

@ -40,9 +40,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely(); beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();
} }

6
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
View File

@ -41,9 +41,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely(); beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();
} }

6
osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
View File

@ -34,9 +34,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(manager = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
var beatmapSet = TestResources.CreateTestBeatmapSetInfo(); var beatmapSet = TestResources.CreateTestBeatmapSetInfo();

6
osu.Game.Tests/Visual/Multiplayer/TestSceneTeamVersus.cs
View File

@ -42,9 +42,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
} }
public override void SetUpSteps() public override void SetUpSteps()

2
osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
View File

@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Navigation
.ChildrenOfType<KeyBindingPanel>().SingleOrDefault(); .ChildrenOfType<KeyBindingPanel>().SingleOrDefault();
private RealmKeyBinding firstOsuRulesetKeyBindings => Game.Dependencies private RealmKeyBinding firstOsuRulesetKeyBindings => Game.Dependencies
.Get<RealmContextFactory>().Context .Get<RealmAccess>().Context
.All<RealmKeyBinding>() .All<RealmKeyBinding>()
.AsEnumerable() .AsEnumerable()
.First(k => k.RulesetName == "osu" && k.ActionInt == 0); .First(k => k.RulesetName == "osu" && k.ActionInt == 0);

6
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
View File

@ -40,9 +40,9 @@ namespace osu.Game.Tests.Visual.Playlists
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, API, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(manager = new BeatmapManager(LocalStorage, Access, rulesets, API, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
} }
[SetUpSteps] [SetUpSteps]

4
osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
View File

@ -36,13 +36,13 @@ namespace osu.Game.Tests.Visual.Ranking
private BeatmapManager beatmaps { get; set; } private BeatmapManager beatmaps { get; set; }
[Resolved] [Resolved]
private RealmContextFactory realmContextFactory { get; set; } private RealmAccess realm { get; set; }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
realmContextFactory.Run(realm => realm.Run(realm =>
{ {
var beatmapInfo = realm.All<BeatmapInfo>() var beatmapInfo = realm.All<BeatmapInfo>()
.Filter($"{nameof(BeatmapInfo.Ruleset)}.{nameof(RulesetInfo.OnlineID)} = $0", 0) .Filter($"{nameof(BeatmapInfo.Ruleset)}.{nameof(RulesetInfo.OnlineID)} = $0", 0)

8
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
View File

@ -42,10 +42,10 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent)); var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
dependencies.Cache(rulesetStore = new RulesetStore(ContextFactory)); dependencies.Cache(rulesetStore = new RulesetStore(Access));
dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, dependencies.Get<AudioManager>(), Resources, dependencies.Get<GameHost>(), Beatmap.Default)); dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, Access, rulesetStore, null, dependencies.Get<AudioManager>(), Resources, dependencies.Get<GameHost>(), Beatmap.Default));
dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, ContextFactory, Scheduler)); dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, Access, Scheduler));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
return dependencies; return dependencies;
} }

6
osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
View File

@ -36,9 +36,9 @@ namespace osu.Game.Tests.Visual.SongSelect
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host) private void load(GameHost host)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, Access, rulesets, null, Audio, Resources, host, Beatmap.Default));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely(); beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();

6
osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
View File

@ -47,9 +47,9 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
// These DI caches are required to ensure for interactive runs this test scene doesn't nuke all user beatmaps in the local install. // These DI caches are required to ensure for interactive runs this test scene doesn't nuke all user beatmaps in the local install.
// At a point we have isolated interactive test runs enough, this can likely be removed. // At a point we have isolated interactive test runs enough, this can likely be removed.
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, defaultBeatmap = Beatmap.Default)); Dependencies.Cache(manager = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, defaultBeatmap = Beatmap.Default));
Dependencies.Cache(music = new MusicController()); Dependencies.Cache(music = new MusicController());

8
osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
View File

@ -28,10 +28,10 @@ namespace osu.Game.Tests.Visual.SongSelect
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio) private void load(GameHost host, AudioManager audio)
{ {
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(Access));
Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
Dependencies.Cache(scoreManager = new ScoreManager(rulesets, () => beatmapManager, LocalStorage, ContextFactory, Scheduler)); Dependencies.Cache(scoreManager = new ScoreManager(rulesets, () => beatmapManager, LocalStorage, Access, Scheduler));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely(); beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();
} }

12
osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.UserInterface
private BeatmapInfo beatmapInfo; private BeatmapInfo beatmapInfo;
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
[Cached] [Cached]
private readonly DialogOverlay dialogOverlay; private readonly DialogOverlay dialogOverlay;
@ -87,10 +87,10 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent)); var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
dependencies.Cache(rulesetStore = new RulesetStore(ContextFactory)); dependencies.Cache(rulesetStore = new RulesetStore(Access));
dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, dependencies.Get<AudioManager>(), Resources, dependencies.Get<GameHost>(), Beatmap.Default)); dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, Access, rulesetStore, null, dependencies.Get<AudioManager>(), Resources, dependencies.Get<GameHost>(), Beatmap.Default));
dependencies.Cache(scoreManager = new ScoreManager(dependencies.Get<RulesetStore>(), () => beatmapManager, LocalStorage, ContextFactory, Scheduler)); dependencies.Cache(scoreManager = new ScoreManager(dependencies.Get<RulesetStore>(), () => beatmapManager, LocalStorage, Access, Scheduler));
Dependencies.Cache(ContextFactory); Dependencies.Cache(Access);
var imported = beatmapManager.Import(new ImportTask(TestResources.GetQuickTestBeatmapForImport())).GetResultSafely(); var imported = beatmapManager.Import(new ImportTask(TestResources.GetQuickTestBeatmapForImport())).GetResultSafely();
@ -122,7 +122,7 @@ namespace osu.Game.Tests.Visual.UserInterface
[SetUp] [SetUp]
public void Setup() => Schedule(() => public void Setup() => Schedule(() =>
{ {
realmFactory.Run(realm => realm.Run(realm =>
{ {
// Due to soft deletions, we can re-use deleted scores between test runs // Due to soft deletions, we can re-use deleted scores between test runs
scoreManager.Undelete(realm.All<ScoreInfo>().Where(s => s.DeletePending).ToList()); scoreManager.Undelete(realm.All<ScoreInfo>().Where(s => s.DeletePending).ToList());

30
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -41,11 +41,11 @@ namespace osu.Game.Beatmaps
private readonly WorkingBeatmapCache workingBeatmapCache; private readonly WorkingBeatmapCache workingBeatmapCache;
private readonly BeatmapOnlineLookupQueue? onlineBeatmapLookupQueue; private readonly BeatmapOnlineLookupQueue? onlineBeatmapLookupQueue;
private readonly RealmContextFactory contextFactory; private readonly RealmAccess realm;
public BeatmapManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, IAPIProvider? api, AudioManager audioManager, IResourceStore<byte[]> gameResources, GameHost? host = null, WorkingBeatmap? defaultBeatmap = null, bool performOnlineLookups = false) public BeatmapManager(Storage storage, RealmAccess realm, RulesetStore rulesets, IAPIProvider? api, AudioManager audioManager, IResourceStore<byte[]> gameResources, GameHost? host = null, WorkingBeatmap? defaultBeatmap = null, bool performOnlineLookups = false)
{ {
this.contextFactory = contextFactory; this.realm = realm;
if (performOnlineLookups) if (performOnlineLookups)
{ {
@ -55,11 +55,11 @@ namespace osu.Game.Beatmaps
onlineBeatmapLookupQueue = new BeatmapOnlineLookupQueue(api, storage); onlineBeatmapLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
} }
var userResources = new RealmFileStore(contextFactory, storage).Store; var userResources = new RealmFileStore(realm, storage).Store;
BeatmapTrackStore = audioManager.GetTrackStore(userResources); BeatmapTrackStore = audioManager.GetTrackStore(userResources);
beatmapModelManager = CreateBeatmapModelManager(storage, contextFactory, rulesets, onlineBeatmapLookupQueue); beatmapModelManager = CreateBeatmapModelManager(storage, realm, rulesets, onlineBeatmapLookupQueue);
workingBeatmapCache = CreateWorkingBeatmapCache(audioManager, gameResources, userResources, defaultBeatmap, host); workingBeatmapCache = CreateWorkingBeatmapCache(audioManager, gameResources, userResources, defaultBeatmap, host);
beatmapModelManager.WorkingBeatmapCache = workingBeatmapCache; beatmapModelManager.WorkingBeatmapCache = workingBeatmapCache;
@ -70,8 +70,8 @@ namespace osu.Game.Beatmaps
return new WorkingBeatmapCache(BeatmapTrackStore, audioManager, resources, storage, defaultBeatmap, host); return new WorkingBeatmapCache(BeatmapTrackStore, audioManager, resources, storage, defaultBeatmap, host);
} }
protected virtual BeatmapModelManager CreateBeatmapModelManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, BeatmapOnlineLookupQueue? onlineLookupQueue) => protected virtual BeatmapModelManager CreateBeatmapModelManager(Storage storage, RealmAccess realm, RulesetStore rulesets, BeatmapOnlineLookupQueue? onlineLookupQueue) =>
new BeatmapModelManager(contextFactory, storage, onlineLookupQueue); new BeatmapModelManager(realm, storage, onlineLookupQueue);
/// <summary> /// <summary>
/// Create a new <see cref="WorkingBeatmap"/>. /// Create a new <see cref="WorkingBeatmap"/>.
@ -119,7 +119,7 @@ namespace osu.Game.Beatmaps
/// <param name="beatmapInfo">The beatmap difficulty to hide.</param> /// <param name="beatmapInfo">The beatmap difficulty to hide.</param>
public void Hide(BeatmapInfo beatmapInfo) public void Hide(BeatmapInfo beatmapInfo)
{ {
contextFactory.Run(realm => realm.Run(realm =>
{ {
using (var transaction = realm.BeginWrite()) using (var transaction = realm.BeginWrite())
{ {
@ -138,7 +138,7 @@ namespace osu.Game.Beatmaps
/// <param name="beatmapInfo">The beatmap difficulty to restore.</param> /// <param name="beatmapInfo">The beatmap difficulty to restore.</param>
public void Restore(BeatmapInfo beatmapInfo) public void Restore(BeatmapInfo beatmapInfo)
{ {
contextFactory.Run(realm => realm.Run(realm =>
{ {
using (var transaction = realm.BeginWrite()) using (var transaction = realm.BeginWrite())
{ {
@ -153,7 +153,7 @@ namespace osu.Game.Beatmaps
public void RestoreAll() public void RestoreAll()
{ {
contextFactory.Run(realm => realm.Run(realm =>
{ {
using (var transaction = realm.BeginWrite()) using (var transaction = realm.BeginWrite())
{ {
@ -171,7 +171,7 @@ namespace osu.Game.Beatmaps
/// <returns>A list of available <see cref="BeatmapSetInfo"/>.</returns> /// <returns>A list of available <see cref="BeatmapSetInfo"/>.</returns>
public List<BeatmapSetInfo> GetAllUsableBeatmapSets() public List<BeatmapSetInfo> GetAllUsableBeatmapSets()
{ {
return contextFactory.Run(realm => return realm.Run(realm =>
{ {
realm.Refresh(); realm.Refresh();
return realm.All<BeatmapSetInfo>().Where(b => !b.DeletePending).Detach(); return realm.All<BeatmapSetInfo>().Where(b => !b.DeletePending).Detach();
@ -185,7 +185,7 @@ namespace osu.Game.Beatmaps
/// <returns>The first result for the provided query, or null if no results were found.</returns> /// <returns>The first result for the provided query, or null if no results were found.</returns>
public ILive<BeatmapSetInfo>? QueryBeatmapSet(Expression<Func<BeatmapSetInfo, bool>> query) public ILive<BeatmapSetInfo>? QueryBeatmapSet(Expression<Func<BeatmapSetInfo, bool>> query)
{ {
return contextFactory.Run(realm => realm.All<BeatmapSetInfo>().FirstOrDefault(query)?.ToLive(contextFactory)); return realm.Run(r => r.All<BeatmapSetInfo>().FirstOrDefault(query)?.ToLive(realm));
} }
#region Delegation to BeatmapModelManager (methods which previously existed locally). #region Delegation to BeatmapModelManager (methods which previously existed locally).
@ -240,7 +240,7 @@ namespace osu.Game.Beatmaps
public void Delete(Expression<Func<BeatmapSetInfo, bool>>? filter = null, bool silent = false) public void Delete(Expression<Func<BeatmapSetInfo, bool>>? filter = null, bool silent = false)
{ {
contextFactory.Run(realm => realm.Run(realm =>
{ {
var items = realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected); var items = realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected);
@ -253,7 +253,7 @@ namespace osu.Game.Beatmaps
public void UndeleteAll() public void UndeleteAll()
{ {
contextFactory.Run(realm => beatmapModelManager.Undelete(realm.All<BeatmapSetInfo>().Where(s => s.DeletePending).ToList())); realm.Run(realm => beatmapModelManager.Undelete(realm.All<BeatmapSetInfo>().Where(s => s.DeletePending).ToList()));
} }
public void Undelete(List<BeatmapSetInfo> items, bool silent = false) public void Undelete(List<BeatmapSetInfo> items, bool silent = false)
@ -312,7 +312,7 @@ namespace osu.Game.Beatmaps
// If we seem to be missing files, now is a good time to re-fetch. // If we seem to be missing files, now is a good time to re-fetch.
if (importedBeatmap?.BeatmapSet?.Files.Count == 0) if (importedBeatmap?.BeatmapSet?.Files.Count == 0)
{ {
contextFactory.Run(realm => realm.Run(realm =>
{ {
var refetch = realm.Find<BeatmapInfo>(importedBeatmap.ID)?.Detach(); var refetch = realm.Find<BeatmapInfo>(importedBeatmap.ID)?.Detach();

8
osu.Game/Beatmaps/BeatmapModelManager.cs
View File

@ -33,8 +33,8 @@ namespace osu.Game.Beatmaps
protected override string[] HashableFileTypes => new[] { ".osu" }; protected override string[] HashableFileTypes => new[] { ".osu" };
public BeatmapModelManager(RealmContextFactory contextFactory, Storage storage, BeatmapOnlineLookupQueue? onlineLookupQueue = null) public BeatmapModelManager(RealmAccess realm, Storage storage, BeatmapOnlineLookupQueue? onlineLookupQueue = null)
: base(contextFactory, storage, onlineLookupQueue) : base(realm, storage, onlineLookupQueue)
{ {
} }
@ -98,12 +98,12 @@ namespace osu.Game.Beatmaps
/// <returns>The first result for the provided query, or null if no results were found.</returns> /// <returns>The first result for the provided query, or null if no results were found.</returns>
public BeatmapInfo? QueryBeatmap(Expression<Func<BeatmapInfo, bool>> query) public BeatmapInfo? QueryBeatmap(Expression<Func<BeatmapInfo, bool>> query)
{ {
return ContextFactory.Run(realm => realm.All<BeatmapInfo>().FirstOrDefault(query)?.Detach()); return Access.Run(realm => realm.All<BeatmapInfo>().FirstOrDefault(query)?.Detach());
} }
public void Update(BeatmapSetInfo item) public void Update(BeatmapSetInfo item)
{ {
ContextFactory.Write(realm => Access.Write(realm =>
{ {
var existing = realm.Find<BeatmapSetInfo>(item.ID); var existing = realm.Find<BeatmapSetInfo>(item.ID);
item.CopyChangesToRealm(existing); item.CopyChangesToRealm(existing);

2
osu.Game/Beatmaps/WorkingBeatmapCache.cs
View File

@ -100,7 +100,7 @@ namespace osu.Game.Beatmaps
TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore; TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
ITrackStore IBeatmapResourceProvider.Tracks => trackStore; ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
AudioManager IStorageResourceProvider.AudioManager => audioManager; AudioManager IStorageResourceProvider.AudioManager => audioManager;
RealmContextFactory IStorageResourceProvider.RealmContextFactory => null; RealmAccess IStorageResourceProvider.RealmAccess => null;
IResourceStore<byte[]> IStorageResourceProvider.Files => files; IResourceStore<byte[]> IStorageResourceProvider.Files => files;
IResourceStore<byte[]> IStorageResourceProvider.Resources => resources; IResourceStore<byte[]> IStorageResourceProvider.Resources => resources;
IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host?.CreateTextureLoaderStore(underlyingStore); IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host?.CreateTextureLoaderStore(underlyingStore);

6
osu.Game/Configuration/SettingsStore.cs
View File

@ -10,11 +10,11 @@ namespace osu.Game.Configuration
// this class mostly exists as a wrapper to avoid breaking the ruleset API (see usage in RulesetConfigManager). // this class mostly exists as a wrapper to avoid breaking the ruleset API (see usage in RulesetConfigManager).
// it may cease to exist going forward, depending on how the structure of the config data layer changes. // it may cease to exist going forward, depending on how the structure of the config data layer changes.
public readonly RealmContextFactory Realm; public readonly RealmAccess Realm;
public SettingsStore(RealmContextFactory realmFactory) public SettingsStore(RealmAccess realm)
{ {
Realm = realmFactory; Realm = realm;
} }
} }
} }

12
osu.Game/Database/EFToRealmMigrator.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Database
private DatabaseContextFactory efContextFactory { get; set; } = null!; private DatabaseContextFactory efContextFactory { get; set; } = null!;
[Resolved] [Resolved]
private RealmContextFactory realmContextFactory { get; set; } = null!; private RealmAccess realm { get; set; } = null!;
[Resolved] [Resolved]
private OsuConfigManager config { get; set; } = null!; private OsuConfigManager config { get; set; } = null!;
@ -101,7 +101,7 @@ namespace osu.Game.Database
{ {
using (var ef = efContextFactory.Get()) using (var ef = efContextFactory.Get())
{ {
realmContextFactory.Write(realm => realm.Write(realm =>
{ {
// Before beginning, ensure realm is in an empty state. // Before beginning, ensure realm is in an empty state.
// Migrations which are half-completed could lead to issues if the user tries a second time. // Migrations which are half-completed could lead to issues if the user tries a second time.
@ -158,7 +158,7 @@ namespace osu.Game.Database
int count = existingBeatmapSets.Count(); int count = existingBeatmapSets.Count();
realmContextFactory.Run(realm => realm.Run(realm =>
{ {
log($"Found {count} beatmaps in EF"); log($"Found {count} beatmaps in EF");
@ -280,7 +280,7 @@ namespace osu.Game.Database
int count = existingScores.Count(); int count = existingScores.Count();
realmContextFactory.Run(realm => realm.Run(realm =>
{ {
log($"Found {count} scores in EF"); log($"Found {count} scores in EF");
@ -369,7 +369,7 @@ namespace osu.Game.Database
break; break;
} }
realmContextFactory.Run(realm => realm.Run(realm =>
{ {
using (var transaction = realm.BeginWrite()) using (var transaction = realm.BeginWrite())
{ {
@ -428,7 +428,7 @@ namespace osu.Game.Database
log("Beginning settings migration to realm"); log("Beginning settings migration to realm");
realmContextFactory.Run(realm => realm.Run(realm =>
{ {
using (var transaction = realm.BeginWrite()) using (var transaction = realm.BeginWrite())
{ {

10
osu.Game/Database/RealmContextFactory.cs → osu.Game/Database/RealmAccess.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Database
/// <summary> /// <summary>
/// A factory which provides both the main (update thread bound) realm context and creates contexts for async usage. /// A factory which provides both the main (update thread bound) realm context and creates contexts for async usage.
/// </summary> /// </summary>
public class RealmContextFactory : IDisposable public class RealmAccess : IDisposable
{ {
private readonly Storage storage; private readonly Storage storage;
@ -123,7 +123,7 @@ namespace osu.Game.Database
/// <param name="storage">The game storage which will be used to create the realm backing file.</param> /// <param name="storage">The game storage which will be used to create the realm backing file.</param>
/// <param name="filename">The filename to use for the realm backing file. A ".realm" extension will be added automatically if not specified.</param> /// <param name="filename">The filename to use for the realm backing file. A ".realm" extension will be added automatically if not specified.</param>
/// <param name="efContextFactory">An EF factory used only for migration purposes.</param> /// <param name="efContextFactory">An EF factory used only for migration purposes.</param>
public RealmContextFactory(Storage storage, string filename, IDatabaseContextFactory? efContextFactory = null) public RealmAccess(Storage storage, string filename, IDatabaseContextFactory? efContextFactory = null)
{ {
this.storage = storage; this.storage = storage;
this.efContextFactory = efContextFactory; this.efContextFactory = efContextFactory;
@ -365,7 +365,7 @@ namespace osu.Game.Database
private Realm createContext() private Realm createContext()
{ {
if (isDisposed) if (isDisposed)
throw new ObjectDisposedException(nameof(RealmContextFactory)); throw new ObjectDisposedException(nameof(RealmAccess));
bool tookSemaphoreLock = false; bool tookSemaphoreLock = false;
@ -592,7 +592,7 @@ namespace osu.Game.Database
public IDisposable BlockAllOperations() public IDisposable BlockAllOperations()
{ {
if (isDisposed) if (isDisposed)
throw new ObjectDisposedException(nameof(RealmContextFactory)); throw new ObjectDisposedException(nameof(RealmAccess));
SynchronizationContext? syncContext = null; SynchronizationContext? syncContext = null;
@ -652,7 +652,7 @@ namespace osu.Game.Database
throw; throw;
} }
return new InvokeOnDisposal<RealmContextFactory>(this, factory => return new InvokeOnDisposal<RealmAccess>(this, factory =>
{ {
factory.contextCreationLock.Release(); factory.contextCreationLock.Release();
Logger.Log(@"Restoring realm operations.", LoggingTarget.Database); Logger.Log(@"Restoring realm operations.", LoggingTarget.Database);

14
osu.Game/Database/RealmLive.cs
View File

@ -24,17 +24,17 @@ namespace osu.Game.Database
/// </summary> /// </summary>
private readonly T data; private readonly T data;
private readonly RealmContextFactory realmFactory; private readonly RealmAccess realm;
/// <summary> /// <summary>
/// Construct a new instance of live realm data. /// Construct a new instance of live realm data.
/// </summary> /// </summary>
/// <param name="data">The realm data.</param> /// <param name="data">The realm data.</param>
/// <param name="realmFactory">The realm factory the data was sourced from. May be null for an unmanaged object.</param> /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
public RealmLive(T data, RealmContextFactory realmFactory) public RealmLive(T data, RealmAccess realm)
{ {
this.data = data; this.data = data;
this.realmFactory = realmFactory; this.realm = realm;
ID = data.ID; ID = data.ID;
} }
@ -51,7 +51,7 @@ namespace osu.Game.Database
return; return;
} }
realmFactory.Run(realm => realm.Run(realm =>
{ {
perform(retrieveFromID(realm, ID)); perform(retrieveFromID(realm, ID));
}); });
@ -66,7 +66,7 @@ namespace osu.Game.Database
if (!IsManaged) if (!IsManaged)
return perform(data); return perform(data);
return realmFactory.Run(realm => return realm.Run(realm =>
{ {
var returnData = perform(retrieveFromID(realm, ID)); var returnData = perform(retrieveFromID(realm, ID));
@ -104,7 +104,7 @@ namespace osu.Game.Database
if (!ThreadSafety.IsUpdateThread) if (!ThreadSafety.IsUpdateThread)
throw new InvalidOperationException($"Can't use {nameof(Value)} on managed objects from non-update threads"); throw new InvalidOperationException($"Can't use {nameof(Value)} on managed objects from non-update threads");
return realmFactory.Context.Find<T>(ID); return realm.Realm.Find<T>(ID);
} }
} }

12
osu.Game/Database/RealmObjectExtensions.cs
View File

@ -216,16 +216,16 @@ namespace osu.Game.Database
return new RealmLiveUnmanaged<T>(realmObject); return new RealmLiveUnmanaged<T>(realmObject);
} }
public static List<ILive<T>> ToLive<T>(this IEnumerable<T> realmList, RealmContextFactory realmContextFactory) public static List<ILive<T>> ToLive<T>(this IEnumerable<T> realmList, RealmAccess realm)
where T : RealmObject, IHasGuidPrimaryKey where T : RealmObject, IHasGuidPrimaryKey
{ {
return realmList.Select(l => new RealmLive<T>(l, realmContextFactory)).Cast<ILive<T>>().ToList(); return realmList.Select(l => new RealmLive<T>(l, realm)).Cast<ILive<T>>().ToList();
} }
public static ILive<T> ToLive<T>(this T realmObject, RealmContextFactory realmContextFactory) public static ILive<T> ToLive<T>(this T realmObject, RealmAccess realm)
where T : RealmObject, IHasGuidPrimaryKey where T : RealmObject, IHasGuidPrimaryKey
{ {
return new RealmLive<T>(realmObject, realmContextFactory); return new RealmLive<T>(realmObject, realm);
} }
/// <summary> /// <summary>
@ -271,8 +271,8 @@ namespace osu.Game.Database
public static IDisposable? QueryAsyncWithNotifications<T>(this IRealmCollection<T> collection, NotificationCallbackDelegate<T> callback) public static IDisposable? QueryAsyncWithNotifications<T>(this IRealmCollection<T> collection, NotificationCallbackDelegate<T> callback)
where T : RealmObjectBase where T : RealmObjectBase
{ {
if (!RealmContextFactory.CurrentThreadSubscriptionsAllowed) if (!RealmAccess.CurrentThreadSubscriptionsAllowed)
throw new InvalidOperationException($"Make sure to call {nameof(RealmContextFactory)}.{nameof(RealmContextFactory.RegisterForNotifications)}"); throw new InvalidOperationException($"Make sure to call {nameof(RealmAccess)}.{nameof(RealmAccess.RegisterForNotifications)}");
return collection.SubscribeForNotifications(callback); return collection.SubscribeForNotifications(callback);
} }

2
osu.Game/IO/IStorageResourceProvider.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.IO
/// <summary> /// <summary>
/// Access realm. /// Access realm.
/// </summary> /// </summary>
RealmContextFactory RealmContextFactory { get; } RealmAccess RealmAccess { get; }
/// <summary> /// <summary>
/// Create a texture loader store based on an underlying data store. /// Create a texture loader store based on an underlying data store.

8
osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Input.Bindings
private IDisposable realmSubscription; private IDisposable realmSubscription;
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
public override IEnumerable<IKeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings(variant ?? 0); public override IEnumerable<IKeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings(variant ?? 0);
@ -49,13 +49,13 @@ namespace osu.Game.Input.Bindings
private IQueryable<RealmKeyBinding> queryRealmKeyBindings() private IQueryable<RealmKeyBinding> queryRealmKeyBindings()
{ {
string rulesetName = ruleset?.ShortName; string rulesetName = ruleset?.ShortName;
return realmFactory.Context.All<RealmKeyBinding>() return realm.Realm.All<RealmKeyBinding>()
.Where(b => b.RulesetName == rulesetName && b.Variant == variant); .Where(b => b.RulesetName == rulesetName && b.Variant == variant);
} }
protected override void LoadComplete() protected override void LoadComplete()
{ {
realmSubscription = realmFactory.RegisterForNotifications(realm => queryRealmKeyBindings(), (sender, changes, error) => realmSubscription = realm.RegisterForNotifications(realm => queryRealmKeyBindings(), (sender, changes, error) =>
{ {
// The first fire of this is a bit redundant as this is being called in base.LoadComplete, // The first fire of this is a bit redundant as this is being called in base.LoadComplete,
// but this is safest in case the subscription is restored after a context recycle. // but this is safest in case the subscription is restored after a context recycle.

10
osu.Game/Input/RealmKeyBindingStore.cs
View File

@ -16,12 +16,12 @@ namespace osu.Game.Input
{ {
public class RealmKeyBindingStore public class RealmKeyBindingStore
{ {
private readonly RealmContextFactory realmFactory; private readonly RealmAccess realm;
private readonly ReadableKeyCombinationProvider keyCombinationProvider; private readonly ReadableKeyCombinationProvider keyCombinationProvider;
public RealmKeyBindingStore(RealmContextFactory realmFactory, ReadableKeyCombinationProvider keyCombinationProvider) public RealmKeyBindingStore(RealmAccess realm, ReadableKeyCombinationProvider keyCombinationProvider)
{ {
this.realmFactory = realmFactory; this.realm = realm;
this.keyCombinationProvider = keyCombinationProvider; this.keyCombinationProvider = keyCombinationProvider;
} }
@ -34,7 +34,7 @@ namespace osu.Game.Input
{ {
List<string> combinations = new List<string>(); List<string> combinations = new List<string>();
realmFactory.Run(context => realm.Run(context =>
{ {
foreach (var action in context.All<RealmKeyBinding>().Where(b => string.IsNullOrEmpty(b.RulesetName) && (GlobalAction)b.ActionInt == globalAction)) foreach (var action in context.All<RealmKeyBinding>().Where(b => string.IsNullOrEmpty(b.RulesetName) && (GlobalAction)b.ActionInt == globalAction))
{ {
@ -56,7 +56,7 @@ namespace osu.Game.Input
/// <param name="rulesets">The rulesets to populate defaults from.</param> /// <param name="rulesets">The rulesets to populate defaults from.</param>
public void Register(KeyBindingContainer container, IEnumerable<RulesetInfo> rulesets) public void Register(KeyBindingContainer container, IEnumerable<RulesetInfo> rulesets)
{ {
realmFactory.Run(realm => realm.Run(realm =>
{ {
using (var transaction = realm.BeginWrite()) using (var transaction = realm.BeginWrite())
{ {

4
osu.Game/Online/BeatmapDownloadTracker.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Online
private IDisposable? realmSubscription; private IDisposable? realmSubscription;
[Resolved] [Resolved]
private RealmContextFactory realmContextFactory { get; set; } = null!; private RealmAccess realm { get; set; } = null!;
public BeatmapDownloadTracker(IBeatmapSetInfo trackedItem) public BeatmapDownloadTracker(IBeatmapSetInfo trackedItem)
: base(trackedItem) : base(trackedItem)
@ -42,7 +42,7 @@ namespace osu.Game.Online
// Used to interact with manager classes that don't support interface types. Will eventually be replaced. // Used to interact with manager classes that don't support interface types. Will eventually be replaced.
var beatmapSetInfo = new BeatmapSetInfo { OnlineID = TrackedItem.OnlineID }; var beatmapSetInfo = new BeatmapSetInfo { OnlineID = TrackedItem.OnlineID };
realmSubscription = realmContextFactory.RegisterForNotifications(realm => realm.All<BeatmapSetInfo>().Where(s => s.OnlineID == TrackedItem.OnlineID && !s.DeletePending), (items, changes, ___) => realmSubscription = realm.RegisterForNotifications(realm => realm.All<BeatmapSetInfo>().Where(s => s.OnlineID == TrackedItem.OnlineID && !s.DeletePending), (items, changes, ___) =>
{ {
if (items.Any()) if (items.Any())
Schedule(() => UpdateState(DownloadState.LocallyAvailable)); Schedule(() => UpdateState(DownloadState.LocallyAvailable));

10
osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Online.Rooms
protected override bool RequiresChildrenUpdate => true; protected override bool RequiresChildrenUpdate => true;
[Resolved] [Resolved]
private RealmContextFactory realmContextFactory { get; set; } = null!; private RealmAccess realm { get; set; } = null!;
/// <summary> /// <summary>
/// The availability state of the currently selected playlist item. /// The availability state of the currently selected playlist item.
@ -78,7 +78,7 @@ namespace osu.Game.Online.Rooms
// handles changes to hash that didn't occur from the import process (ie. a user editing the beatmap in the editor, somehow). // handles changes to hash that didn't occur from the import process (ie. a user editing the beatmap in the editor, somehow).
realmSubscription?.Dispose(); realmSubscription?.Dispose();
realmSubscription = realmContextFactory.RegisterForNotifications(realm => filteredBeatmaps(), (items, changes, ___) => realmSubscription = realm.RegisterForNotifications(realm => filteredBeatmaps(), (items, changes, ___) =>
{ {
if (changes == null) if (changes == null)
return; return;
@ -128,9 +128,9 @@ namespace osu.Game.Online.Rooms
int onlineId = SelectedItem.Value.Beatmap.Value.OnlineID; int onlineId = SelectedItem.Value.Beatmap.Value.OnlineID;
string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash; string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
return realmContextFactory.Context return realm.Realm
.All<BeatmapInfo>() .All<BeatmapInfo>()
.Filter("OnlineID == $0 && MD5Hash == $1 && BeatmapSet.DeletePending == false", onlineId, checksum); .Filter("OnlineID == $0 && MD5Hash == $1 && BeatmapSet.DeletePending == false", onlineId, checksum);
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)

4
osu.Game/Online/ScoreDownloadTracker.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Online
private IDisposable? realmSubscription; private IDisposable? realmSubscription;
[Resolved] [Resolved]
private RealmContextFactory realmContextFactory { get; set; } = null!; private RealmAccess realm { get; set; } = null!;
public ScoreDownloadTracker(ScoreInfo trackedItem) public ScoreDownloadTracker(ScoreInfo trackedItem)
: base(trackedItem) : base(trackedItem)
@ -47,7 +47,7 @@ namespace osu.Game.Online
Downloader.DownloadBegan += downloadBegan; Downloader.DownloadBegan += downloadBegan;
Downloader.DownloadFailed += downloadFailed; Downloader.DownloadFailed += downloadFailed;
realmSubscription = realmContextFactory.RegisterForNotifications(realm => realm.All<ScoreInfo>().Where(s => ((s.OnlineID > 0 && s.OnlineID == TrackedItem.OnlineID) || s.Hash == TrackedItem.Hash) && !s.DeletePending), (items, changes, ___) => realmSubscription = realm.RegisterForNotifications(realm => realm.All<ScoreInfo>().Where(s => ((s.OnlineID > 0 && s.OnlineID == TrackedItem.OnlineID) || s.Hash == TrackedItem.Hash) && !s.DeletePending), (items, changes, ___) =>
{ {
if (items.Any()) if (items.Any())
Schedule(() => UpdateState(DownloadState.LocallyAvailable)); Schedule(() => UpdateState(DownloadState.LocallyAvailable));

22
osu.Game/OsuGameBase.cs
View File

@ -149,7 +149,7 @@ namespace osu.Game
private MultiplayerClient multiplayerClient; private MultiplayerClient multiplayerClient;
private RealmContextFactory realmFactory; private RealmAccess realm;
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
@ -192,9 +192,9 @@ namespace osu.Game
if (Storage.Exists(DatabaseContextFactory.DATABASE_NAME)) if (Storage.Exists(DatabaseContextFactory.DATABASE_NAME))
dependencies.Cache(EFContextFactory = new DatabaseContextFactory(Storage)); dependencies.Cache(EFContextFactory = new DatabaseContextFactory(Storage));
dependencies.Cache(realmFactory = new RealmContextFactory(Storage, "client", EFContextFactory)); dependencies.Cache(realm = new RealmAccess(Storage, "client", EFContextFactory));
dependencies.Cache(RulesetStore = new RulesetStore(realmFactory, Storage)); dependencies.Cache(RulesetStore = new RulesetStore(realm, Storage));
dependencies.CacheAs<IRulesetStore>(RulesetStore); dependencies.CacheAs<IRulesetStore>(RulesetStore);
// Backup is taken here rather than in EFToRealmMigrator to avoid recycling realm contexts // Backup is taken here rather than in EFToRealmMigrator to avoid recycling realm contexts
@ -205,7 +205,7 @@ namespace osu.Game
string migration = $"before_final_migration_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}"; string migration = $"before_final_migration_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
EFContextFactory.CreateBackup($"client.{migration}.db"); EFContextFactory.CreateBackup($"client.{migration}.db");
realmFactory.CreateBackup($"client.{migration}.realm"); realm.CreateBackup($"client.{migration}.realm");
using (var source = Storage.GetStream("collection.db")) using (var source = Storage.GetStream("collection.db"))
using (var destination = Storage.GetStream($"collection.{migration}.db", FileAccess.Write, FileMode.CreateNew)) using (var destination = Storage.GetStream($"collection.{migration}.db", FileAccess.Write, FileMode.CreateNew))
@ -225,7 +225,7 @@ namespace osu.Game
Audio.Samples.PlaybackConcurrency = SAMPLE_CONCURRENCY; Audio.Samples.PlaybackConcurrency = SAMPLE_CONCURRENCY;
dependencies.Cache(SkinManager = new SkinManager(Storage, realmFactory, Host, Resources, Audio, Scheduler)); dependencies.Cache(SkinManager = new SkinManager(Storage, realm, Host, Resources, Audio, Scheduler));
dependencies.CacheAs<ISkinSource>(SkinManager); dependencies.CacheAs<ISkinSource>(SkinManager);
EndpointConfiguration endpoints = UseDevelopmentServer ? (EndpointConfiguration)new DevelopmentEndpointConfiguration() : new ProductionEndpointConfiguration(); EndpointConfiguration endpoints = UseDevelopmentServer ? (EndpointConfiguration)new DevelopmentEndpointConfiguration() : new ProductionEndpointConfiguration();
@ -240,8 +240,8 @@ namespace osu.Game
var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures); var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
// ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup() // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, realmFactory, Scheduler, Host, () => difficultyCache, LocalConfig)); dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, realm, Scheduler, Host, () => difficultyCache, LocalConfig));
dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, realmFactory, RulesetStore, API, Audio, Resources, Host, defaultBeatmap, performOnlineLookups: true)); dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, realm, RulesetStore, API, Audio, Resources, Host, defaultBeatmap, performOnlineLookups: true));
dependencies.Cache(BeatmapDownloader = new BeatmapModelDownloader(BeatmapManager, API)); dependencies.Cache(BeatmapDownloader = new BeatmapModelDownloader(BeatmapManager, API));
dependencies.Cache(ScoreDownloader = new ScoreModelDownloader(ScoreManager, API)); dependencies.Cache(ScoreDownloader = new ScoreModelDownloader(ScoreManager, API));
@ -259,7 +259,7 @@ namespace osu.Game
dependencies.Cache(scorePerformanceManager); dependencies.Cache(scorePerformanceManager);
AddInternal(scorePerformanceManager); AddInternal(scorePerformanceManager);
dependencies.CacheAs<IRulesetConfigCache>(rulesetConfigCache = new RulesetConfigCache(realmFactory, RulesetStore)); dependencies.CacheAs<IRulesetConfigCache>(rulesetConfigCache = new RulesetConfigCache(realm, RulesetStore));
var powerStatus = CreateBatteryInfo(); var powerStatus = CreateBatteryInfo();
if (powerStatus != null) if (powerStatus != null)
@ -303,7 +303,7 @@ namespace osu.Game
base.Content.Add(CreateScalingContainer().WithChildren(mainContent)); base.Content.Add(CreateScalingContainer().WithChildren(mainContent));
KeyBindingStore = new RealmKeyBindingStore(realmFactory, keyCombinationProvider); KeyBindingStore = new RealmKeyBindingStore(realm, keyCombinationProvider);
KeyBindingStore.Register(globalBindings, RulesetStore.AvailableRulesets); KeyBindingStore.Register(globalBindings, RulesetStore.AvailableRulesets);
dependencies.Cache(globalBindings); dependencies.Cache(globalBindings);
@ -405,7 +405,7 @@ namespace osu.Game
Scheduler.Add(() => Scheduler.Add(() =>
{ {
realmBlocker = realmFactory.BlockAllOperations(); realmBlocker = realm.BlockAllOperations();
readyToRun.Set(); readyToRun.Set();
}, false); }, false);
@ -483,7 +483,7 @@ namespace osu.Game
BeatmapManager?.Dispose(); BeatmapManager?.Dispose();
LocalConfig?.Dispose(); LocalConfig?.Dispose();
realmFactory?.Dispose(); realm?.Dispose();
} }
} }
} }

10
osu.Game/Overlays/MusicController.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Overlays
public DrawableTrack CurrentTrack { get; private set; } = new DrawableTrack(new TrackVirtual(1000)); public DrawableTrack CurrentTrack { get; private set; } = new DrawableTrack(new TrackVirtual(1000));
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
@ -81,9 +81,9 @@ namespace osu.Game.Overlays
} }
private IQueryable<BeatmapSetInfo> queryRealmBeatmapSets() => private IQueryable<BeatmapSetInfo> queryRealmBeatmapSets() =>
realmFactory.Context realm.Realm
.All<BeatmapSetInfo>() .All<BeatmapSetInfo>()
.Where(s => !s.DeletePending); .Where(s => !s.DeletePending);
protected override void LoadComplete() protected override void LoadComplete()
{ {
@ -94,7 +94,7 @@ namespace osu.Game.Overlays
foreach (var s in queryRealmBeatmapSets()) foreach (var s in queryRealmBeatmapSets())
beatmapSets.Add(s.Detach()); beatmapSets.Add(s.Detach());
beatmapSubscription = realmFactory.RegisterForNotifications(realm => queryRealmBeatmapSets(), beatmapsChanged); beatmapSubscription = realm.RegisterForNotifications(realm => queryRealmBeatmapSets(), beatmapsChanged);
} }
private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet changes, Exception error) private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet changes, Exception error)

6
osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
protected override LocalisableString Header => DebugSettingsStrings.MemoryHeader; protected override LocalisableString Header => DebugSettingsStrings.MemoryHeader;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(GameHost host, RealmContextFactory realmFactory) private void load(GameHost host, RealmAccess realm)
{ {
SettingsButton blockAction; SettingsButton blockAction;
SettingsButton unblockAction; SettingsButton unblockAction;
@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
Action = () => Action = () =>
{ {
// Blocking operations implicitly causes a Compact(). // Blocking operations implicitly causes a Compact().
using (realmFactory.BlockAllOperations()) using (realm.BlockAllOperations())
{ {
} }
} }
@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
{ {
try try
{ {
var token = realmFactory.BlockAllOperations(); var token = realm.BlockAllOperations();
blockAction.Enabled.Value = false; blockAction.Enabled.Value = false;

4
osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
} }
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider) private void load(OverlayColourProvider colourProvider)
@ -386,7 +386,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private void updateStoreFromButton(KeyButton button) private void updateStoreFromButton(KeyButton button)
{ {
realmFactory.Run(realm => realm.Run(realm =>
{ {
var binding = realm.Find<RealmKeyBinding>(((IHasGuidPrimaryKey)button.KeyBinding).ID); var binding = realm.Find<RealmKeyBinding>(((IHasGuidPrimaryKey)button.KeyBinding).ID);
realm.Write(() => binding.KeyCombinationString = button.KeyBinding.KeyCombinationString); realm.Write(() => binding.KeyCombinationString = button.KeyBinding.KeyCombinationString);

8
osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
View File

@ -30,13 +30,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(RealmContextFactory realmFactory) private void load(RealmAccess realm)
{ {
string rulesetName = Ruleset?.ShortName; string rulesetName = Ruleset?.ShortName;
var bindings = realmFactory.Run(realm => realm.All<RealmKeyBinding>() var bindings = realm.Run(r => r.All<RealmKeyBinding>()
.Where(b => b.RulesetName == rulesetName && b.Variant == variant) .Where(b => b.RulesetName == rulesetName && b.Variant == variant)
.Detach()); .Detach());
foreach (var defaultGroup in Defaults.GroupBy(d => d.Action)) foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
{ {

14
osu.Game/Overlays/Settings/Sections/SkinSection.cs
View File

@ -47,15 +47,15 @@ namespace osu.Game.Overlays.Settings.Sections
private SkinManager skins { get; set; } private SkinManager skins { get; set; }
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
private IDisposable realmSubscription; private IDisposable realmSubscription;
private IQueryable<SkinInfo> queryRealmSkins() => private IQueryable<SkinInfo> queryRealmSkins() =>
realmFactory.Context.All<SkinInfo>() realm.Realm.All<SkinInfo>()
.Where(s => !s.DeletePending) .Where(s => !s.DeletePending)
.OrderByDescending(s => s.Protected) // protected skins should be at the top. .OrderByDescending(s => s.Protected) // protected skins should be at the top.
.ThenBy(s => s.Name, StringComparer.OrdinalIgnoreCase); .ThenBy(s => s.Name, StringComparer.OrdinalIgnoreCase);
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuConfigManager config, [CanBeNull] SkinEditorOverlay skinEditor) private void load(OsuConfigManager config, [CanBeNull] SkinEditorOverlay skinEditor)
@ -83,7 +83,7 @@ namespace osu.Game.Overlays.Settings.Sections
skinDropdown.Current = dropdownBindable; skinDropdown.Current = dropdownBindable;
realmSubscription = realmFactory.RegisterForNotifications(realm => queryRealmSkins(), (sender, changes, error) => realmSubscription = realm.RegisterForNotifications(realm => queryRealmSkins(), (sender, changes, error) =>
{ {
// The first fire of this is a bit redundant due to the call below, // The first fire of this is a bit redundant due to the call below,
// but this is safest in case the subscription is restored after a context recycle. // but this is safest in case the subscription is restored after a context recycle.
@ -130,7 +130,7 @@ namespace osu.Game.Overlays.Settings.Sections
{ {
int protectedCount = queryRealmSkins().Count(s => s.Protected); int protectedCount = queryRealmSkins().Count(s => s.Protected);
skinItems = queryRealmSkins().ToLive(realmFactory); skinItems = queryRealmSkins().ToLive(realm);
skinItems.Insert(protectedCount, random_skin_info); skinItems.Insert(protectedCount, random_skin_info);

4
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Toolbar
protected FillFlowContainer Flow; protected FillFlowContainer Flow;
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
protected ToolbarButton() protected ToolbarButton()
: base(HoverSampleSet.Toolbar) : base(HoverSampleSet.Toolbar)
@ -207,7 +207,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
if (Hotkey == null) return; if (Hotkey == null) return;
var realmKeyBinding = realmFactory.Context.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetName == null && rkb.ActionInt == (int)Hotkey.Value); var realmKeyBinding = realm.Realm.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetName == null && rkb.ActionInt == (int)Hotkey.Value);
if (realmKeyBinding != null) if (realmKeyBinding != null)
{ {

12
osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Configuration
public abstract class RulesetConfigManager<TLookup> : ConfigManager<TLookup>, IRulesetConfigManager public abstract class RulesetConfigManager<TLookup> : ConfigManager<TLookup>, IRulesetConfigManager
where TLookup : struct, Enum where TLookup : struct, Enum
{ {
private readonly RealmContextFactory realmFactory; private readonly RealmAccess realm;
private readonly int variant; private readonly int variant;
@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Configuration
protected RulesetConfigManager(SettingsStore store, RulesetInfo ruleset, int? variant = null) protected RulesetConfigManager(SettingsStore store, RulesetInfo ruleset, int? variant = null)
{ {
realmFactory = store?.Realm; realm = store?.Realm;
rulesetName = ruleset.ShortName; rulesetName = ruleset.ShortName;
@ -37,10 +37,10 @@ namespace osu.Game.Rulesets.Configuration
protected override void PerformLoad() protected override void PerformLoad()
{ {
if (realmFactory != null) if (realm != null)
{ {
// As long as RulesetConfigCache exists, there is no need to subscribe to realm events. // As long as RulesetConfigCache exists, there is no need to subscribe to realm events.
databasedSettings = realmFactory.Context.All<RealmRulesetSetting>().Where(b => b.RulesetName == rulesetName && b.Variant == variant).ToList(); databasedSettings = realm.Realm.All<RealmRulesetSetting>().Where(b => b.RulesetName == rulesetName && b.Variant == variant).ToList();
} }
} }
@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Configuration
pendingWrites.Clear(); pendingWrites.Clear();
} }
realmFactory?.Write(realm => realm?.Write(realm =>
{ {
foreach (var c in changed) foreach (var c in changed)
{ {
@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Configuration
Variant = variant, Variant = variant,
}; };
realmFactory?.Context.Write(() => realmFactory.Context.Add(setting)); realm?.Realm.Write(() => realm.Realm.Add(setting));
databasedSettings.Add(setting); databasedSettings.Add(setting);
} }

8
osu.Game/Rulesets/RulesetConfigCache.cs
View File

@ -13,14 +13,14 @@ namespace osu.Game.Rulesets
{ {
public class RulesetConfigCache : Component, IRulesetConfigCache public class RulesetConfigCache : Component, IRulesetConfigCache
{ {
private readonly RealmContextFactory realmFactory; private readonly RealmAccess realm;
private readonly RulesetStore rulesets; private readonly RulesetStore rulesets;
private readonly Dictionary<string, IRulesetConfigManager> configCache = new Dictionary<string, IRulesetConfigManager>(); private readonly Dictionary<string, IRulesetConfigManager> configCache = new Dictionary<string, IRulesetConfigManager>();
public RulesetConfigCache(RealmContextFactory realmFactory, RulesetStore rulesets) public RulesetConfigCache(RealmAccess realm, RulesetStore rulesets)
{ {
this.realmFactory = realmFactory; this.realm = realm;
this.rulesets = rulesets; this.rulesets = rulesets;
} }
@ -28,7 +28,7 @@ namespace osu.Game.Rulesets
{ {
base.LoadComplete(); base.LoadComplete();
var settingsStore = new SettingsStore(realmFactory); var settingsStore = new SettingsStore(realm);
// let's keep things simple for now and just retrieve all the required configs at startup.. // let's keep things simple for now and just retrieve all the required configs at startup..
foreach (var ruleset in rulesets.AvailableRulesets) foreach (var ruleset in rulesets.AvailableRulesets)

8
osu.Game/Rulesets/RulesetStore.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Rulesets
{ {
public class RulesetStore : IDisposable, IRulesetStore public class RulesetStore : IDisposable, IRulesetStore
{ {
private readonly RealmContextFactory realmFactory; private readonly RealmAccess realm;
private const string ruleset_library_prefix = @"osu.Game.Rulesets"; private const string ruleset_library_prefix = @"osu.Game.Rulesets";
@ -31,9 +31,9 @@ namespace osu.Game.Rulesets
private readonly List<RulesetInfo> availableRulesets = new List<RulesetInfo>(); private readonly List<RulesetInfo> availableRulesets = new List<RulesetInfo>();
public RulesetStore(RealmContextFactory realmFactory, Storage? storage = null) public RulesetStore(RealmAccess realm, Storage? storage = null)
{ {
this.realmFactory = realmFactory; this.realm = realm;
// On android in release configuration assemblies are loaded from the apk directly into memory. // On android in release configuration assemblies are loaded from the apk directly into memory.
// We cannot read assemblies from cwd, so should check loaded assemblies instead. // We cannot read assemblies from cwd, so should check loaded assemblies instead.
@ -100,7 +100,7 @@ namespace osu.Game.Rulesets
private void addMissingRulesets() private void addMissingRulesets()
{ {
realmFactory.Write(realm => realm.Write(realm =>
{ {
var rulesets = realm.All<RulesetInfo>(); var rulesets = realm.All<RulesetInfo>();

12
osu.Game/Scoring/ScoreManager.cs
View File

@ -25,21 +25,21 @@ namespace osu.Game.Scoring
{ {
public class ScoreManager : IModelManager<ScoreInfo>, IModelImporter<ScoreInfo> public class ScoreManager : IModelManager<ScoreInfo>, IModelImporter<ScoreInfo>
{ {
private readonly RealmContextFactory contextFactory; private readonly RealmAccess realm;
private readonly Scheduler scheduler; private readonly Scheduler scheduler;
private readonly Func<BeatmapDifficultyCache> difficulties; private readonly Func<BeatmapDifficultyCache> difficulties;
private readonly OsuConfigManager configManager; private readonly OsuConfigManager configManager;
private readonly ScoreModelManager scoreModelManager; private readonly ScoreModelManager scoreModelManager;
public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmContextFactory contextFactory, Scheduler scheduler, public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, Scheduler scheduler,
IIpcHost importHost = null, Func<BeatmapDifficultyCache> difficulties = null, OsuConfigManager configManager = null) IIpcHost importHost = null, Func<BeatmapDifficultyCache> difficulties = null, OsuConfigManager configManager = null)
{ {
this.contextFactory = contextFactory; this.realm = realm;
this.scheduler = scheduler; this.scheduler = scheduler;
this.difficulties = difficulties; this.difficulties = difficulties;
this.configManager = configManager; this.configManager = configManager;
scoreModelManager = new ScoreModelManager(rulesets, beatmaps, storage, contextFactory); scoreModelManager = new ScoreModelManager(rulesets, beatmaps, storage, realm);
} }
public Score GetScore(ScoreInfo score) => scoreModelManager.GetScore(score); public Score GetScore(ScoreInfo score) => scoreModelManager.GetScore(score);
@ -51,7 +51,7 @@ namespace osu.Game.Scoring
/// <returns>The first result for the provided query, or null if no results were found.</returns> /// <returns>The first result for the provided query, or null if no results were found.</returns>
public ScoreInfo Query(Expression<Func<ScoreInfo, bool>> query) public ScoreInfo Query(Expression<Func<ScoreInfo, bool>> query)
{ {
return contextFactory.Run(realm => realm.All<ScoreInfo>().FirstOrDefault(query)?.Detach()); return realm.Run(realm => realm.All<ScoreInfo>().FirstOrDefault(query)?.Detach());
} }
/// <summary> /// <summary>
@ -254,7 +254,7 @@ namespace osu.Game.Scoring
public void Delete([CanBeNull] Expression<Func<ScoreInfo, bool>> filter = null, bool silent = false) public void Delete([CanBeNull] Expression<Func<ScoreInfo, bool>> filter = null, bool silent = false)
{ {
contextFactory.Run(realm => realm.Run(realm =>
{ {
var items = realm.All<ScoreInfo>() var items = realm.All<ScoreInfo>()
.Where(s => !s.DeletePending); .Where(s => !s.DeletePending);

6
osu.Game/Scoring/ScoreModelManager.cs
View File

@ -29,8 +29,8 @@ namespace osu.Game.Scoring
private readonly RulesetStore rulesets; private readonly RulesetStore rulesets;
private readonly Func<BeatmapManager> beatmaps; private readonly Func<BeatmapManager> beatmaps;
public ScoreModelManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmContextFactory contextFactory) public ScoreModelManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm)
: base(storage, contextFactory) : base(storage, realm)
{ {
this.rulesets = rulesets; this.rulesets = rulesets;
this.beatmaps = beatmaps; this.beatmaps = beatmaps;
@ -74,7 +74,7 @@ namespace osu.Game.Scoring
public override bool IsAvailableLocally(ScoreInfo model) public override bool IsAvailableLocally(ScoreInfo model)
{ {
return ContextFactory.Run(realm => realm.All<ScoreInfo>().Any(s => s.OnlineID == model.OnlineID)); return Access.Run(realm => realm.All<ScoreInfo>().Any(s => s.OnlineID == model.OnlineID));
} }
} }
} }

6
osu.Game/Screens/Menu/IntroScreen.cs
View File

@ -85,7 +85,7 @@ namespace osu.Game.Screens.Menu
private BeatmapManager beatmaps { get; set; } private BeatmapManager beatmaps { get; set; }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, Framework.Game game, RealmContextFactory realmContextFactory) private void load(OsuConfigManager config, Framework.Game game, RealmAccess realm)
{ {
// prevent user from changing beatmap while the intro is still running. // prevent user from changing beatmap while the intro is still running.
beatmap = Beatmap.BeginLease(false); beatmap = Beatmap.BeginLease(false);
@ -97,9 +97,9 @@ namespace osu.Game.Screens.Menu
// if the user has requested not to play theme music, we should attempt to find a random beatmap from their collection. // if the user has requested not to play theme music, we should attempt to find a random beatmap from their collection.
if (!MenuMusic.Value) if (!MenuMusic.Value)
{ {
realmContextFactory.Run(realm => realm.Run(r =>
{ {
var usableBeatmapSets = realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected).AsRealmCollection(); var usableBeatmapSets = r.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected).AsRealmCollection();
int setCount = usableBeatmapSets.Count; int setCount = usableBeatmapSets.Count;

14
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -179,24 +179,24 @@ namespace osu.Game.Screens.Select
if (!loadedTestBeatmaps) if (!loadedTestBeatmaps)
{ {
realmFactory.Run(realm => loadBeatmapSets(getBeatmapSets(realm))); realm.Run(realm => loadBeatmapSets(getBeatmapSets(realm)));
} }
} }
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
subscriptionSets = realmFactory.RegisterForNotifications(getBeatmapSets, beatmapSetsChanged); subscriptionSets = realm.RegisterForNotifications(getBeatmapSets, beatmapSetsChanged);
subscriptionBeatmaps = realmFactory.RegisterForNotifications(realm => realm.All<BeatmapInfo>().Where(b => !b.Hidden), beatmapsChanged); subscriptionBeatmaps = realm.RegisterForNotifications(realm => realm.All<BeatmapInfo>().Where(b => !b.Hidden), beatmapsChanged);
// Can't use main subscriptions because we can't lookup deleted indices. // Can't use main subscriptions because we can't lookup deleted indices.
// https://github.com/realm/realm-dotnet/discussions/2634#discussioncomment-1605595. // https://github.com/realm/realm-dotnet/discussions/2634#discussioncomment-1605595.
subscriptionDeletedSets = realmFactory.RegisterForNotifications(realm => realm.All<BeatmapSetInfo>().Where(s => s.DeletePending && !s.Protected), deletedBeatmapSetsChanged); subscriptionDeletedSets = realm.RegisterForNotifications(realm => realm.All<BeatmapSetInfo>().Where(s => s.DeletePending && !s.Protected), deletedBeatmapSetsChanged);
subscriptionHiddenBeatmaps = realmFactory.RegisterForNotifications(realm => realm.All<BeatmapInfo>().Where(b => b.Hidden), beatmapsChanged); subscriptionHiddenBeatmaps = realm.RegisterForNotifications(realm => realm.All<BeatmapInfo>().Where(b => b.Hidden), beatmapsChanged);
} }
private void deletedBeatmapSetsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet changes, Exception error) private void deletedBeatmapSetsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet changes, Exception error)
@ -231,7 +231,7 @@ namespace osu.Game.Screens.Select
foreach (var id in realmSets) foreach (var id in realmSets)
{ {
if (!root.BeatmapSetsByID.ContainsKey(id)) if (!root.BeatmapSetsByID.ContainsKey(id))
UpdateBeatmapSet(realmFactory.Context.Find<BeatmapSetInfo>(id).Detach()); UpdateBeatmapSet(realm.Realm.Find<BeatmapSetInfo>(id).Detach());
} }
foreach (var id in root.BeatmapSetsByID.Keys) foreach (var id in root.BeatmapSetsByID.Keys)

4
osu.Game/Screens/Select/Carousel/TopLocalRank.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.Select.Carousel
private IBindable<RulesetInfo> ruleset { get; set; } private IBindable<RulesetInfo> ruleset { get; set; }
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
[Resolved] [Resolved]
private IAPIProvider api { get; set; } private IAPIProvider api { get; set; }
@ -48,7 +48,7 @@ namespace osu.Game.Screens.Select.Carousel
ruleset.BindValueChanged(_ => ruleset.BindValueChanged(_ =>
{ {
scoreSubscription?.Dispose(); scoreSubscription?.Dispose();
scoreSubscription = realmFactory.RegisterForNotifications(realm => scoreSubscription = realm.RegisterForNotifications(realm =>
realm.All<ScoreInfo>() realm.All<ScoreInfo>()
.Filter($"{nameof(ScoreInfo.User)}.{nameof(RealmUser.OnlineID)} == $0" .Filter($"{nameof(ScoreInfo.User)}.{nameof(RealmUser.OnlineID)} == $0"
+ $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $1" + $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $1"

6
osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.Select.Leaderboards
private RulesetStore rulesets { get; set; } private RulesetStore rulesets { get; set; }
[Resolved] [Resolved]
private RealmContextFactory realmFactory { get; set; } private RealmAccess realm { get; set; }
private BeatmapInfo beatmapInfo; private BeatmapInfo beatmapInfo;
@ -113,7 +113,7 @@ namespace osu.Game.Screens.Select.Leaderboards
if (beatmapInfo == null) if (beatmapInfo == null)
return; return;
scoreSubscription = realmFactory.RegisterForNotifications(realm => scoreSubscription = realm.RegisterForNotifications(realm =>
realm.All<ScoreInfo>() realm.All<ScoreInfo>()
.Filter($"{nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} = $0", beatmapInfo.ID), .Filter($"{nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} = $0", beatmapInfo.ID),
(_, changes, ___) => (_, changes, ___) =>
@ -150,7 +150,7 @@ namespace osu.Game.Screens.Select.Leaderboards
if (Scope == BeatmapLeaderboardScope.Local) if (Scope == BeatmapLeaderboardScope.Local)
{ {
realmFactory.Run(realm => realm.Run(realm =>
{ {
var scores = realm.All<ScoreInfo>() var scores = realm.All<ScoreInfo>()
.AsEnumerable() .AsEnumerable()

4
osu.Game/Screens/Spectate/SpectatorScreen.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Spectate
} }
[Resolved] [Resolved]
private RealmContextFactory realmContextFactory { get; set; } private RealmAccess realm { get; set; }
private IDisposable realmSubscription; private IDisposable realmSubscription;
@ -80,7 +80,7 @@ namespace osu.Game.Screens.Spectate
playingUserStates.BindTo(spectatorClient.PlayingUserStates); playingUserStates.BindTo(spectatorClient.PlayingUserStates);
playingUserStates.BindCollectionChanged(onPlayingUserStatesChanged, true); playingUserStates.BindCollectionChanged(onPlayingUserStatesChanged, true);
realmSubscription = realmContextFactory.RegisterForNotifications( realmSubscription = realm.RegisterForNotifications(
realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged); realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
foreach ((int id, var _) in userMap) foreach ((int id, var _) in userMap)

4
osu.Game/Skinning/Skin.cs
View File

@ -43,8 +43,8 @@ namespace osu.Game.Skinning
protected Skin(SkinInfo skin, IStorageResourceProvider resources, [CanBeNull] Stream configurationStream = null) protected Skin(SkinInfo skin, IStorageResourceProvider resources, [CanBeNull] Stream configurationStream = null)
{ {
SkinInfo = resources?.RealmContextFactory != null SkinInfo = resources?.RealmAccess != null
? skin.ToLive(resources.RealmContextFactory) ? skin.ToLive(resources.RealmAccess)
// This path should only be used in some tests. // This path should only be used in some tests.
: skin.ToLiveUnmanaged(); : skin.ToLiveUnmanaged();

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

@ -54,7 +54,7 @@ namespace osu.Game.Skinning
}; };
private readonly SkinModelManager skinModelManager; private readonly SkinModelManager skinModelManager;
private readonly RealmContextFactory contextFactory; private readonly RealmAccess realm;
private readonly IResourceStore<byte[]> userFiles; private readonly IResourceStore<byte[]> userFiles;
@ -68,9 +68,9 @@ namespace osu.Game.Skinning
/// </summary> /// </summary>
public Skin DefaultLegacySkin { get; } public Skin DefaultLegacySkin { get; }
public SkinManager(Storage storage, RealmContextFactory contextFactory, GameHost host, IResourceStore<byte[]> resources, AudioManager audio, Scheduler scheduler) public SkinManager(Storage storage, RealmAccess realm, GameHost host, IResourceStore<byte[]> resources, AudioManager audio, Scheduler scheduler)
{ {
this.contextFactory = contextFactory; this.realm = realm;
this.audio = audio; this.audio = audio;
this.scheduler = scheduler; this.scheduler = scheduler;
this.host = host; this.host = host;
@ -78,7 +78,7 @@ namespace osu.Game.Skinning
userFiles = new StorageBackedResourceStore(storage.GetStorageForDirectory("files")); userFiles = new StorageBackedResourceStore(storage.GetStorageForDirectory("files"));
skinModelManager = new SkinModelManager(storage, contextFactory, host, this); skinModelManager = new SkinModelManager(storage, realm, host, this);
var defaultSkins = new[] var defaultSkins = new[]
{ {
@ -87,7 +87,7 @@ namespace osu.Game.Skinning
}; };
// Ensure the default entries are present. // Ensure the default entries are present.
contextFactory.Write(realm => realm.Write(realm =>
{ {
foreach (var skin in defaultSkins) foreach (var skin in defaultSkins)
{ {
@ -110,10 +110,10 @@ namespace osu.Game.Skinning
public void SelectRandomSkin() public void SelectRandomSkin()
{ {
contextFactory.Run(realm => realm.Run(r =>
{ {
// choose from only user skins, removing the current selection to ensure a new one is chosen. // choose from only user skins, removing the current selection to ensure a new one is chosen.
var randomChoices = realm.All<SkinInfo>().Where(s => !s.DeletePending && s.ID != CurrentSkinInfo.Value.ID).ToArray(); var randomChoices = r.All<SkinInfo>().Where(s => !s.DeletePending && s.ID != CurrentSkinInfo.Value.ID).ToArray();
if (randomChoices.Length == 0) if (randomChoices.Length == 0)
{ {
@ -123,7 +123,7 @@ namespace osu.Game.Skinning
var chosen = randomChoices.ElementAt(RNG.Next(0, randomChoices.Length)); var chosen = randomChoices.ElementAt(RNG.Next(0, randomChoices.Length));
CurrentSkinInfo.Value = chosen.ToLive(contextFactory); CurrentSkinInfo.Value = chosen.ToLive(realm);
}); });
} }
@ -179,7 +179,7 @@ namespace osu.Game.Skinning
/// <returns>The first result for the provided query, or null if no results were found.</returns> /// <returns>The first result for the provided query, or null if no results were found.</returns>
public ILive<SkinInfo> Query(Expression<Func<SkinInfo, bool>> query) public ILive<SkinInfo> Query(Expression<Func<SkinInfo, bool>> query)
{ {
return contextFactory.Run(realm => realm.All<SkinInfo>().FirstOrDefault(query)?.ToLive(contextFactory)); return realm.Run(r => r.All<SkinInfo>().FirstOrDefault(query)?.ToLive(realm));
} }
public event Action SourceChanged; public event Action SourceChanged;
@ -234,7 +234,7 @@ namespace osu.Game.Skinning
AudioManager IStorageResourceProvider.AudioManager => audio; AudioManager IStorageResourceProvider.AudioManager => audio;
IResourceStore<byte[]> IStorageResourceProvider.Resources => resources; IResourceStore<byte[]> IStorageResourceProvider.Resources => resources;
IResourceStore<byte[]> IStorageResourceProvider.Files => userFiles; IResourceStore<byte[]> IStorageResourceProvider.Files => userFiles;
RealmContextFactory IStorageResourceProvider.RealmContextFactory => contextFactory; RealmAccess IStorageResourceProvider.RealmAccess => realm;
IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore); IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
#endregion #endregion
@ -289,7 +289,7 @@ namespace osu.Game.Skinning
public void Delete([CanBeNull] Expression<Func<SkinInfo, bool>> filter = null, bool silent = false) public void Delete([CanBeNull] Expression<Func<SkinInfo, bool>> filter = null, bool silent = false)
{ {
contextFactory.Run(realm => realm.Run(realm =>
{ {
var items = realm.All<SkinInfo>() var items = realm.All<SkinInfo>()
.Where(s => !s.Protected && !s.DeletePending); .Where(s => !s.Protected && !s.DeletePending);

6
osu.Game/Skinning/SkinModelManager.cs
View File

@ -27,8 +27,8 @@ namespace osu.Game.Skinning
private readonly IStorageResourceProvider skinResources; private readonly IStorageResourceProvider skinResources;
public SkinModelManager(Storage storage, RealmContextFactory contextFactory, GameHost host, IStorageResourceProvider skinResources) public SkinModelManager(Storage storage, RealmAccess realm, GameHost host, IStorageResourceProvider skinResources)
: base(storage, contextFactory) : base(storage, realm)
{ {
this.skinResources = skinResources; this.skinResources = skinResources;
@ -205,7 +205,7 @@ namespace osu.Game.Skinning
private void populateMissingHashes() private void populateMissingHashes()
{ {
ContextFactory.Run(realm => Access.Run(realm =>
{ {
var skinsWithoutHashes = realm.All<SkinInfo>().Where(i => !i.Protected && string.IsNullOrEmpty(i.Hash)).ToArray(); var skinsWithoutHashes = realm.All<SkinInfo>().Where(i => !i.Protected && string.IsNullOrEmpty(i.Hash)).ToArray();

6
osu.Game/Stores/BeatmapImporter.cs
View File

@ -44,8 +44,8 @@ namespace osu.Game.Stores
private readonly BeatmapOnlineLookupQueue? onlineLookupQueue; private readonly BeatmapOnlineLookupQueue? onlineLookupQueue;
protected BeatmapImporter(RealmContextFactory contextFactory, Storage storage, BeatmapOnlineLookupQueue? onlineLookupQueue = null) protected BeatmapImporter(RealmAccess realm, Storage storage, BeatmapOnlineLookupQueue? onlineLookupQueue = null)
: base(storage, contextFactory) : base(storage, realm)
{ {
this.onlineLookupQueue = onlineLookupQueue; this.onlineLookupQueue = onlineLookupQueue;
} }
@ -165,7 +165,7 @@ namespace osu.Game.Stores
public override bool IsAvailableLocally(BeatmapSetInfo model) public override bool IsAvailableLocally(BeatmapSetInfo model)
{ {
return ContextFactory.Run(realm => realm.All<BeatmapInfo>().Any(b => b.OnlineID == model.OnlineID)); return Access.Run(realm => realm.All<BeatmapInfo>().Any(b => b.OnlineID == model.OnlineID));
} }
public override string HumanisedModelName => "beatmap"; public override string HumanisedModelName => "beatmap";

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

@ -59,7 +59,7 @@ namespace osu.Game.Stores
protected readonly RealmFileStore Files; protected readonly RealmFileStore Files;
protected readonly RealmContextFactory ContextFactory; protected readonly RealmAccess Access;
/// <summary> /// <summary>
/// Fired when the user requests to view the resulting import. /// Fired when the user requests to view the resulting import.
@ -71,11 +71,11 @@ namespace osu.Game.Stores
/// </summary> /// </summary>
public Action<Notification>? PostNotification { protected get; set; } public Action<Notification>? PostNotification { protected get; set; }
protected RealmArchiveModelImporter(Storage storage, RealmContextFactory contextFactory) protected RealmArchiveModelImporter(Storage storage, RealmAccess realm)
{ {
ContextFactory = contextFactory; Access = realm;
Files = new RealmFileStore(contextFactory, storage); Files = new RealmFileStore(realm, storage);
} }
/// <summary> /// <summary>
@ -320,7 +320,7 @@ namespace osu.Game.Stores
/// <param name="cancellationToken">An optional cancellation token.</param> /// <param name="cancellationToken">An optional cancellation token.</param>
public virtual Task<ILive<TModel>?> Import(TModel item, ArchiveReader? archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) public virtual Task<ILive<TModel>?> Import(TModel item, ArchiveReader? archive = null, bool lowPriority = false, CancellationToken cancellationToken = default)
{ {
return ContextFactory.Run(realm => return Access.Run(realm =>
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
@ -352,7 +352,7 @@ namespace osu.Game.Stores
transaction.Commit(); transaction.Commit();
} }
return Task.FromResult((ILive<TModel>?)existing.ToLive(ContextFactory)); return Task.FromResult((ILive<TModel>?)existing.ToLive(Access));
} }
LogForModel(item, @"Found existing (optimised) but failed pre-check."); LogForModel(item, @"Found existing (optimised) but failed pre-check.");
@ -387,7 +387,7 @@ namespace osu.Game.Stores
existing.DeletePending = false; existing.DeletePending = false;
transaction.Commit(); transaction.Commit();
return Task.FromResult((ILive<TModel>?)existing.ToLive(ContextFactory)); return Task.FromResult((ILive<TModel>?)existing.ToLive(Access));
} }
LogForModel(item, @"Found existing but failed re-use check."); LogForModel(item, @"Found existing but failed re-use check.");
@ -413,7 +413,7 @@ namespace osu.Game.Stores
throw; throw;
} }
return Task.FromResult((ILive<TModel>?)item.ToLive(ContextFactory)); return Task.FromResult((ILive<TModel>?)item.ToLive(Access));
}); });
} }

12
osu.Game/Stores/RealmArchiveModelManager.cs
View File

@ -24,10 +24,10 @@ namespace osu.Game.Stores
{ {
private readonly RealmFileStore realmFileStore; private readonly RealmFileStore realmFileStore;
protected RealmArchiveModelManager(Storage storage, RealmContextFactory contextFactory) protected RealmArchiveModelManager(Storage storage, RealmAccess realm)
: base(storage, contextFactory) : base(storage, realm)
{ {
realmFileStore = new RealmFileStore(contextFactory, storage); realmFileStore = new RealmFileStore(realm, storage);
} }
public void DeleteFile(TModel item, RealmNamedFileUsage file) => public void DeleteFile(TModel item, RealmNamedFileUsage file) =>
@ -45,7 +45,7 @@ namespace osu.Game.Stores
// This method should be removed as soon as all the surrounding pieces support non-detached operations. // This method should be removed as soon as all the surrounding pieces support non-detached operations.
if (!item.IsManaged) if (!item.IsManaged)
{ {
var managed = ContextFactory.Context.Find<TModel>(item.ID); var managed = Access.Context.Find<TModel>(item.ID);
managed.Realm.Write(() => operation(managed)); managed.Realm.Write(() => operation(managed));
item.Files.Clear(); item.Files.Clear();
@ -165,7 +165,7 @@ namespace osu.Game.Stores
public bool Delete(TModel item) public bool Delete(TModel item)
{ {
return ContextFactory.Run(realm => return Access.Run(realm =>
{ {
if (!item.IsManaged) if (!item.IsManaged)
item = realm.Find<TModel>(item.ID); item = realm.Find<TModel>(item.ID);
@ -180,7 +180,7 @@ namespace osu.Game.Stores
public void Undelete(TModel item) public void Undelete(TModel item)
{ {
ContextFactory.Run(realm => Access.Run(realm =>
{ {
if (!item.IsManaged) if (!item.IsManaged)
item = realm.Find<TModel>(item.ID); item = realm.Find<TModel>(item.ID);

8
osu.Game/Stores/RealmFileStore.cs
View File

@ -24,15 +24,15 @@ namespace osu.Game.Stores
[ExcludeFromDynamicCompile] [ExcludeFromDynamicCompile]
public class RealmFileStore public class RealmFileStore
{ {
private readonly RealmContextFactory realmFactory; private readonly RealmAccess realm;
public readonly IResourceStore<byte[]> Store; public readonly IResourceStore<byte[]> Store;
public readonly Storage Storage; public readonly Storage Storage;
public RealmFileStore(RealmContextFactory realmFactory, Storage storage) public RealmFileStore(RealmAccess realm, Storage storage)
{ {
this.realmFactory = realmFactory; this.realm = realm;
Storage = storage.GetStorageForDirectory(@"files"); Storage = storage.GetStorageForDirectory(@"files");
Store = new StorageBackedResourceStore(Storage); Store = new StorageBackedResourceStore(Storage);
@ -92,7 +92,7 @@ namespace osu.Game.Stores
int removedFiles = 0; int removedFiles = 0;
// can potentially be run asynchronously, although we will need to consider operation order for disk deletion vs realm removal. // can potentially be run asynchronously, although we will need to consider operation order for disk deletion vs realm removal.
realmFactory.Write(realm => realm.Write(realm =>
{ {
// TODO: consider using a realm native query to avoid iterating all files (https://github.com/realm/realm-dotnet/issues/2659#issuecomment-927823707) // TODO: consider using a realm native query to avoid iterating all files (https://github.com/realm/realm-dotnet/issues/2659#issuecomment-927823707)
var files = realm.All<RealmFile>().ToList(); var files = realm.All<RealmFile>().ToList();

4
osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
View File

@ -77,12 +77,12 @@ namespace osu.Game.Storyboards.Drawables
} }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(GameplayClock clock, CancellationToken? cancellationToken, GameHost host, RealmContextFactory realmContextFactory) private void load(GameplayClock clock, CancellationToken? cancellationToken, GameHost host, RealmAccess realm)
{ {
if (clock != null) if (clock != null)
Clock = clock; Clock = clock;
dependencies.Cache(new TextureStore(host.CreateTextureLoaderStore(new RealmFileStore(realmContextFactory, host.Storage).Store), false, scaleAdjust: 1)); dependencies.Cache(new TextureStore(host.CreateTextureLoaderStore(new RealmFileStore(realm, host.Storage).Store), false, scaleAdjust: 1));
foreach (var layer in Storyboard.Layers) foreach (var layer in Storyboard.Layers)
{ {

2
osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
View File

@ -123,7 +123,7 @@ namespace osu.Game.Tests.Beatmaps
public IResourceStore<byte[]> Files => userSkinResourceStore; public IResourceStore<byte[]> Files => userSkinResourceStore;
public new IResourceStore<byte[]> Resources => base.Resources; public new IResourceStore<byte[]> Resources => base.Resources;
public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null; public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
RealmContextFactory IStorageResourceProvider.RealmContextFactory => null; RealmAccess IStorageResourceProvider.RealmAccess => null;
#endregion #endregion

14
osu.Game/Tests/Visual/EditorTestScene.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual
working = CreateWorkingBeatmap(Ruleset.Value); working = CreateWorkingBeatmap(Ruleset.Value);
if (IsolateSavingFromDatabase) if (IsolateSavingFromDatabase)
Dependencies.CacheAs<BeatmapManager>(testBeatmapManager = new TestBeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, Resources, host, Beatmap.Default)); Dependencies.CacheAs<BeatmapManager>(testBeatmapManager = new TestBeatmapManager(LocalStorage, Access, rulesets, null, audio, Resources, host, Beatmap.Default));
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -126,14 +126,14 @@ namespace osu.Game.Tests.Visual
{ {
public WorkingBeatmap TestBeatmap; public WorkingBeatmap TestBeatmap;
public TestBeatmapManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, IResourceStore<byte[]> resources, GameHost host, WorkingBeatmap defaultBeatmap) public TestBeatmapManager(Storage storage, RealmAccess realm, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, IResourceStore<byte[]> resources, GameHost host, WorkingBeatmap defaultBeatmap)
: base(storage, contextFactory, rulesets, api, audioManager, resources, host, defaultBeatmap) : base(storage, realm, rulesets, api, audioManager, resources, host, defaultBeatmap)
{ {
} }
protected override BeatmapModelManager CreateBeatmapModelManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, BeatmapOnlineLookupQueue onlineLookupQueue) protected override BeatmapModelManager CreateBeatmapModelManager(Storage storage, RealmAccess realm, RulesetStore rulesets, BeatmapOnlineLookupQueue onlineLookupQueue)
{ {
return new TestBeatmapModelManager(storage, contextFactory, rulesets, onlineLookupQueue); return new TestBeatmapModelManager(storage, realm, rulesets, onlineLookupQueue);
} }
protected override WorkingBeatmapCache CreateWorkingBeatmapCache(AudioManager audioManager, IResourceStore<byte[]> resources, IResourceStore<byte[]> storage, WorkingBeatmap defaultBeatmap, GameHost host) protected override WorkingBeatmapCache CreateWorkingBeatmapCache(AudioManager audioManager, IResourceStore<byte[]> resources, IResourceStore<byte[]> storage, WorkingBeatmap defaultBeatmap, GameHost host)
@ -157,8 +157,8 @@ namespace osu.Game.Tests.Visual
internal class TestBeatmapModelManager : BeatmapModelManager internal class TestBeatmapModelManager : BeatmapModelManager
{ {
public TestBeatmapModelManager(Storage storage, RealmContextFactory databaseContextFactory, RulesetStore rulesetStore, BeatmapOnlineLookupQueue beatmapOnlineLookupQueue) public TestBeatmapModelManager(Storage storage, RealmAccess databaseAccess, RulesetStore rulesetStore, BeatmapOnlineLookupQueue beatmapOnlineLookupQueue)
: base(databaseContextFactory, storage, beatmapOnlineLookupQueue) : base(databaseAccess, storage, beatmapOnlineLookupQueue)
{ {
} }

6
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -75,9 +75,9 @@ namespace osu.Game.Tests.Visual
/// <remarks> /// <remarks>
/// In interactive runs (ie. VisualTests) this will use the user's database if <see cref="UseFreshStoragePerRun"/> is not set to <c>true</c>. /// In interactive runs (ie. VisualTests) this will use the user's database if <see cref="UseFreshStoragePerRun"/> is not set to <c>true</c>.
/// </remarks> /// </remarks>
protected RealmContextFactory ContextFactory => contextFactory.Value; protected RealmAccess Access => contextFactory.Value;
private Lazy<RealmContextFactory> contextFactory; private Lazy<RealmAccess> contextFactory;
/// <summary> /// <summary>
/// Whether a fresh storage should be initialised per test (method) run. /// Whether a fresh storage should be initialised per test (method) run.
@ -119,7 +119,7 @@ namespace osu.Game.Tests.Visual
Resources = parent.Get<OsuGameBase>().Resources; Resources = parent.Get<OsuGameBase>().Resources;
contextFactory = new Lazy<RealmContextFactory>(() => new RealmContextFactory(LocalStorage, "client")); contextFactory = new Lazy<RealmAccess>(() => new RealmAccess(LocalStorage, "client"));
RecycleLocalStorage(false); RecycleLocalStorage(false);

2
osu.Game/Tests/Visual/SkinnableTestScene.cs
View File

@ -159,7 +159,7 @@ namespace osu.Game.Tests.Visual
public IResourceStore<byte[]> Files => null; public IResourceStore<byte[]> Files => null;
public new IResourceStore<byte[]> Resources => base.Resources; public new IResourceStore<byte[]> Resources => base.Resources;
public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore); public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
RealmContextFactory IStorageResourceProvider.RealmContextFactory => null; RealmAccess IStorageResourceProvider.RealmAccess => null;
#endregion #endregion