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

More methods

Browse Source
This commit is contained in:
Dean Herbert 2019-07-03 18:42:10 +09:00
parent 06ef8f71e9
commit 8120bb36bc
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,19 +24,9 @@ namespace osu.Game.Rulesets
// 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.
addLoadedRulesets(); loadFromAppDomain();
try loadFromDisk();
{
string[] files = Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll");
foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
loadRulesetFromFile(file);
}
catch
{
Logger.Log($"Could not load rulesets from directory {Environment.CurrentDirectory}");
}
} }
public RulesetStore(IDatabaseContextFactory factory) public RulesetStore(IDatabaseContextFactory factory)
@ -123,7 +113,7 @@ namespace osu.Game.Rulesets
} }
} }
private static void addLoadedRulesets() private static void loadFromAppDomain()
{ {
foreach (var ruleset in AppDomain.CurrentDomain.GetAssemblies()) foreach (var ruleset in AppDomain.CurrentDomain.GetAssemblies())
{ {
@ -136,6 +126,21 @@ namespace osu.Game.Rulesets
} }
} }
private static void loadFromDisk()
{
try
{
string[] files = Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll");
foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
loadRulesetFromFile(file);
}
catch
{
Logger.Log($"Could not load rulesets from directory {Environment.CurrentDirectory}");
}
}
private static void loadRulesetFromFile(string file) private static void loadRulesetFromFile(string file)
{ {
var filename = Path.GetFileNameWithoutExtension(file); var filename = Path.GetFileNameWithoutExtension(file);