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

Remove DatabaseBackedStore Prepare functions

Browse Source
This commit is contained in:
TocoToucan 2017-10-25 14:53:20 +03:00
parent 89cc7b7945
commit 63fe569afa
6 changed files with 35 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Beatmaps/BeatmapStore.cs
View File

@ -25,21 +25,6 @@ namespace osu.Game.Beatmaps
{
}
protected override void Prepare(bool reset = false)
{
if (reset)
{
var context = GetContext();
// https://stackoverflow.com/a/10450893
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapMetadata");
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapDifficulty");
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapSetInfo");
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapSetFileInfo");
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapInfo");
}
}
/// <summary>
/// Add a <see cref="BeatmapSetInfo"/> to the database.
/// </summary>
@ -151,6 +136,18 @@ namespace osu.Game.Beatmaps
context.SaveChanges();
}
public override void Reset()
{
var context = GetContext();
// https://stackoverflow.com/a/10450893
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapMetadata");
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapDifficulty");
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapSetInfo");
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapSetFileInfo");
context.Database.ExecuteSqlCommand("DELETE FROM BeatmapInfo");
}
public IEnumerable<BeatmapSetInfo> BeatmapSets => GetContext().BeatmapSetInfo
.Include(s => s.Metadata)
.Include(s => s.Beatmaps).ThenInclude(s => s.Ruleset)

18
osu.Game/Database/DatabaseBackedStore.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Threading;
using osu.Framework.Logging;
using osu.Framework.Platform;
namespace osu.Game.Database
@ -32,16 +31,6 @@ namespace osu.Game.Database
queryContext = new ThreadLocal<OsuDbContext>(CreateContext);
Storage = storage;
try
{
Prepare();
}
catch (Exception e)
{
Logger.Error(e, $@"Failed to initialise the {GetType()}! Trying again with a clean database...");
Prepare(true);
}
}
/// <summary>
@ -51,14 +40,9 @@ namespace osu.Game.Database
{
}
/// <summary>
/// Prepare this database for use. Tables should be created here.
/// </summary>
protected abstract void Prepare(bool reset = false);
/// <summary>
/// Reset this database to a default state. Undo all changes to database and storage backings.
/// </summary>
public void Reset() => Prepare(true);
public abstract void Reset();
}
}

19
osu.Game/IO/FileStore.cs
View File

@ -27,17 +27,6 @@ namespace osu.Game.IO
Store = new StorageBackedResourceStore(Storage);
}
protected override void Prepare(bool reset = false)
{
if (reset)
{
if (Storage.ExistsDirectory(string.Empty))
Storage.DeleteDirectory(string.Empty);
GetContext().Database.ExecuteSqlCommand("DELETE FROM FileInfo");
}
}
public FileInfo Add(Stream data, bool reference = true)
{
var context = GetContext();
@ -114,5 +103,13 @@ namespace osu.Game.IO
context.SaveChanges();
}
public override void Reset()
{
if (Storage.ExistsDirectory(string.Empty))
Storage.DeleteDirectory(string.Empty);
GetContext().Database.ExecuteSqlCommand("DELETE FROM FileInfo");
}
}
}

11
osu.Game/Input/KeyBindingStore.cs
View File

@ -30,12 +30,6 @@ namespace osu.Game.Input
public void Register(KeyBindingInputManager manager) => insertDefaults(manager.DefaultKeyBindings);
protected override void Prepare(bool reset = false)
{
if (reset)
GetContext().Database.ExecuteSqlCommand("DELETE FROM KeyBinding");
}
private void insertDefaults(IEnumerable<KeyBinding> defaults, int? rulesetId = null, int? variant = null)
{
var context = GetContext();
@ -83,5 +77,10 @@ namespace osu.Game.Input
KeyBindingChanged?.Invoke();
}
public override void Reset()
{
GetContext().Database.ExecuteSqlCommand("DELETE FROM KeyBinding");
}
}
}

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

@ -29,6 +29,7 @@ namespace osu.Game.Rulesets
public RulesetStore(Func<OsuDbContext> factory)
: base(factory)
{
AddMissingRulesets();
}
/// <summary>
@ -47,15 +48,10 @@ namespace osu.Game.Rulesets
private const string ruleset_library_prefix = "osu.Game.Rulesets";
protected override void Prepare(bool reset = false)
protected void AddMissingRulesets()
{
var context = GetContext();
if (reset)
{
context.Database.ExecuteSqlCommand("DELETE FROM RulesetInfo");
}
var instances = loaded_assemblies.Values.Select(r => (Ruleset)Activator.CreateInstance(r, new RulesetInfo())).ToList();
//add all legacy modes in correct order
@ -123,5 +119,10 @@ namespace osu.Game.Rulesets
InstantiationInfo = ruleset.GetType().AssemblyQualifiedName,
ID = ruleset.LegacyID
};
public override void Reset()
{
GetContext().Database.ExecuteSqlCommand("DELETE FROM RulesetInfo");
}
}
}

3
osu.Game/Rulesets/Scoring/ScoreStore.cs
View File

@ -144,8 +144,9 @@ namespace osu.Game.Rulesets.Scoring
return new Replay { Frames = frames };
}
protected override void Prepare(bool reset = false)
public override void Reset()
{
throw new NotImplementedException();
}
}
}