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

Make changes per discussion

Browse Source 
Instead of using fields, we will now use properties (that must have a setter).
This commit is contained in:
Christopher F
2016-12-14 17:07:24 -05:00
parent b33df6ad77
commit 7fb032c9d2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net.Commands/Attributes/InjectAttribute.cs
View File

@@ -2,8 +2,8 @@
namespace Discord.Commands namespace Discord.Commands
{ {
[AttributeUsage(AttributeTargets.Field)] [AttributeUsage(AttributeTargets.Property)]
public class InjectAttribute : Attribute public sealed class InjectAttribute : Attribute
{ {
} }
} }

16
src/Discord.Net.Commands/Utilities/ReflectionUtils.cs
View File

@@ -42,23 +42,23 @@ namespace Discord.Commands
try try
{ {
T type = (T)constructor.Invoke(args); T instance = (T)constructor.Invoke(args);
var fields = type.GetType().GetRuntimeFields().Where(p => p.GetCustomAttribute<InjectAttribute>() != null); var fields = instance.GetType().GetRuntimeProperties().Where(p => p.GetCustomAttribute<InjectAttribute>() != null).Where(p => p.CanWrite);
foreach (var field in fields) foreach (var field in fields)
{ {
object arg; object arg;
if (map == null || !map.TryGet(field.FieldType, out arg)) if (map == null || !map.TryGet(field.PropertyType, out arg))
{ {
if (field.FieldType == typeof(CommandService)) if (field.PropertyType == typeof(CommandService))
arg = service; arg = service;
else if (field.FieldType == typeof(IDependencyMap)) else if (field.PropertyType == typeof(IDependencyMap))
arg = map; arg = map;
else else
throw new InvalidOperationException($"Failed to inject \"{typeInfo.FullName}\", dependency \"{field.FieldType.FullName}\" was not found."); throw new InvalidOperationException($"Failed to inject \"{typeInfo.FullName}\", dependency \"{field.PropertyType.FullName}\" was not found.");
} }
field.SetValue(type, arg); field.SetValue(instance, arg);
} }
return type; return instance;
} }
catch (Exception ex) catch (Exception ex)
{ {