snow/asternet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #51 from albertmata/master

Browse source 
Corrected a bug in ManagerConnection.BuildAction and change version detection regex.
This commit is contained in:
Ben Merrills 2016-04-04 16:04:43 +01:00
parent 416acc90f8 bb8f13c0f4
commit 91d0c8d10b
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Asterisk.2013/Asterisk.NET/Common.cs
View file

@ -18,8 +18,8 @@ namespace AsterNET
/// <summary>Line separator</summary>
public const string LINE_SEPARATOR = "\r\n";
public static Regex ASTERISK_VERSION = new Regex("^Asterisk\\s+\\D*([0-9]+.[0-9]+.[0-9]+|[1-9][0-9]-r[0-9]+).*$",
RegexOptions.Compiled | RegexOptions.IgnoreCase);
public static Regex ASTERISK_VERSION = new Regex( "^Asterisk\\s+\\D*([0-9]+.[0-9]+.[0-9]+|[1-9][0-9]-r[0-9]+|[0-9]+.[0-9]+-cert[0-9]).*$",
RegexOptions.Compiled | RegexOptions.IgnoreCase );
public static Regex SHOW_VERSION_FILES_PATTERN = new Regex("^([\\S]+)\\s+Revision: ([0-9\\.]+)");
public static char[] RESPONSE_KEY_VALUE_SEPARATOR = {':'};

10
Asterisk.2013/Asterisk.NET/Manager/ManagerConnection.cs
View file

@ -2162,12 +2162,16 @@ namespace AsterNET.Manager
}
IActionVariable actionVar = action as IActionVariable;
if(actionVar != null && actionVar.GetVariables().Count > 0)
if ( actionVar != null )
{
sb.Append(string.Concat("Variable: ", Helper.JoinVariables(actionVar.GetVariables(), VAR_DELIMITER, "="), Common.LINE_SEPARATOR));
var variables = actionVar.GetVariables();
if ( variables != null && variables.Count > 0 )
{
sb.Append( string.Concat( "Variable: ", Helper.JoinVariables( actionVar.GetVariables(), VAR_DELIMITER, "=" ), Common.LINE_SEPARATOR ) );
}
}
sb.Append(Common.LINE_SEPARATOR);
sb.Append(Common.LINE_SEPARATOR);
return sb.ToString();
}
#endregion