github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow users to get IDependencyMap if they follow a strict format

Browse Source
This commit is contained in:
Finite Reality
2016-07-21 01:44:14 +01:00
parent f7455c389b
commit 39d8e3c159
1 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Discord.Net.Commands/ReflectionUtils.cs
View File

@@ -17,25 +17,50 @@ namespace Discord.Commands
if (constructor == null) if (constructor == null)
throw new InvalidOperationException($"Found no constructor for \"{typeInfo.FullName}\""); throw new InvalidOperationException($"Found no constructor for \"{typeInfo.FullName}\"");
object[] parameters; object[] arguments = null;
try
ParameterInfo[] parameters = constructor.GetParameters();
// TODO: can this logic be made better/cleaner?
if (parameters.Length == 1)
{ {
// TODO: probably change this ternary into something sensible if (parameters[0].ParameterType == typeof(IDependencyMap))
parameters = constructor.GetParameters() {
.Select(x => x.ParameterType == typeof(CommandService) ? service : map.Get(x.ParameterType)).ToArray(); if (map != null)
arguments = new object[] { map };
else
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\" (an IDependencyMap is required)");
}
} }
catch (KeyNotFoundException ex) // tried to inject an invalid dependency else if (parameters.Length == 2)
{ {
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\" (could not provide parameter)", ex); if (parameters[0].ParameterType == typeof(CommandService) && parameters[1].ParameterType == typeof(IDependencyMap))
if (map != null)
arguments = new object[] { service, map };
else
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\" (an IDependencyMap is required)");
} }
catch (NullReferenceException ex) // tried to find a dependency
if (arguments == null)
{ {
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\" (type requires dependency injection)", ex); try
{
// TODO: probably change this ternary into something sensible?
arguments = parameters.Select(x => x.ParameterType == typeof(CommandService) ? service : map.Get(x.ParameterType)).ToArray();
}
catch (KeyNotFoundException ex) // tried to inject an invalid dependency
{
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\" (could not provide parameter)", ex);
}
catch (NullReferenceException ex) // tried to find a dependency
{
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\" (an IDependencyMap is required)", ex);
}
} }
try try
{ {
return constructor.Invoke(parameters); return constructor.Invoke(arguments);
} }
catch (Exception ex) catch (Exception ex)
{ {