themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Modify PaginationTools output. This fixes some problems with wraparound in the server console.

Browse source
This commit is contained in:
MarioE 2013-10-04 19:30:16 -04:00
parent d4c7385781
commit c00c929ad6
1 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

43
TShockAPI/PaginationTools.cs
View file

@ -23,6 +23,9 @@ using System.Text;
namespace TShockAPI namespace TShockAPI
{ {
/// <summary>
/// Provides tools for sending paginated output.
/// </summary>
public static class PaginationTools public static class PaginationTools
{ {
public delegate Tuple<string, Color> LineFormatterDelegate(object lineData, int lineIndex, int pageNumber); public delegate Tuple<string, Color> LineFormatterDelegate(object lineData, int lineIndex, int pageNumber);
@ -105,7 +108,7 @@ namespace TShockAPI
this.FooterTextColor = Color.Yellow; this.FooterTextColor = Color.Yellow;
this.NothingToDisplayString = null; this.NothingToDisplayString = null;
this.LineFormatter = null; this.LineFormatter = null;
this.LineTextColor = Color.White; this.LineTextColor = Color.Yellow;
this.maxLinesPerPage = 4; this.maxLinesPerPage = 4;
this.pageLimit = 0; this.pageLimit = 0;
} }
@ -198,7 +201,7 @@ namespace TShockAPI
{ {
if (player is TSServerPlayer) if (player is TSServerPlayer)
{ {
Console.WriteLine(lineMessage); player.SendInfoMessage(lineMessage);
} }
else else
{ {
@ -239,11 +242,11 @@ namespace TShockAPI
PaginationTools.SendPage(player, pageNumber, dataToPaginate, dataToPaginate.Count, settings); PaginationTools.SendPage(player, pageNumber, dataToPaginate, dataToPaginate.Count, settings);
} }
public static List<string> BuildLinesFromTerms( public static List<string> BuildLinesFromTerms(IEnumerable terms, Func<object, string> termFormatter = null, string separator = ", ", int maxCharsPerLine = 80)
IEnumerable terms, Func<object, string> termFormatter = null, string separator = ", ", int maxCharsPerLine = 80)
{ {
List<string> lines = new List<string>(); List<string> lines = new List<string>();
StringBuilder lineBuilder = new StringBuilder(); StringBuilder lineBuilder = new StringBuilder();
foreach (object term in terms) foreach (object term in terms)
{ {
if (term == null && termFormatter == null) if (term == null && termFormatter == null)
@ -254,9 +257,7 @@ namespace TShockAPI
{ {
try try
{ {
termString = termFormatter(term); if ((termString = termFormatter(term)) == null)
if (termString == null)
continue; continue;
} }
catch (Exception ex) catch (Exception ex)
@ -270,41 +271,35 @@ namespace TShockAPI
termString = term.ToString(); termString = term.ToString();
} }
bool goesOnNextLine = (lineBuilder.Length + termString.Length + separator.Length > maxCharsPerLine); if (lineBuilder.Length + termString.Length + separator.Length < maxCharsPerLine)
if (!goesOnNextLine)
{ {
if (lineBuilder.Length > 0) lineBuilder.Append(termString).Append(separator);
lineBuilder.Append(separator);
lineBuilder.Append(termString);
} }
else else
{ {
// A separator should always be at the end of a line as we know it is followed by another line.
lineBuilder.Append(separator);
lines.Add(lineBuilder.ToString()); lines.Add(lineBuilder.ToString());
lineBuilder.Clear(); lineBuilder.Clear().Append(termString).Append(separator);
lineBuilder.Append(termString);
} }
} }
if (lineBuilder.Length > 0)
lines.Add(lineBuilder.ToString());
if (lineBuilder.Length > 0)
{
lines.Add(lineBuilder.ToString().Substring(0, lineBuilder.Length - 2));
}
return lines; return lines;
} }
public static bool TryParsePageNumber( public static bool TryParsePageNumber(List<string> commandParameters, int expectedParameterIndex, TSPlayer errorMessageReceiver, out int pageNumber)
List<string> commandParameters, int expectedParamterIndex, TSPlayer errorMessageReceiver, out int pageNumber)
{ {
pageNumber = 1; pageNumber = 1;
if (commandParameters.Count <= expectedParamterIndex) if (commandParameters.Count <= expectedParameterIndex)
return true; return true;
string pageNumberRaw = commandParameters[expectedParamterIndex]; string pageNumberRaw = commandParameters[expectedParameterIndex];
if (!int.TryParse(pageNumberRaw, out pageNumber) || pageNumber < 1) if (!int.TryParse(pageNumberRaw, out pageNumber) || pageNumber < 1)
{ {
if (errorMessageReceiver != null) if (errorMessageReceiver != null)
errorMessageReceiver.SendErrorMessage(string.Format("\"{0}\" is not a valid page number.", pageNumberRaw)); errorMessageReceiver.SendErrorMessage("\"{0}\" is not a valid page number.", pageNumberRaw);
pageNumber = 1; pageNumber = 1;
return false; return false;