Add Dependency Map, Update Assembly Crawler
[Untested] Assembly Crawler will now accept constructors matching: new(), new(CommandService), new(IDependencyMap). Add IDependencyMap Add DependencyMap
This commit is contained in:
@@ -6,18 +6,33 @@ namespace Discord.Commands
|
||||
{
|
||||
internal class ReflectionUtils
|
||||
{
|
||||
internal static object CreateObject(TypeInfo typeInfo)
|
||||
internal static object CreateObject(TypeInfo typeInfo, CommandService commands, IDependencyMap map = null)
|
||||
{
|
||||
var constructor = typeInfo.DeclaredConstructors.Where(x => x.GetParameters().Length == 0).FirstOrDefault();
|
||||
if (constructor == null)
|
||||
throw new InvalidOperationException($"Failed to find a valid constructor for \"{typeInfo.FullName}\"");
|
||||
if (typeInfo.DeclaredConstructors.Count() > 1)
|
||||
throw new InvalidOperationException($"Found too many constructors for \"{typeInfo.FullName}\"");
|
||||
var constructor = typeInfo.DeclaredConstructors.FirstOrDefault();
|
||||
try
|
||||
{
|
||||
return constructor.Invoke(null);
|
||||
if (constructor.GetParameters().Length == 0)
|
||||
return constructor.Invoke(null);
|
||||
else if (constructor.GetParameters().Length > 1)
|
||||
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\"");
|
||||
var parameter = constructor.GetParameters().FirstOrDefault();
|
||||
if (parameter == null)
|
||||
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\"");
|
||||
if (parameter.GetType() == typeof(CommandService))
|
||||
return constructor.Invoke(new object[1] { commands });
|
||||
else if (parameter is IDependencyMap)
|
||||
{
|
||||
if (map == null) throw new InvalidOperationException($"The constructor for \"{typeInfo.FullName}\" requires a Dependency Map.");
|
||||
return constructor.Invoke(new object[1] { map });
|
||||
}
|
||||
else
|
||||
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\"");
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch
|
||||
{
|
||||
throw new InvalidOperationException($"Failed to create \"{typeInfo.FullName}\"", ex);
|
||||
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\"");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user