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

Fixed parsing errors when the first argument is on a new line

Browse Source
This commit is contained in:
RogueException
2016-07-30 00:29:25 -03:00
parent c5569a44ea
commit 3077249705
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,8 @@ namespace Discord.Commands
{ {
internal class CommandMap internal class CommandMap
{ {
static readonly char[] _whitespaceChars = new char[] { ' ', '\r', '\n' };
private readonly ConcurrentDictionary<string, CommandMapNode> _nodes; private readonly ConcurrentDictionary<string, CommandMapNode> _nodes;
public CommandMap() public CommandMap()
@@ -16,15 +18,16 @@ namespace Discord.Commands
public void AddCommand(Command command) public void AddCommand(Command command)
{ {
string text = command.Text; string text = command.Text;
int nextSpace = text.IndexOf(' '); int nextSpace = NextWhitespace(text);
string name; string name;
if (nextSpace == -1)
name = command.Text;
else
name = command.Text.Substring(0, nextSpace);
lock (this) lock (this)
{ {
if (nextSpace == -1)
name = command.Text;
else
name = command.Text.Substring(0, nextSpace);
var nextNode = _nodes.GetOrAdd(name, x => new CommandMapNode(x)); var nextNode = _nodes.GetOrAdd(name, x => new CommandMapNode(x));
nextNode.AddCommand(nextSpace == -1 ? "" : text, nextSpace + 1, command); nextNode.AddCommand(nextSpace == -1 ? "" : text, nextSpace + 1, command);
} }
@@ -32,16 +35,16 @@ namespace Discord.Commands
public void RemoveCommand(Command command) public void RemoveCommand(Command command)
{ {
string text = command.Text; string text = command.Text;
int nextSpace = text.IndexOf(' '); int nextSpace = NextWhitespace(text);
string name; string name;
if (nextSpace == -1)
name = command.Text;
else
name = command.Text.Substring(0, nextSpace);
lock (this) lock (this)
{ {
if (nextSpace == -1)
name = command.Text;
else
name = command.Text.Substring(0, nextSpace);
CommandMapNode nextNode; CommandMapNode nextNode;
if (_nodes.TryGetValue(name, out nextNode)) if (_nodes.TryGetValue(name, out nextNode))
{ {
@@ -54,16 +57,16 @@ namespace Discord.Commands
public IEnumerable<Command> GetCommands(string text) public IEnumerable<Command> GetCommands(string text)
{ {
int nextSpace = text.IndexOf(' '); int nextSpace = NextWhitespace(text);
string name; string name;
if (nextSpace == -1)
name = text;
else
name = text.Substring(0, nextSpace);
lock (this) lock (this)
{ {
if (nextSpace == -1)
name = text;
else
name = text.Substring(0, nextSpace);
CommandMapNode nextNode; CommandMapNode nextNode;
if (_nodes.TryGetValue(name, out nextNode)) if (_nodes.TryGetValue(name, out nextNode))
return nextNode.GetCommands(text, nextSpace + 1); return nextNode.GetCommands(text, nextSpace + 1);
@@ -71,5 +74,17 @@ namespace Discord.Commands
return Enumerable.Empty<Command>(); return Enumerable.Empty<Command>();
} }
} }
private static int NextWhitespace(string text)
{
int lowest = int.MaxValue;
for (int i = 0; i < _whitespaceChars.Length; i++)
{
int index = text.IndexOf(_whitespaceChars[i]);
if (index != -1 && index < lowest)
lowest = index;
}
return (lowest != int.MaxValue) ? lowest : -1;
}
} }
} }