1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:07:38 +08:00

style fixes

This commit is contained in:
miterosan 2019-07-02 17:25:12 +02:00
parent 778c36c7d7
commit f1ceea8361

View File

@ -24,19 +24,17 @@ namespace osu.Game.Rulesets
addLoadedRulesets();
IEnumerable<string> files = new string[0];
try
{
files = Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll");
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 (Exception e)
{
Logger.Error(e, $"Could not load rulesets from directory {Environment.CurrentDirectory}");
}
foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
loadRulesetFromFile(file);
}
public RulesetStore(IDatabaseContextFactory factory)
@ -125,13 +123,15 @@ namespace osu.Game.Rulesets
private static void addLoadedRulesets()
{
// on android the rulesets are already loaded
var loadedRulesets = AppDomain.CurrentDomain.GetAssemblies()
.Where(assembly => assembly.GetName().Name.StartsWith(ruleset_library_prefix, StringComparison.InvariantCultureIgnoreCase))
.Where(assembly => !assembly.GetName().Name.Contains("Tests"));
foreach (var ruleset in AppDomain.CurrentDomain.GetAssemblies())
{
string rulesetName = ruleset.GetName().Name;
if (!rulesetName.StartsWith(ruleset_library_prefix, StringComparison.InvariantCultureIgnoreCase) || ruleset.GetName().Name.Contains("Tests"))
continue;
foreach (var ruleset in loadedRulesets)
addRuleset(ruleset);
}
}
private static void loadRulesetFromFile(string file)