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

Rename realm to become imposter classes

Browse Source
This commit is contained in:
Dean Herbert 2021-11-19 19:07:21 +09:00
parent 0b6c4497bd
commit 618903c217
13 changed files with 140 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ using osu.Game.Extensions;
using osu.Game.IO.Archives; using osu.Game.IO.Archives;
using osu.Game.Models; using osu.Game.Models;
using osu.Game.Overlays.Notifications; using osu.Game.Overlays.Notifications;
using osu.Game.Rulesets;
using osu.Game.Stores; using osu.Game.Stores;
using osu.Game.Tests.Resources; using osu.Game.Tests.Resources;
using Realms; using Realms;
@ -42,25 +43,25 @@ namespace osu.Game.Tests.Database
using (var importer = new BeatmapImporter(realmFactory, storage)) using (var importer = new BeatmapImporter(realmFactory, storage))
using (new RealmRulesetStore(realmFactory, storage)) using (new RealmRulesetStore(realmFactory, storage))
{ {
ILive<RealmBeatmapSet>? 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<RealmBeatmapSet>().Count()); Assert.AreEqual(1, realmFactory.Context.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<RealmBeatmapSet>().Count(s => s.DeletePending)); Assert.AreEqual(1, realmFactory.Context.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<RealmBeatmapSet>().Count()); }); RunTestWithRealm((realmFactory, _) => { Assert.AreEqual(0, realmFactory.Context.All<BeatmapSetInfo>().Count()); });
} }
[Test] [Test]
@ -117,7 +118,7 @@ namespace osu.Game.Tests.Database
string? tempPath = TestResources.GetTestBeatmapForImport(); string? tempPath = TestResources.GetTestBeatmapForImport();
ILive<RealmBeatmapSet>? importedSet; ILive<BeatmapSetInfo>? importedSet;
using (var stream = File.OpenRead(tempPath)) using (var stream = File.OpenRead(tempPath))
{ {
@ -131,7 +132,7 @@ 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<RealmBeatmapSet>().First(beatmapSet => beatmapSet.ID == importedSet.ID); var imported = realmFactory.Context.All<BeatmapSetInfo>().First(beatmapSet => beatmapSet.ID == importedSet.ID);
deleteBeatmapSet(imported, realmFactory.Context); deleteBeatmapSet(imported, realmFactory.Context);
}); });
@ -556,7 +557,7 @@ namespace osu.Game.Tests.Database
using var importer = new BeatmapImporter(realmFactory, storage); using var importer = new BeatmapImporter(realmFactory, storage);
using var store = new RealmRulesetStore(realmFactory, storage); using var store = new RealmRulesetStore(realmFactory, storage);
var metadata = new RealmBeatmapMetadata var metadata = new BeatmapMetadata
{ {
Artist = "SomeArtist", Artist = "SomeArtist",
Author = Author =
@ -565,18 +566,18 @@ namespace osu.Game.Tests.Database
} }
}; };
var ruleset = realmFactory.Context.All<RealmRuleset>().First(); var ruleset = realmFactory.Context.All<RulesetInfo>().First();
var toImport = new RealmBeatmapSet var toImport = new BeatmapSetInfo
{ {
OnlineID = 1, OnlineID = 1,
Beatmaps = Beatmaps =
{ {
new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), metadata) new BeatmapInfo(ruleset, new BeatmapDifficulty(), metadata)
{ {
OnlineID = 2, OnlineID = 2,
}, },
new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), metadata) new BeatmapInfo(ruleset, new BeatmapDifficulty(), metadata)
{ {
OnlineID = 2, OnlineID = 2,
Status = BeatmapOnlineStatus.Loved, Status = BeatmapOnlineStatus.Loved,
@ -752,18 +753,18 @@ namespace osu.Game.Tests.Database
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
RealmBeatmapSet setToUpdate = realmFactory.Context.All<RealmBeatmapSet>().First(); BeatmapSetInfo setToUpdate = realmFactory.Context.All<BeatmapSetInfo>().First();
var beatmapToUpdate = setToUpdate.Beatmaps.First(); var beatmapToUpdate = setToUpdate.Beatmaps.First();
realmFactory.Context.Write(() => beatmapToUpdate.DifficultyName = "updated"); realmFactory.Context.Write(() => beatmapToUpdate.DifficultyName = "updated");
RealmBeatmap updatedInfo = realmFactory.Context.All<RealmBeatmap>().First(b => b.ID == beatmapToUpdate.ID); BeatmapInfo updatedInfo = realmFactory.Context.All<BeatmapInfo>().First(b => b.ID == beatmapToUpdate.ID);
Assert.That(updatedInfo.DifficultyName, Is.EqualTo("updated")); Assert.That(updatedInfo.DifficultyName, Is.EqualTo("updated"));
}); });
} }
public static async Task<RealmBeatmapSet?> LoadQuickOszIntoOsu(BeatmapImporter importer, Realm realm) public static async Task<BeatmapSetInfo?> LoadQuickOszIntoOsu(BeatmapImporter importer, Realm realm)
{ {
string? temp = TestResources.GetQuickTestBeatmapForImport(); string? temp = TestResources.GetQuickTestBeatmapForImport();
@ -775,10 +776,10 @@ namespace osu.Game.Tests.Database
waitForOrAssert(() => !File.Exists(temp), "Temporary file still exists after standard import", 5000); waitForOrAssert(() => !File.Exists(temp), "Temporary file still exists after standard import", 5000);
return realm.All<RealmBeatmapSet>().FirstOrDefault(beatmapSet => beatmapSet.ID == importedSet!.ID); return realm.All<BeatmapSetInfo>().FirstOrDefault(beatmapSet => beatmapSet.ID == importedSet!.ID);
} }
public static async Task<RealmBeatmapSet> LoadOszIntoStore(BeatmapImporter importer, Realm realm, string? path = null, bool virtualTrack = false) public static async Task<BeatmapSetInfo> LoadOszIntoStore(BeatmapImporter importer, Realm realm, string? path = null, bool virtualTrack = false)
{ {
string? temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack); string? temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);
@ -791,20 +792,20 @@ namespace osu.Game.Tests.Database
waitForOrAssert(() => !File.Exists(temp), "Temporary file still exists after standard import", 5000); waitForOrAssert(() => !File.Exists(temp), "Temporary file still exists after standard import", 5000);
return realm.All<RealmBeatmapSet>().First(beatmapSet => beatmapSet.ID == importedSet.ID); return realm.All<BeatmapSetInfo>().First(beatmapSet => beatmapSet.ID == importedSet.ID);
} }
private void deleteBeatmapSet(RealmBeatmapSet imported, Realm realm) private void deleteBeatmapSet(BeatmapSetInfo imported, Realm realm)
{ {
realm.Write(() => imported.DeletePending = true); realm.Write(() => imported.DeletePending = true);
checkBeatmapSetCount(realm, 0); checkBeatmapSetCount(realm, 0);
checkBeatmapSetCount(realm, 1, true); checkBeatmapSetCount(realm, 1, true);
Assert.IsTrue(realm.All<RealmBeatmapSet>().First(_ => true).DeletePending); Assert.IsTrue(realm.All<BeatmapSetInfo>().First(_ => true).DeletePending);
} }
private static Task createScoreForBeatmap(Realm realm, RealmBeatmap beatmap) private static Task createScoreForBeatmap(Realm realm, BeatmapInfo beatmap)
{ {
// TODO: reimplement when we have score support in realm. // TODO: reimplement when we have score support in realm.
// return ImportScoreTest.LoadScoreIntoOsu(osu, new ScoreInfo // return ImportScoreTest.LoadScoreIntoOsu(osu, new ScoreInfo
@ -820,8 +821,8 @@ namespace osu.Game.Tests.Database
private static void checkBeatmapSetCount(Realm realm, int expected, bool includeDeletePending = false) private static void checkBeatmapSetCount(Realm realm, int expected, bool includeDeletePending = false)
{ {
Assert.AreEqual(expected, includeDeletePending Assert.AreEqual(expected, includeDeletePending
? realm.All<RealmBeatmapSet>().Count() ? realm.All<BeatmapSetInfo>().Count()
: realm.All<RealmBeatmapSet>().Count(s => !s.DeletePending)); : realm.All<BeatmapSetInfo>().Count(s => !s.DeletePending));
} }
private static string hashFile(string filename) private static string hashFile(string filename)
@ -832,7 +833,7 @@ namespace osu.Game.Tests.Database
private static void checkBeatmapCount(Realm realm, int expected) private static void checkBeatmapCount(Realm realm, int expected)
{ {
Assert.AreEqual(expected, realm.All<RealmBeatmap>().Where(_ => true).ToList().Count); Assert.AreEqual(expected, realm.All<BeatmapInfo>().Where(_ => true).ToList().Count);
} }
private static void checkSingleReferencedFileCount(Realm realm, int expected) private static void checkSingleReferencedFileCount(Realm realm, int expected)
@ -850,24 +851,23 @@ namespace osu.Game.Tests.Database
private static void ensureLoaded(Realm realm, int timeout = 60000) private static void ensureLoaded(Realm realm, int timeout = 60000)
{ {
IQueryable<RealmBeatmapSet>? resultSets = null; IQueryable<BeatmapSetInfo>? resultSets = null;
waitForOrAssert(() => waitForOrAssert(() =>
{ {
realm.Refresh(); realm.Refresh();
return (resultSets = realm.All<RealmBeatmapSet>().Where(s => !s.DeletePending && s.OnlineID == 241526)).Any(); return (resultSets = realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && s.OnlineID == 241526)).Any();
}, }, @"BeatmapSet did not import to the database in allocated time.", timeout);
@"BeatmapSet did not import to the database in allocated time.", timeout);
// ensure we were stored to beatmap database backing... // ensure we were stored to beatmap database backing...
Assert.IsTrue(resultSets?.Count() == 1, $@"Incorrect result count found ({resultSets?.Count()} but should be 1)."); Assert.IsTrue(resultSets?.Count() == 1, $@"Incorrect result count found ({resultSets?.Count()} but should be 1).");
IEnumerable<RealmBeatmapSet> queryBeatmapSets() => realm.All<RealmBeatmapSet>().Where(s => !s.DeletePending && s.OnlineID == 241526); IEnumerable<BeatmapSetInfo> queryBeatmapSets() => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && s.OnlineID == 241526);
var set = queryBeatmapSets().First(); var set = queryBeatmapSets().First();
// ReSharper disable once PossibleUnintendedReferenceComparison // ReSharper disable once PossibleUnintendedReferenceComparison
IEnumerable<RealmBeatmap> queryBeatmaps() => realm.All<RealmBeatmap>().Where(s => s.BeatmapSet != null && s.BeatmapSet == set); IEnumerable<BeatmapInfo> queryBeatmaps() => realm.All<BeatmapInfo>().Where(s => s.BeatmapSet != null && s.BeatmapSet == set);
Assert.AreEqual(12, queryBeatmaps().Count(), @"Beatmap count was not correct"); Assert.AreEqual(12, queryBeatmaps().Count(), @"Beatmap count was not correct");
Assert.AreEqual(1, queryBeatmapSets().Count(), @"Beatmapset count was not correct"); Assert.AreEqual(1, queryBeatmapSets().Count(), @"Beatmapset count was not correct");
@ -880,7 +880,7 @@ namespace osu.Game.Tests.Database
countBeatmaps = queryBeatmaps().Count(), countBeatmaps = queryBeatmaps().Count(),
$@"Incorrect database beatmap count post-import ({countBeatmaps} but should be {countBeatmapSetBeatmaps})."); $@"Incorrect database beatmap count post-import ({countBeatmaps} but should be {countBeatmapSetBeatmaps}).");
foreach (RealmBeatmap b in set.Beatmaps) foreach (BeatmapInfo b in set.Beatmaps)
Assert.IsTrue(set.Beatmaps.Any(c => c.OnlineID == b.OnlineID)); Assert.IsTrue(set.Beatmaps.Any(c => c.OnlineID == b.OnlineID));
Assert.IsTrue(set.Beatmaps.Count > 0); Assert.IsTrue(set.Beatmaps.Count > 0);
} }

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

@ -5,8 +5,8 @@ using System;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using NUnit.Framework; using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Models;
#nullable enable #nullable enable
@ -48,7 +48,7 @@ namespace osu.Game.Tests.Database
using (var context = realmFactory.CreateContext()) using (var context = realmFactory.CreateContext())
{ {
var subscription = context.All<RealmBeatmap>().QueryAsyncWithNotifications((sender, changes, error) => var subscription = context.All<BeatmapInfo>().QueryAsyncWithNotifications((sender, changes, error) =>
{ {
using (realmFactory.CreateContext()) using (realmFactory.CreateContext())
{ {

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

@ -8,8 +8,8 @@ using System.Threading.Tasks;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Extensions; using osu.Framework.Extensions;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Models;
using Realms; using Realms;
#nullable enable #nullable enable
@ -23,9 +23,9 @@ namespace osu.Game.Tests.Database
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realmFactory, _) =>
{ {
ILive<RealmBeatmap> beatmap = realmFactory.CreateContext().Write(r => r.Add(new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()))).ToLive(realmFactory); ILive<BeatmapInfo> beatmap = realmFactory.CreateContext().Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))).ToLive(realmFactory);
ILive<RealmBeatmap> beatmap2 = realmFactory.CreateContext().All<RealmBeatmap>().First().ToLive(realmFactory); ILive<BeatmapInfo> beatmap2 = realmFactory.CreateContext().All<BeatmapInfo>().First().ToLive(realmFactory);
Assert.AreEqual(beatmap, beatmap2); Assert.AreEqual(beatmap, beatmap2);
}); });
@ -36,9 +36,9 @@ namespace osu.Game.Tests.Database
{ {
RunTestWithRealm((realmFactory, storage) => RunTestWithRealm((realmFactory, storage) =>
{ {
var beatmap = new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()); var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
ILive<RealmBeatmap> liveBeatmap; ILive<BeatmapInfo> liveBeatmap;
using (var context = realmFactory.CreateContext()) using (var context = realmFactory.CreateContext())
{ {
@ -63,7 +63,7 @@ namespace osu.Game.Tests.Database
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realmFactory, _) =>
{ {
var beatmap = new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()); var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
var liveBeatmap = beatmap.ToLive(realmFactory); var liveBeatmap = beatmap.ToLive(realmFactory);
@ -77,7 +77,7 @@ namespace osu.Game.Tests.Database
[Test] [Test]
public void TestAccessNonManaged() public void TestAccessNonManaged()
{ {
var beatmap = new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()); var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
var liveBeatmap = beatmap.ToLiveUnmanaged(); var liveBeatmap = beatmap.ToLiveUnmanaged();
Assert.IsFalse(beatmap.Hidden); Assert.IsFalse(beatmap.Hidden);
@ -96,12 +96,12 @@ namespace osu.Game.Tests.Database
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realmFactory, _) =>
{ {
ILive<RealmBeatmap>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
using (var threadContext = realmFactory.CreateContext()) using (var threadContext = realmFactory.CreateContext())
{ {
var beatmap = threadContext.Write(r => r.Add(new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realmFactory);
} }
@ -125,12 +125,12 @@ namespace osu.Game.Tests.Database
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realmFactory, _) =>
{ {
ILive<RealmBeatmap>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
using (var threadContext = realmFactory.CreateContext()) using (var threadContext = realmFactory.CreateContext())
{ {
var beatmap = threadContext.Write(r => r.Add(new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realmFactory);
} }
@ -151,7 +151,7 @@ namespace osu.Game.Tests.Database
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realmFactory, _) =>
{ {
var beatmap = new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()); var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
var liveBeatmap = beatmap.ToLive(realmFactory); var liveBeatmap = beatmap.ToLive(realmFactory);
Assert.DoesNotThrow(() => Assert.DoesNotThrow(() =>
@ -166,13 +166,13 @@ namespace osu.Game.Tests.Database
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realmFactory, _) =>
{ {
ILive<RealmBeatmap>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
using (var threadContext = realmFactory.CreateContext()) using (var threadContext = realmFactory.CreateContext())
{ {
var beatmap = threadContext.Write(r => r.Add(new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realmFactory);
} }
@ -205,12 +205,12 @@ namespace osu.Game.Tests.Database
{ {
RunTestWithRealm((realmFactory, _) => RunTestWithRealm((realmFactory, _) =>
{ {
ILive<RealmBeatmap>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
using (var threadContext = realmFactory.CreateContext()) using (var threadContext = realmFactory.CreateContext())
{ {
var beatmap = threadContext.Write(r => r.Add(new RealmBeatmap(CreateRuleset(), new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realmFactory);
} }
@ -237,19 +237,19 @@ namespace osu.Game.Tests.Database
using (var updateThreadContext = realmFactory.CreateContext()) using (var updateThreadContext = realmFactory.CreateContext())
{ {
updateThreadContext.All<RealmBeatmap>().QueryAsyncWithNotifications(gotChange); updateThreadContext.All<BeatmapInfo>().QueryAsyncWithNotifications(gotChange);
ILive<RealmBeatmap>? liveBeatmap = null; ILive<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
using (var threadContext = realmFactory.CreateContext()) using (var threadContext = realmFactory.CreateContext())
{ {
var ruleset = CreateRuleset(); var ruleset = CreateRuleset();
var beatmap = threadContext.Write(r => r.Add(new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()))); var beatmap = threadContext.Write(r => r.Add(new BeatmapInfo(ruleset, new BeatmapDifficulty(), new BeatmapMetadata())));
// add a second beatmap to ensure that a full refresh occurs below. // add a second beatmap to ensure that a full refresh occurs below.
// not just a refresh from the resolved Live. // not just a refresh from the resolved Live.
threadContext.Write(r => r.Add(new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), new RealmBeatmapMetadata()))); threadContext.Write(r => r.Add(new BeatmapInfo(ruleset, new BeatmapDifficulty(), new BeatmapMetadata())));
liveBeatmap = beatmap.ToLive(realmFactory); liveBeatmap = beatmap.ToLive(realmFactory);
} }
@ -258,14 +258,14 @@ namespace osu.Game.Tests.Database
Debug.Assert(liveBeatmap != null); Debug.Assert(liveBeatmap != null);
// not yet seen by main context // not yet seen by main context
Assert.AreEqual(0, updateThreadContext.All<RealmBeatmap>().Count()); Assert.AreEqual(0, updateThreadContext.All<BeatmapInfo>().Count());
Assert.AreEqual(0, changesTriggered); Assert.AreEqual(0, changesTriggered);
liveBeatmap.PerformRead(resolved => liveBeatmap.PerformRead(resolved =>
{ {
// retrieval causes an implicit refresh. even changes that aren't related to the retrieval are fired at this point. // retrieval causes an implicit refresh. even changes that aren't related to the retrieval are fired at this point.
// ReSharper disable once AccessToDisposedClosure // ReSharper disable once AccessToDisposedClosure
Assert.AreEqual(2, updateThreadContext.All<RealmBeatmap>().Count()); Assert.AreEqual(2, updateThreadContext.All<BeatmapInfo>().Count());
Assert.AreEqual(1, changesTriggered); Assert.AreEqual(1, changesTriggered);
// can access properties without a crash. // can access properties without a crash.
@ -280,7 +280,7 @@ namespace osu.Game.Tests.Database
}); });
} }
void gotChange(IRealmCollection<RealmBeatmap> sender, ChangeSet changes, Exception error) void gotChange(IRealmCollection<BeatmapInfo> sender, ChangeSet changes, Exception error)
{ {
changesTriggered++; changesTriggered++;
} }

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

@ -9,9 +9,11 @@ using osu.Framework.Extensions;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.Models; using osu.Game.Models;
using osu.Game.Rulesets;
#nullable enable #nullable enable
@ -74,24 +76,24 @@ namespace osu.Game.Tests.Database
} }
} }
protected static RealmBeatmapSet CreateBeatmapSet(RealmRuleset ruleset) protected static BeatmapSetInfo CreateBeatmapSet(RulesetInfo ruleset)
{ {
RealmFile createRealmFile() => new RealmFile { Hash = Guid.NewGuid().ToString().ComputeSHA2Hash() }; RealmFile createRealmFile() => new RealmFile { Hash = Guid.NewGuid().ToString().ComputeSHA2Hash() };
var metadata = new RealmBeatmapMetadata var metadata = new BeatmapMetadata
{ {
Title = "My Love", Title = "My Love",
Artist = "Kuba Oms" Artist = "Kuba Oms"
}; };
var beatmapSet = new RealmBeatmapSet var beatmapSet = new BeatmapSetInfo
{ {
Beatmaps = Beatmaps =
{ {
new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), metadata) { DifficultyName = "Easy", }, new BeatmapInfo(ruleset, new BeatmapDifficulty(), metadata) { DifficultyName = "Easy", },
new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), metadata) { DifficultyName = "Normal", }, new BeatmapInfo(ruleset, new BeatmapDifficulty(), metadata) { DifficultyName = "Normal", },
new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), metadata) { DifficultyName = "Hard", }, new BeatmapInfo(ruleset, new BeatmapDifficulty(), metadata) { DifficultyName = "Hard", },
new RealmBeatmap(ruleset, new RealmBeatmapDifficulty(), metadata) { DifficultyName = "Insane", } new BeatmapInfo(ruleset, new BeatmapDifficulty(), metadata) { DifficultyName = "Insane", }
}, },
Files = Files =
{ {
@ -111,8 +113,8 @@ namespace osu.Game.Tests.Database
return beatmapSet; return beatmapSet;
} }
protected static RealmRuleset CreateRuleset() => protected static RulesetInfo CreateRuleset() =>
new RealmRuleset(0, "osu!", "osu", true); new RulesetInfo(0, "osu!", "osu", true);
private class RealmTestGame : Framework.Game private class RealmTestGame : Framework.Game
{ {

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

@ -3,7 +3,7 @@
using System.Linq; using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Game.Models; using osu.Game.Rulesets;
using osu.Game.Stores; using osu.Game.Stores;
namespace osu.Game.Tests.Database namespace osu.Game.Tests.Database
@ -18,7 +18,7 @@ namespace osu.Game.Tests.Database
var rulesets = new RealmRulesetStore(realmFactory, storage); var rulesets = new RealmRulesetStore(realmFactory, storage);
Assert.AreEqual(4, rulesets.AvailableRulesets.Count()); Assert.AreEqual(4, rulesets.AvailableRulesets.Count());
Assert.AreEqual(4, realmFactory.Context.All<RealmRuleset>().Count()); Assert.AreEqual(4, realmFactory.Context.All<RulesetInfo>().Count());
}); });
} }
@ -34,7 +34,7 @@ namespace osu.Game.Tests.Database
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<RealmRuleset>().Count()); Assert.AreEqual(4, realmFactory.Context.All<RulesetInfo>().Count());
}); });
} }

13
osu.Game/Models/RealmBeatmapDifficulty.cs → osu.Game/Beatmaps/BeatmapDifficulty.cs
View File

@ -2,16 +2,15 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Beatmaps;
using Realms; using Realms;
#nullable enable #nullable enable
namespace osu.Game.Models namespace osu.Game.Beatmaps
{ {
[ExcludeFromDynamicCompile] [ExcludeFromDynamicCompile]
[MapTo("BeatmapDifficulty")] [MapTo("BeatmapDifficulty")]
public class RealmBeatmapDifficulty : EmbeddedObject, IBeatmapDifficultyInfo public class BeatmapDifficulty : EmbeddedObject, IBeatmapDifficultyInfo
{ {
public float DrainRate { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY; public float DrainRate { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
public float CircleSize { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY; public float CircleSize { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
@ -22,16 +21,16 @@ namespace osu.Game.Models
public double SliderTickRate { get; set; } = 1; public double SliderTickRate { get; set; } = 1;
/// <summary> /// <summary>
/// Returns a shallow-clone of this <see cref="RealmBeatmapDifficulty"/>. /// Returns a shallow-clone of this <see cref="BeatmapDifficulty"/>.
/// </summary> /// </summary>
public RealmBeatmapDifficulty Clone() public BeatmapDifficulty Clone()
{ {
var diff = new RealmBeatmapDifficulty(); var diff = new BeatmapDifficulty();
CopyTo(diff); CopyTo(diff);
return diff; return diff;
} }
public void CopyTo(RealmBeatmapDifficulty difficulty) public void CopyTo(BeatmapDifficulty difficulty)
{ {
difficulty.ApproachRate = ApproachRate; difficulty.ApproachRate = ApproachRate;
difficulty.DrainRate = DrainRate; difficulty.DrainRate = DrainRate;

26
osu.Game/Models/RealmBeatmap.cs → osu.Game/Beatmaps/BeatmapInfo.cs
View File

@ -6,14 +6,14 @@ using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Models;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using Realms; using Realms;
#nullable enable #nullable enable
namespace osu.Game.Models namespace osu.Game.Beatmaps
{ {
/// <summary> /// <summary>
/// A single beatmap difficulty. /// A single beatmap difficulty.
@ -21,20 +21,20 @@ namespace osu.Game.Models
[ExcludeFromDynamicCompile] [ExcludeFromDynamicCompile]
[Serializable] [Serializable]
[MapTo("Beatmap")] [MapTo("Beatmap")]
public class RealmBeatmap : RealmObject, IHasGuidPrimaryKey, IBeatmapInfo, IEquatable<RealmBeatmap> public class BeatmapInfo : RealmObject, IHasGuidPrimaryKey, IBeatmapInfo, IEquatable<BeatmapInfo>
{ {
[PrimaryKey] [PrimaryKey]
public Guid ID { get; set; } = Guid.NewGuid(); public Guid ID { get; set; } = Guid.NewGuid();
public string DifficultyName { get; set; } = string.Empty; public string DifficultyName { get; set; } = string.Empty;
public RealmRuleset Ruleset { get; set; } = null!; public RulesetInfo Ruleset { get; set; } = null!;
public RealmBeatmapDifficulty Difficulty { get; set; } = null!; public BeatmapDifficulty Difficulty { get; set; } = null!;
public RealmBeatmapMetadata Metadata { get; set; } = null!; public BeatmapMetadata Metadata { get; set; } = null!;
public RealmBeatmapSet? BeatmapSet { get; set; } public BeatmapSetInfo? BeatmapSet { get; set; }
[Ignored] [Ignored]
public RealmNamedFileUsage? File => BeatmapSet?.Files.First(f => f.File.Hash == Hash); public RealmNamedFileUsage? File => BeatmapSet?.Files.First(f => f.File.Hash == Hash);
@ -64,7 +64,7 @@ namespace osu.Game.Models
[JsonIgnore] [JsonIgnore]
public bool Hidden { get; set; } public bool Hidden { get; set; }
public RealmBeatmap(RealmRuleset ruleset, RealmBeatmapDifficulty difficulty, RealmBeatmapMetadata metadata) public BeatmapInfo(RulesetInfo ruleset, BeatmapDifficulty difficulty, BeatmapMetadata metadata)
{ {
Ruleset = ruleset; Ruleset = ruleset;
Difficulty = difficulty; Difficulty = difficulty;
@ -72,7 +72,7 @@ namespace osu.Game.Models
} }
[UsedImplicitly] [UsedImplicitly]
private RealmBeatmap() private BeatmapInfo()
{ {
} }
@ -102,7 +102,7 @@ namespace osu.Game.Models
#endregion #endregion
public bool Equals(RealmBeatmap? other) public bool Equals(BeatmapInfo? other)
{ {
if (ReferenceEquals(this, other)) return true; if (ReferenceEquals(this, other)) return true;
if (other == null) return false; if (other == null) return false;
@ -110,15 +110,15 @@ namespace osu.Game.Models
return ID == other.ID; return ID == other.ID;
} }
public bool Equals(IBeatmapInfo? other) => other is RealmBeatmap b && Equals(b); public bool Equals(IBeatmapInfo? other) => other is BeatmapInfo b && Equals(b);
public bool AudioEquals(RealmBeatmap? other) => other != null public bool AudioEquals(BeatmapInfo? other) => other != null
&& BeatmapSet != null && BeatmapSet != null
&& other.BeatmapSet != null && other.BeatmapSet != null
&& BeatmapSet.Hash == other.BeatmapSet.Hash && BeatmapSet.Hash == other.BeatmapSet.Hash
&& Metadata.AudioFile == other.Metadata.AudioFile; && Metadata.AudioFile == other.Metadata.AudioFile;
public bool BackgroundEquals(RealmBeatmap? other) => other != null public bool BackgroundEquals(BeatmapInfo? other) => other != null
&& BeatmapSet != null && BeatmapSet != null
&& other.BeatmapSet != null && other.BeatmapSet != null
&& BeatmapSet.Hash == other.BeatmapSet.Hash && BeatmapSet.Hash == other.BeatmapSet.Hash

6
osu.Game/Models/RealmBeatmapMetadata.cs → osu.Game/Beatmaps/BeatmapMetadata.cs
View File

@ -4,18 +4,18 @@
using System; using System;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Beatmaps; using osu.Game.Models;
using osu.Game.Users; using osu.Game.Users;
using Realms; using Realms;
#nullable enable #nullable enable
namespace osu.Game.Models namespace osu.Game.Beatmaps
{ {
[ExcludeFromDynamicCompile] [ExcludeFromDynamicCompile]
[Serializable] [Serializable]
[MapTo("BeatmapMetadata")] [MapTo("BeatmapMetadata")]
public class RealmBeatmapMetadata : RealmObject, IBeatmapMetadataInfo public class BeatmapMetadata : RealmObject, IBeatmapMetadataInfo
{ {
public string Title { get; set; } = string.Empty; public string Title { get; set; } = string.Empty;

14
osu.Game/Models/RealmBeatmapSet.cs → osu.Game/Beatmaps/BeatmapSetInfo.cs
View File

@ -5,18 +5,18 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Extensions; using osu.Game.Extensions;
using osu.Game.Models;
using Realms; using Realms;
#nullable enable #nullable enable
namespace osu.Game.Models namespace osu.Game.Beatmaps
{ {
[ExcludeFromDynamicCompile] [ExcludeFromDynamicCompile]
[MapTo("BeatmapSet")] [MapTo("BeatmapSet")]
public class RealmBeatmapSet : RealmObject, IHasGuidPrimaryKey, IHasRealmFiles, ISoftDelete, IEquatable<RealmBeatmapSet>, IBeatmapSetInfo public class BeatmapSetInfo : RealmObject, IHasGuidPrimaryKey, IHasRealmFiles, ISoftDelete, IEquatable<BeatmapSetInfo>, IBeatmapSetInfo
{ {
[PrimaryKey] [PrimaryKey]
public Guid ID { get; set; } = Guid.NewGuid(); public Guid ID { get; set; } = Guid.NewGuid();
@ -26,9 +26,9 @@ namespace osu.Game.Models
public DateTimeOffset DateAdded { get; set; } public DateTimeOffset DateAdded { get; set; }
public IBeatmapMetadataInfo Metadata => Beatmaps.FirstOrDefault()?.Metadata ?? new RealmBeatmapMetadata(); public IBeatmapMetadataInfo Metadata => Beatmaps.FirstOrDefault()?.Metadata ?? new BeatmapMetadata();
public IList<RealmBeatmap> Beatmaps { get; } = null!; public IList<BeatmapInfo> Beatmaps { get; } = null!;
public IList<RealmNamedFileUsage> Files { get; } = null!; public IList<RealmNamedFileUsage> Files { get; } = null!;
@ -63,7 +63,7 @@ namespace osu.Game.Models
/// <param name="filename">The name of the file to get the storage path of.</param> /// <param name="filename">The name of the file to get the storage path of.</param>
public string? GetPathForFile(string filename) => Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.File.GetStoragePath(); public string? GetPathForFile(string filename) => Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.File.GetStoragePath();
public bool Equals(RealmBeatmapSet? other) public bool Equals(BeatmapSetInfo? other)
{ {
if (ReferenceEquals(this, other)) return true; if (ReferenceEquals(this, other)) return true;
if (other == null) return false; if (other == null) return false;
@ -73,7 +73,7 @@ namespace osu.Game.Models
public override string ToString() => Metadata.GetDisplayString(); public override string ToString() => Metadata.GetDisplayString();
public bool Equals(IBeatmapSetInfo? other) => other is RealmBeatmapSet b && Equals(b); public bool Equals(IBeatmapSetInfo? other) => other is BeatmapSetInfo b && Equals(b);
IEnumerable<IBeatmapInfo> IBeatmapSetInfo.Beatmaps => Beatmaps; IEnumerable<IBeatmapInfo> IBeatmapSetInfo.Beatmaps => Beatmaps;
IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files; IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;

13
osu.Game/Database/RealmContextFactory.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Statistics; using osu.Framework.Statistics;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Beatmaps;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osu.Game.Models; using osu.Game.Models;
using osu.Game.Skinning; using osu.Game.Skinning;
@ -109,7 +110,7 @@ namespace osu.Game.Database
using (var realm = CreateContext()) using (var realm = CreateContext())
using (var transaction = realm.BeginWrite()) using (var transaction = realm.BeginWrite())
{ {
var pendingDeleteSets = realm.All<RealmBeatmapSet>().Where(s => s.DeletePending); var pendingDeleteSets = realm.All<BeatmapSetInfo>().Where(s => s.DeletePending);
foreach (var s in pendingDeleteSets) foreach (var s in pendingDeleteSets)
{ {
@ -206,9 +207,9 @@ namespace osu.Game.Database
switch (targetVersion) switch (targetVersion)
{ {
case 7: case 7:
convertOnlineIDs<RealmBeatmap>(); convertOnlineIDs<BeatmapInfo>();
convertOnlineIDs<RealmBeatmapSet>(); convertOnlineIDs<BeatmapSetInfo>();
convertOnlineIDs<RealmRuleset>(); convertOnlineIDs<RulesetInfo>();
void convertOnlineIDs<T>() where T : RealmObject void convertOnlineIDs<T>() where T : RealmObject
{ {
@ -253,14 +254,14 @@ namespace osu.Game.Database
case 9: case 9:
// Pretty pointless to do this as beatmaps aren't really loaded via realm yet, but oh well. // Pretty pointless to do this as beatmaps aren't really loaded via realm yet, but oh well.
string metadataClassName = getMappedOrOriginalName(typeof(RealmBeatmapMetadata)); string metadataClassName = getMappedOrOriginalName(typeof(BeatmapMetadata));
// May be coming from a version before `RealmBeatmapMetadata` existed. // May be coming from a version before `RealmBeatmapMetadata` existed.
if (!migration.OldRealm.Schema.TryFindObjectSchema(metadataClassName, out _)) if (!migration.OldRealm.Schema.TryFindObjectSchema(metadataClassName, out _))
return; return;
var oldMetadata = migration.OldRealm.DynamicApi.All(metadataClassName); var oldMetadata = migration.OldRealm.DynamicApi.All(metadataClassName);
var newMetadata = migration.NewRealm.All<RealmBeatmapMetadata>(); var newMetadata = migration.NewRealm.All<BeatmapMetadata>();
int metadataCount = newMetadata.Count(); int metadataCount = newMetadata.Count();

17
osu.Game/Models/RealmRuleset.cs → osu.Game/Rulesets/RulesetInfo.cs
View File

@ -4,16 +4,15 @@
using System; using System;
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Rulesets;
using Realms; using Realms;
#nullable enable #nullable enable
namespace osu.Game.Models namespace osu.Game.Rulesets
{ {
[ExcludeFromDynamicCompile] [ExcludeFromDynamicCompile]
[MapTo("Ruleset")] [MapTo("Ruleset")]
public class RealmRuleset : RealmObject, IEquatable<RealmRuleset>, IRulesetInfo public class RulesetInfo : RealmObject, IEquatable<RulesetInfo>, IRulesetInfo
{ {
[PrimaryKey] [PrimaryKey]
public string ShortName { get; set; } = string.Empty; public string ShortName { get; set; } = string.Empty;
@ -25,7 +24,7 @@ namespace osu.Game.Models
public string InstantiationInfo { get; set; } = string.Empty; public string InstantiationInfo { get; set; } = string.Empty;
public RealmRuleset(string shortName, string name, string instantiationInfo, int onlineID) public RulesetInfo(string shortName, string name, string instantiationInfo, int onlineID)
{ {
ShortName = shortName; ShortName = shortName;
Name = name; Name = name;
@ -34,11 +33,11 @@ namespace osu.Game.Models
} }
[UsedImplicitly] [UsedImplicitly]
private RealmRuleset() private RulesetInfo()
{ {
} }
public RealmRuleset(int? onlineID, string name, string shortName, bool available) public RulesetInfo(int? onlineID, string name, string shortName, bool available)
{ {
OnlineID = onlineID ?? -1; OnlineID = onlineID ?? -1;
Name = name; Name = name;
@ -48,13 +47,13 @@ namespace osu.Game.Models
public bool Available { get; set; } public bool Available { get; set; }
public bool Equals(RealmRuleset? other) => other != null && OnlineID == other.OnlineID && Available == other.Available && Name == other.Name && InstantiationInfo == other.InstantiationInfo; public bool Equals(RulesetInfo? other) => other != null && OnlineID == other.OnlineID && Available == other.Available && Name == other.Name && InstantiationInfo == other.InstantiationInfo;
public bool Equals(IRulesetInfo? other) => other is RealmRuleset b && Equals(b); public bool Equals(IRulesetInfo? other) => other is RulesetInfo b && Equals(b);
public override string ToString() => Name; public override string ToString() => Name;
public RealmRuleset Clone() => new RealmRuleset public RulesetInfo Clone() => new RulesetInfo
{ {
OnlineID = OnlineID, OnlineID = OnlineID,
Name = Name, Name = Name,

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

@ -34,7 +34,7 @@ namespace osu.Game.Stores
/// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps. /// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps.
/// </summary> /// </summary>
[ExcludeFromDynamicCompile] [ExcludeFromDynamicCompile]
public class BeatmapImporter : RealmArchiveModelImporter<RealmBeatmapSet>, IDisposable public class BeatmapImporter : RealmArchiveModelImporter<BeatmapSetInfo>, IDisposable
{ {
public override IEnumerable<string> HandledExtensions => new[] { ".osz" }; public override IEnumerable<string> HandledExtensions => new[] { ".osz" };
@ -53,12 +53,12 @@ namespace osu.Game.Stores
protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == ".osz"; protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == ".osz";
protected override Task Populate(RealmBeatmapSet beatmapSet, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default) protected override Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default)
{ {
if (archive != null) if (archive != null)
beatmapSet.Beatmaps.AddRange(createBeatmapDifficulties(beatmapSet.Files, realm)); beatmapSet.Beatmaps.AddRange(createBeatmapDifficulties(beatmapSet.Files, realm));
foreach (RealmBeatmap b in beatmapSet.Beatmaps) foreach (BeatmapInfo b in beatmapSet.Beatmaps)
b.BeatmapSet = beatmapSet; b.BeatmapSet = beatmapSet;
validateOnlineIds(beatmapSet, realm); validateOnlineIds(beatmapSet, realm);
@ -84,7 +84,7 @@ namespace osu.Game.Stores
return Task.CompletedTask; return Task.CompletedTask;
} }
protected override void PreImport(RealmBeatmapSet beatmapSet, Realm realm) protected override void PreImport(BeatmapSetInfo beatmapSet, Realm realm)
{ {
// We are about to import a new beatmap. Before doing so, ensure that no other set shares the online IDs used by the new one. // We are about to import a new beatmap. Before doing so, ensure that no other set shares the online IDs used by the new one.
// Note that this means if the previous beatmap is restored by the user, it will no longer be linked to its online IDs. // Note that this means if the previous beatmap is restored by the user, it will no longer be linked to its online IDs.
@ -93,7 +93,7 @@ namespace osu.Game.Stores
if (beatmapSet.OnlineID > 0) if (beatmapSet.OnlineID > 0)
{ {
var existingSetWithSameOnlineID = realm.All<RealmBeatmapSet>().SingleOrDefault(b => b.OnlineID == beatmapSet.OnlineID); var existingSetWithSameOnlineID = realm.All<BeatmapSetInfo>().SingleOrDefault(b => b.OnlineID == beatmapSet.OnlineID);
if (existingSetWithSameOnlineID != null) if (existingSetWithSameOnlineID != null)
{ {
@ -108,7 +108,7 @@ namespace osu.Game.Stores
} }
} }
private void validateOnlineIds(RealmBeatmapSet beatmapSet, Realm realm) private void validateOnlineIds(BeatmapSetInfo beatmapSet, Realm realm)
{ {
var beatmapIds = beatmapSet.Beatmaps.Where(b => b.OnlineID > 0).Select(b => b.OnlineID).ToList(); var beatmapIds = beatmapSet.Beatmaps.Where(b => b.OnlineID > 0).Select(b => b.OnlineID).ToList();
@ -121,10 +121,10 @@ namespace osu.Game.Stores
} }
// find any existing beatmaps in the database that have matching online ids // find any existing beatmaps in the database that have matching online ids
List<RealmBeatmap> existingBeatmaps = new List<RealmBeatmap>(); List<BeatmapInfo> existingBeatmaps = new List<BeatmapInfo>();
foreach (int id in beatmapIds) foreach (int id in beatmapIds)
existingBeatmaps.AddRange(realm.All<RealmBeatmap>().Where(b => b.OnlineID == id)); existingBeatmaps.AddRange(realm.All<BeatmapInfo>().Where(b => b.OnlineID == id));
if (existingBeatmaps.Any()) if (existingBeatmaps.Any())
{ {
@ -143,7 +143,7 @@ namespace osu.Game.Stores
void resetIds() => beatmapSet.Beatmaps.ForEach(b => b.OnlineID = -1); void resetIds() => beatmapSet.Beatmaps.ForEach(b => b.OnlineID = -1);
} }
protected override bool CanSkipImport(RealmBeatmapSet existing, RealmBeatmapSet import) protected override bool CanSkipImport(BeatmapSetInfo existing, BeatmapSetInfo import)
{ {
if (!base.CanSkipImport(existing, import)) if (!base.CanSkipImport(existing, import))
return false; return false;
@ -151,7 +151,7 @@ namespace osu.Game.Stores
return existing.Beatmaps.Any(b => b.OnlineID > 0); return existing.Beatmaps.Any(b => b.OnlineID > 0);
} }
protected override bool CanReuseExisting(RealmBeatmapSet existing, RealmBeatmapSet import) protected override bool CanReuseExisting(BeatmapSetInfo existing, BeatmapSetInfo import)
{ {
if (!base.CanReuseExisting(existing, import)) if (!base.CanReuseExisting(existing, import))
return false; return false;
@ -165,7 +165,7 @@ namespace osu.Game.Stores
public override string HumanisedModelName => "beatmap"; public override string HumanisedModelName => "beatmap";
protected override RealmBeatmapSet? CreateModel(ArchiveReader reader) protected override BeatmapSetInfo? CreateModel(ArchiveReader reader)
{ {
// let's make sure there are actually .osu files to import. // let's make sure there are actually .osu files to import.
string? mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase)); string? mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
@ -180,7 +180,7 @@ namespace osu.Game.Stores
using (var stream = new LineBufferedReader(reader.GetStream(mapName))) using (var stream = new LineBufferedReader(reader.GetStream(mapName)))
beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream); beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
return new RealmBeatmapSet return new BeatmapSetInfo
{ {
OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1, OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1,
// Metadata = beatmap.Metadata, // Metadata = beatmap.Metadata,
@ -189,11 +189,11 @@ namespace osu.Game.Stores
} }
/// <summary> /// <summary>
/// Create all required <see cref="RealmBeatmap"/>s for the provided archive. /// Create all required <see cref="BeatmapInfo"/>s for the provided archive.
/// </summary> /// </summary>
private List<RealmBeatmap> createBeatmapDifficulties(IList<RealmNamedFileUsage> files, Realm realm) private List<BeatmapInfo> createBeatmapDifficulties(IList<RealmNamedFileUsage> files, Realm realm)
{ {
var beatmaps = new List<RealmBeatmap>(); var beatmaps = new List<BeatmapInfo>();
foreach (var file in files.Where(f => f.Filename.EndsWith(".osu", StringComparison.OrdinalIgnoreCase))) foreach (var file in files.Where(f => f.Filename.EndsWith(".osu", StringComparison.OrdinalIgnoreCase)))
{ {
@ -214,7 +214,7 @@ namespace osu.Game.Stores
var decodedInfo = decoded.BeatmapInfo; var decodedInfo = decoded.BeatmapInfo;
var decodedDifficulty = decodedInfo.BaseDifficulty; var decodedDifficulty = decodedInfo.BaseDifficulty;
var ruleset = realm.All<RealmRuleset>().FirstOrDefault(r => r.OnlineID == decodedInfo.RulesetID); var ruleset = realm.All<RulesetInfo>().FirstOrDefault(r => r.OnlineID == decodedInfo.RulesetID);
if (ruleset?.Available != true) if (ruleset?.Available != true)
{ {
@ -222,7 +222,7 @@ namespace osu.Game.Stores
continue; continue;
} }
var difficulty = new RealmBeatmapDifficulty var difficulty = new BeatmapDifficulty
{ {
DrainRate = decodedDifficulty.DrainRate, DrainRate = decodedDifficulty.DrainRate,
CircleSize = decodedDifficulty.CircleSize, CircleSize = decodedDifficulty.CircleSize,
@ -232,7 +232,7 @@ namespace osu.Game.Stores
SliderTickRate = decodedDifficulty.SliderTickRate, SliderTickRate = decodedDifficulty.SliderTickRate,
}; };
var metadata = new RealmBeatmapMetadata var metadata = new BeatmapMetadata
{ {
Title = decoded.Metadata.Title, Title = decoded.Metadata.Title,
TitleUnicode = decoded.Metadata.TitleUnicode, TitleUnicode = decoded.Metadata.TitleUnicode,
@ -250,7 +250,7 @@ namespace osu.Game.Stores
BackgroundFile = decoded.Metadata.BackgroundFile, BackgroundFile = decoded.Metadata.BackgroundFile,
}; };
var beatmap = new RealmBeatmap(ruleset, difficulty, metadata) var beatmap = new BeatmapInfo(ruleset, difficulty, metadata)
{ {
Hash = hash, Hash = hash,
DifficultyName = decodedInfo.DifficultyName, DifficultyName = decodedInfo.DifficultyName,
@ -278,7 +278,7 @@ namespace osu.Game.Stores
return beatmaps; return beatmaps;
} }
private void updateBeatmapStatistics(RealmBeatmap beatmap, IBeatmap decoded) private void updateBeatmapStatistics(BeatmapInfo beatmap, IBeatmap decoded)
{ {
var rulesetInstance = ((IRulesetInfo)beatmap.Ruleset).CreateInstance(); var rulesetInstance = ((IRulesetInfo)beatmap.Ruleset).CreateInstance();

11
osu.Game/Stores/RealmRulesetStore.cs
View File

@ -11,7 +11,6 @@ using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Models;
using osu.Game.Rulesets; using osu.Game.Rulesets;
#nullable enable #nullable enable
@ -106,7 +105,7 @@ namespace osu.Game.Stores
{ {
context.Write(realm => context.Write(realm =>
{ {
var rulesets = realm.All<RealmRuleset>(); var rulesets = realm.All<RulesetInfo>();
List<Ruleset> instances = loadedAssemblies.Values List<Ruleset> instances = loadedAssemblies.Values
.Select(r => Activator.CreateInstance(r) as Ruleset) .Select(r => Activator.CreateInstance(r) as Ruleset)
@ -117,8 +116,8 @@ namespace osu.Game.Stores
// add all legacy rulesets first to ensure they have exclusive choice of primary key. // add all legacy rulesets first to ensure they have exclusive choice of primary key.
foreach (var r in instances.Where(r => r is ILegacyRuleset)) foreach (var r in instances.Where(r => r is ILegacyRuleset))
{ {
if (realm.All<RealmRuleset>().FirstOrDefault(rr => rr.OnlineID == r.RulesetInfo.OnlineID) == null) if (realm.All<RulesetInfo>().FirstOrDefault(rr => rr.OnlineID == r.RulesetInfo.OnlineID) == null)
realm.Add(new RealmRuleset(r.RulesetInfo.ShortName, r.RulesetInfo.Name, r.RulesetInfo.InstantiationInfo, r.RulesetInfo.OnlineID)); realm.Add(new RulesetInfo(r.RulesetInfo.ShortName, r.RulesetInfo.Name, r.RulesetInfo.InstantiationInfo, r.RulesetInfo.OnlineID));
} }
// add any other rulesets which have assemblies present but are not yet in the database. // add any other rulesets which have assemblies present but are not yet in the database.
@ -136,11 +135,11 @@ namespace osu.Game.Stores
existingSameShortName.InstantiationInfo = r.RulesetInfo.InstantiationInfo; existingSameShortName.InstantiationInfo = r.RulesetInfo.InstantiationInfo;
} }
else else
realm.Add(new RealmRuleset(r.RulesetInfo.ShortName, r.RulesetInfo.Name, r.RulesetInfo.InstantiationInfo, r.RulesetInfo.OnlineID)); realm.Add(new RulesetInfo(r.RulesetInfo.ShortName, r.RulesetInfo.Name, r.RulesetInfo.InstantiationInfo, r.RulesetInfo.OnlineID));
} }
} }
List<RealmRuleset> detachedRulesets = new List<RealmRuleset>(); List<RulesetInfo> detachedRulesets = new List<RulesetInfo>();
// perform a consistency check and detach final rulesets from realm for cross-thread runtime usage. // perform a consistency check and detach final rulesets from realm for cross-thread runtime usage.
foreach (var r in rulesets) foreach (var r in rulesets)