h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 21:52:56 +08:00
Code Issues Releases Wiki Activity

Fix type resolution in RulesetStore

Browse Source
This commit is contained in:
Dean Herbert 2017-09-19 17:19:37 +09:00
parent c0c910d4d4
commit f2a9e95d56
1 changed files with 63 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ namespace osu.Game.Rulesets
/// </summary> /// </summary>
public class RulesetStore : DatabaseBackedStore public class RulesetStore : DatabaseBackedStore
{ {
private readonly List<Ruleset> instances = new List<Ruleset>(); private static readonly Dictionary<Assembly, Type> loaded_assemblies = new Dictionary<Assembly, Type>();
public IEnumerable<RulesetInfo> AllRulesets => Query<RulesetInfo>().Where(r => r.Available); public IEnumerable<RulesetInfo> AllRulesets => Query<RulesetInfo>().Where(r => r.Available);
@ -25,18 +25,9 @@ namespace osu.Game.Rulesets
{ {
} }
private const string ruleset_library_prefix = "osu.Game.Rulesets"; static RulesetStore()
protected override void Prepare(bool reset = false)
{ {
instances.Clear(); AppDomain.CurrentDomain.AssemblyResolve += currentDomain_AssemblyResolve;
Connection.CreateTable<RulesetInfo>();
if (reset)
{
Connection.DeleteAll<RulesetInfo>();
}
// todo: don't do this on deploy // todo: don't do this on deploy
var sln = DebugUtils.GetSolutionPath(); var sln = DebugUtils.GetSolutionPath();
@ -50,9 +41,26 @@ namespace osu.Game.Rulesets
foreach (string file in Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll")) foreach (string file in Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll"))
loadRulesetFromFile(file); loadRulesetFromFile(file);
}
Connection.BeginTransaction(); private static Assembly currentDomain_AssemblyResolve(object sender, ResolveEventArgs args) => loaded_assemblies.Keys.FirstOrDefault(a => a.FullName == args.Name);
private const string ruleset_library_prefix = "osu.Game.Rulesets";
protected override void Prepare(bool reset = false)
{
Connection.CreateTable<RulesetInfo>();
if (reset)
{
Connection.DeleteAll<RulesetInfo>();
}
var instances = loaded_assemblies.Values.Select(r => (Ruleset)Activator.CreateInstance(r, new RulesetInfo()));
Connection.RunInTransaction(() =>
{
//add all legacy modes in correct order //add all legacy modes in correct order
foreach (var r in instances.Where(r => r.LegacyID >= 0).OrderBy(r => r.LegacyID)) foreach (var r in instances.Where(r => r.LegacyID >= 0).OrderBy(r => r.LegacyID))
{ {
@ -69,7 +77,10 @@ namespace osu.Game.Rulesets
if (existing == null) if (existing == null)
Connection.Insert(us); Connection.Insert(us);
} }
});
Connection.RunInTransaction(() =>
{
//perform a consistency check //perform a consistency check
foreach (var r in Query<RulesetInfo>()) foreach (var r in Query<RulesetInfo>())
{ {
@ -85,26 +96,20 @@ namespace osu.Game.Rulesets
Connection.Update(r); Connection.Update(r);
} }
});
Connection.Commit();
} }
private void loadRulesetFromFile(string file) private static void loadRulesetFromFile(string file)
{ {
var filename = Path.GetFileNameWithoutExtension(file); var filename = Path.GetFileNameWithoutExtension(file);
if (instances.Any(i => i.GetType().Namespace == filename)) if (loaded_assemblies.Values.Any(t => t.Namespace == filename))
return; return;
try try
{ {
var assembly = Assembly.LoadFile(file); var assembly = Assembly.LoadFrom(file);
var rulesets = assembly.GetTypes().Where(t => t.IsSubclassOf(typeof(Ruleset))); loaded_assemblies[assembly] = assembly.GetTypes().First(t => t.IsSubclassOf(typeof(Ruleset)));
if (rulesets.Count() != 1)
return;
instances.Add((Ruleset)Activator.CreateInstance(rulesets.First(), new RulesetInfo()));
} }
catch (Exception) { } catch (Exception) { }
} }