RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-direct-import-stall

This commit is contained in:
Dan Balasescu 2017-10-25 21:46:00 +09:00 committed by GitHub
parent f1f7557f6e bf3b9e0dd7
commit 946288ba2e
6 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,21 +25,6 @@ public BeatmapStore(Func<OsuDbContext> factory)
{
}
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>

21
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 @@ protected DatabaseBackedStore(Func<OsuDbContext> createContext, Storage storage
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>
@ -50,15 +39,5 @@ protected DatabaseBackedStore(Func<OsuDbContext> createContext, Storage storage
public virtual void Cleanup()
{
}
/// <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);
}
}

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

@ -4,7 +4,6 @@
using System;
using System.IO;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using osu.Framework.Extensions;
using osu.Framework.IO.Stores;
using osu.Framework.Logging;
@ -27,17 +26,6 @@ public FileStore(Func<OsuDbContext> createContext, Storage storage) : base(creat
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();

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

@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using osu.Framework.Input.Bindings;
using osu.Framework.Platform;
using osu.Game.Database;
@ -30,12 +29,6 @@ public KeyBindingStore(Func<OsuDbContext> createContext, RulesetStore rulesets,
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();

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

@ -6,7 +6,6 @@
using System.IO;
using System.Linq;
using System.Reflection;
using Microsoft.EntityFrameworkCore;
using osu.Game.Database;
namespace osu.Game.Rulesets
@ -29,6 +28,7 @@ static RulesetStore()
public RulesetStore(Func<OsuDbContext> factory)
: base(factory)
{
AddMissingRulesets();
}
/// <summary>
@ -47,15 +47,10 @@ public RulesetStore(Func<OsuDbContext> factory)
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

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

@ -143,9 +143,5 @@ private Replay createLegacyReplay(StreamReader reader)
return new Replay { Frames = frames };
}
protected override void Prepare(bool reset = false)
{
}
}
}