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

Replaced DependencyMap with ServiceCollection and IServiceProvider (#625)

Browse Source
This commit is contained in:
RogueException
2017-05-04 12:52:26 -03:00
committed by GitHub
parent 7f1fc286cf
commit ba1982a3f9
18 changed files with 130 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Discord.Net.Commands/Info/CommandInfo.cs
View File

@@ -8,6 +8,7 @@ using System.Linq;
using System.Reflection;
using System.Runtime.ExceptionServices;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
namespace Discord.Commands
{
@@ -17,7 +18,7 @@ namespace Discord.Commands
private static readonly System.Reflection.MethodInfo _convertParamsMethod = typeof(CommandInfo).GetTypeInfo().GetDeclaredMethod(nameof(ConvertParamsList));
private static readonly ConcurrentDictionary<Type, Func<IEnumerable<object>, object>> _arrayConverters = new ConcurrentDictionary<Type, Func<IEnumerable<object>, object>>();
private readonly Func<ICommandContext, object[], IDependencyMap, Task> _action;
private readonly Func<ICommandContext, object[], IServiceProvider, Task> _action;
public ModuleInfo Module { get; }
public string Name { get; }
@@ -63,21 +64,20 @@ namespace Discord.Commands
_action = builder.Callback;
}
public async Task<PreconditionResult> CheckPreconditionsAsync(ICommandContext context, IDependencyMap map = null)
public async Task<PreconditionResult> CheckPreconditionsAsync(ICommandContext context, IServiceProvider services = null)
{
if (map == null)
map = DependencyMap.Empty;
services = services ?? EmptyServiceProvider.Instance;
foreach (PreconditionAttribute precondition in Module.Preconditions)
{
var result = await precondition.CheckPermissions(context, this, map).ConfigureAwait(false);
var result = await precondition.CheckPermissions(context, this, services).ConfigureAwait(false);
if (!result.IsSuccess)
return result;
}
foreach (PreconditionAttribute precondition in Preconditions)
{
var result = await precondition.CheckPermissions(context, this, map).ConfigureAwait(false);
var result = await precondition.CheckPermissions(context, this, services).ConfigureAwait(false);
if (!result.IsSuccess)
return result;
}
@@ -96,7 +96,7 @@ namespace Discord.Commands
return await CommandParser.ParseArgs(this, context, input, 0).ConfigureAwait(false);
}
public Task<ExecuteResult> ExecuteAsync(ICommandContext context, ParseResult parseResult, IDependencyMap map)
public Task<ExecuteResult> ExecuteAsync(ICommandContext context, ParseResult parseResult, IServiceProvider services)
{
if (!parseResult.IsSuccess)
return Task.FromResult(ExecuteResult.FromError(parseResult));
@@ -117,12 +117,11 @@ namespace Discord.Commands
paramList[i] = parseResult.ParamValues[i].Values.First().Value;
}
return ExecuteAsync(context, argList, paramList, map);
return ExecuteAsync(context, argList, paramList, services);
}
public async Task<ExecuteResult> ExecuteAsync(ICommandContext context, IEnumerable<object> argList, IEnumerable<object> paramList, IDependencyMap map)
public async Task<ExecuteResult> ExecuteAsync(ICommandContext context, IEnumerable<object> argList, IEnumerable<object> paramList, IServiceProvider services)
{
if (map == null)
map = DependencyMap.Empty;
services = services ?? EmptyServiceProvider.Instance;
try
{
@@ -132,7 +131,7 @@ namespace Discord.Commands
{
var parameter = Parameters[position];
var argument = args[position];
var result = await parameter.CheckPreconditionsAsync(context, argument, map).ConfigureAwait(false);
var result = await parameter.CheckPreconditionsAsync(context, argument, services).ConfigureAwait(false);
if (!result.IsSuccess)
return ExecuteResult.FromError(result);
}
@@ -140,12 +139,12 @@ namespace Discord.Commands
switch (RunMode)
{
case RunMode.Sync: //Always sync
await ExecuteAsyncInternal(context, args, map).ConfigureAwait(false);
await ExecuteAsyncInternal(context, args, services).ConfigureAwait(false);
break;
case RunMode.Async: //Always async
var t2 = Task.Run(async () =>
{
await ExecuteAsyncInternal(context, args, map).ConfigureAwait(false);
await ExecuteAsyncInternal(context, args, services).ConfigureAwait(false);
});
break;
}
@@ -157,12 +156,12 @@ namespace Discord.Commands
}
}
private async Task ExecuteAsyncInternal(ICommandContext context, object[] args, IDependencyMap map)
private async Task ExecuteAsyncInternal(ICommandContext context, object[] args, IServiceProvider services)
{
await Module.Service._cmdLogger.DebugAsync($"Executing {GetLogText(context)}").ConfigureAwait(false);
try
{
await _action(context, args, map).ConfigureAwait(false);
await _action(context, args, services).ConfigureAwait(false);
}
catch (Exception ex)
{

8
src/Discord.Net.Commands/Info/ParameterInfo.cs
View File

@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
namespace Discord.Commands
{
@@ -39,14 +40,13 @@ namespace Discord.Commands
_reader = builder.TypeReader;
}
public async Task<PreconditionResult> CheckPreconditionsAsync(ICommandContext context, object arg, IDependencyMap map = null)
public async Task<PreconditionResult> CheckPreconditionsAsync(ICommandContext context, object arg, IServiceProvider services = null)
{
if (map == null)
map = DependencyMap.Empty;
services = EmptyServiceProvider.Instance;
foreach (var precondition in Preconditions)
{
var result = await precondition.CheckPermissions(context, this, arg, map).ConfigureAwait(false);
var result = await precondition.CheckPermissions(context, this, arg, services).ConfigureAwait(false);
if (!result.IsSuccess)
return result;
}