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

Merge pull request #139 from DigiTechs/feature-128

Browse Source 
Add Dependency Injection and Autoloading to the Commands service
This commit is contained in:
RogueException
2016-07-20 23:16:44 -03:00
committed by GitHub
parent b407c71567 b546ba919b
commit 751c28a87e
6 changed files with 109 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discord.Net.Commands/Attributes/ModuleAttribute.cs
View File

@@ -6,13 +6,16 @@ namespace Discord.Commands
public class ModuleAttribute : Attribute
{
public string Prefix { get; }
public bool AutoLoad { get; set; }
public ModuleAttribute()
{
Prefix = null;
AutoLoad = true;
}
public ModuleAttribute(string prefix)
{
Prefix = prefix;
AutoLoad = true;
}
}
}

6
src/Discord.Net.Commands/CommandService.cs
View File

@@ -164,7 +164,7 @@ namespace Discord.Commands
return loadedModule;
}
public async Task<IEnumerable<Module>> LoadAssembly(Assembly assembly)
public async Task<IEnumerable<Module>> LoadAssembly(Assembly assembly, IDependencyMap dependencyMap = null)
{
var modules = ImmutableArray.CreateBuilder<Module>();
await _moduleLock.WaitAsync().ConfigureAwait(false);
@@ -174,9 +174,9 @@ namespace Discord.Commands
{
var typeInfo = type.GetTypeInfo();
var moduleAttr = typeInfo.GetCustomAttribute<ModuleAttribute>();
if (moduleAttr != null)
if (moduleAttr != null && moduleAttr.AutoLoad)
{
var moduleInstance = ReflectionUtils.CreateObject(typeInfo);
var moduleInstance = ReflectionUtils.CreateObject(typeInfo, this, dependencyMap);
modules.Add(LoadInternal(moduleInstance, moduleAttr, typeInfo));
}
}

36
src/Discord.Net.Commands/Dependencies/DependencyMap.cs Normal file
View File

@@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
using System.Reflection;
namespace Discord.Commands
{
public class DependencyMap : IDependencyMap
{
private Dictionary<Type, object> map;
public DependencyMap()
{
map = new Dictionary<Type, object>();
}
public object Get(Type t)
{
if (!map.ContainsKey(t))
throw new KeyNotFoundException($"The dependency map does not contain \"{t.FullName}\"");
return map[t];
}
public T Get<T>() where T : class
{
return Get(typeof(T)) as T;
}
public void Add<T>(T obj)
{
var t = typeof(T);
if (map.ContainsKey(t))
throw new InvalidOperationException($"The dependency map already contains \"{t.FullName}\"");
map.Add(t, obj);
}
}
}

14
src/Discord.Net.Commands/Dependencies/IDependencyMap.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Discord.Commands
{
public interface IDependencyMap
{
object Get(Type t);
T Get<T>() where T : class;
void Add<T>(T obj);
}
}

2
src/Discord.Net.Commands/Module.cs
View File

@@ -43,7 +43,7 @@ namespace Discord.Commands
nextGroupPrefix = groupPrefix + groupAttrib.Prefix ?? type.Name;
else
nextGroupPrefix = groupPrefix;
SearchClass(ReflectionUtils.CreateObject(type), commands, type, nextGroupPrefix);
SearchClass(ReflectionUtils.CreateObject(type, Service), commands, type, nextGroupPrefix);
}
}
}

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

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
@@ -6,18 +7,64 @@ namespace Discord.Commands
{
internal class ReflectionUtils
{
internal static object CreateObject(TypeInfo typeInfo)
internal static object CreateObject(TypeInfo typeInfo, CommandService service, IDependencyMap map = null)
{
var constructor = typeInfo.DeclaredConstructors.Where(x => x.GetParameters().Length == 0).FirstOrDefault();
if (typeInfo.DeclaredConstructors.Count() > 1)
throw new InvalidOperationException($"Found too many constructors for \"{typeInfo.FullName}\"");
var constructor = typeInfo.DeclaredConstructors.FirstOrDefault();
if (constructor == null)
throw new InvalidOperationException($"Failed to find a valid constructor for \"{typeInfo.FullName}\"");
throw new InvalidOperationException($"Found no constructor for \"{typeInfo.FullName}\"");
object[] arguments = null;
ParameterInfo[] parameters = constructor.GetParameters();
// TODO: can this logic be made better/cleaner?
if (parameters.Length == 1)
{
if (parameters[0].ParameterType == typeof(IDependencyMap))
{
if (map != null)
arguments = new object[] { map };
else
throw new InvalidOperationException($"Could not find a valid constructor for \"{typeInfo.FullName}\" (an IDependencyMap is required)");
}
}
else if (parameters.Length == 2)
{
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)");
}
if (arguments == null)
{
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
{
return constructor.Invoke(null);
return constructor.Invoke(arguments);
}
catch (Exception ex)
{
throw new InvalidOperationException($"Failed to create \"{typeInfo.FullName}\"", ex);
throw new InvalidOperationException($"Could not create \"{typeInfo.FullName}\"", ex);
}
}
}