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

Implement configurable command node separators

Browse Source 
This fixes #304 over foxbot's PR for the same issue.
This commit is contained in:
FiniteReality
2016-12-09 10:31:57 +00:00
parent 803b65212e
commit 70d30efb94
6 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Discord.Net.Commands/Map/CommandMap.cs
View File

@@ -12,20 +12,20 @@ namespace Discord.Commands
_root = new CommandMapNode("");
}
public void AddCommand(CommandInfo command)
public void AddCommand(CommandInfo command, CommandService service)
{
foreach (string text in GetAliases(command))
_root.AddCommand(text, 0, command);
_root.AddCommand(service, text, 0, command);
}
public void RemoveCommand(CommandInfo command)
public void RemoveCommand(CommandInfo command, CommandService service)
{
foreach (string text in GetAliases(command))
_root.RemoveCommand(text, 0, command);
_root.RemoveCommand(service, text, 0, command);
}
public IEnumerable<CommandInfo> GetCommands(string text)
public IEnumerable<CommandInfo> GetCommands(string text, CommandService service)
{
return _root.GetCommands(text, 0);
return _root.GetCommands(service, text, 0);
}
private IReadOnlyList<string> GetAliases(CommandInfo command)

66
src/Discord.Net.Commands/Map/CommandMapNode.cs
View File

@@ -23,9 +23,9 @@ namespace Discord.Commands
_commands = ImmutableArray.Create<CommandInfo>();
}
public void AddCommand(string text, int index, CommandInfo command)
public void AddCommand(CommandService service, string text, int index, CommandInfo command)
{
int nextSpace = NextWhitespace(text, index);
int nextSpace = NextWhitespace(service, text, index);
string name;
lock (_lockObj)
@@ -44,13 +44,13 @@ namespace Discord.Commands
name = text.Substring(index, nextSpace - index);
var nextNode = _nodes.GetOrAdd(name, x => new CommandMapNode(x));
nextNode.AddCommand(nextSpace == -1 ? "" : text, nextSpace + 1, command);
nextNode.AddCommand(service, nextSpace == -1 ? "" : text, nextSpace + 1, command);
}
}
}
public void RemoveCommand(string text, int index, CommandInfo command)
public void RemoveCommand(CommandService service, string text, int index, CommandInfo command)
{
int nextSpace = NextWhitespace(text, index);
int nextSpace = NextWhitespace(service, text, index);
string name;
lock (_lockObj)
@@ -67,7 +67,7 @@ namespace Discord.Commands
CommandMapNode nextNode;
if (_nodes.TryGetValue(name, out nextNode))
{
nextNode.RemoveCommand(nextSpace == -1 ? "" : text, nextSpace + 1, command);
nextNode.RemoveCommand(service, nextSpace == -1 ? "" : text, nextSpace + 1, command);
if (nextNode.IsEmpty)
_nodes.TryRemove(name, out nextNode);
}
@@ -75,32 +75,57 @@ namespace Discord.Commands
}
}
public IEnumerable<CommandInfo> GetCommands(string text, int index)
public IEnumerable<CommandInfo> GetCommands(CommandService service, string text, int index)
{
int nextSpace = NextWhitespace(text, index);
string name;
int nextCommand = NextCommandSegment(service, text, index);
string name = null;
var commands = _commands;
for (int i = 0; i < commands.Length; i++)
yield return _commands[i];
if (text != "")
//got all command segments or base-level command
if (nextCommand == -1)
{
if (nextSpace == -1)
name = text.Substring(index);
else
name = text.Substring(index, nextSpace - index);
var commands = _commands;
for (int i = 0; i < commands.Length; i++)
yield return _commands[i];
//are we a base-level command?
int nextSpace = NextWhitespace(service, text, index);
if (nextSpace != -1)
{
name = text.Substring(index, nextSpace - index);
}
else
{
name = text.Substring(index);
}
}
else
{
name = text.Substring(index, nextCommand - index);
}
if (name != null)
{
CommandMapNode nextNode;
if (_nodes.TryGetValue(name, out nextNode))
{
foreach (var cmd in nextNode.GetCommands(nextSpace == -1 ? "" : text, nextSpace + 1))
foreach (var cmd in nextNode.GetCommands(service, text, nextCommand + 1))
yield return cmd;
}
}
}
private static int NextWhitespace(string text, int startIndex)
private static int NextCommandSegment(CommandService service, string text, int startIndex)
{
int lowest = int.MaxValue;
int index = text.IndexOf(service._splitCharacter, startIndex);
if (index != -1 && index < lowest)
lowest = index;
return (lowest != int.MaxValue) ? lowest : -1;
}
private static int NextWhitespace(CommandService service, string text, int startIndex)
{
int lowest = int.MaxValue;
for (int i = 0; i < _whitespaceChars.Length; i++)
@@ -109,6 +134,7 @@ namespace Discord.Commands
if (index != -1 && index < lowest)
lowest = index;
}
return (lowest != int.MaxValue) ? lowest : -1;
}
}