RPCS3/archived-discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2026-01-31 01:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

implement string trimming based on visible characters length

Browse Source
This commit is contained in:
13xforever
2019-02-06 22:02:33 +05:00
parent 407a07f792
commit bcd708e771
4 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CompatBot/Commands/Invites.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CompatApiClient.Utils;

8
CompatBot/Utils/AsciiTable.cs
View File

@@ -133,10 +133,10 @@ namespace CompatBot.Utils
throw new InvalidOperationException("Can't format table as every column is disabled");
// header
result.Append(columns[firstIdx].Trim(width[firstIdx]).PadRightVisible(width[firstIdx]));
result.Append(columns[firstIdx].TrimVisible(maxWidth[firstIdx]).PadRightVisible(width[firstIdx]));
for (var i = firstIdx+1; i < columns.Length; i++)
if (!disabled[i])
result.Append(" │ ").Append(columns[i].Trim(width[i]).PadRightVisible(width[i])); // header is always aligned to the left
result.Append(" │ ").Append(columns[i].TrimVisible(maxWidth[i]).PadRightVisible(width[i])); // header is always aligned to the left
result.AppendLine();
//header separator
result.Append("".PadRight(width[firstIdx], '─'));
@@ -147,12 +147,12 @@ namespace CompatBot.Utils
//rows
foreach (var row in rows)
{
var cell = row[firstIdx].Trim(width[firstIdx]);
var cell = row[firstIdx].TrimVisible(maxWidth[firstIdx]);
result.Append(alignToRight[firstIdx] ? cell.PadLeftVisible(width[firstIdx]) : cell.PadRightVisible(width[firstIdx]));
for (var i = firstIdx+1; i < row.Length; i++)
if (!disabled[i])
{
cell = row[i].Trim(width[i]);
cell = row[i].TrimVisible(maxWidth[i]);
result.Append(" │ ").Append(alignToRight[i] ?cell.PadLeftVisible(width[i]) : cell.PadRightVisible(width[i]));
}
result.AppendLine();

26
CompatBot/Utils/StringUtils.cs
View File

@@ -118,6 +118,32 @@ namespace CompatBot.Utils
return c;
}
public static string TrimVisible(this string s, int maxLength)
{
if (string.IsNullOrEmpty(s))
return s;
if (maxLength < 1)
throw new ArgumentException("Max length can't be less than 1", nameof(maxLength));
if (s.Length <= maxLength)
return s;
var c = 0;
var e = StringInfo.GetTextElementEnumerator(s.Normalize());
var result = new StringBuilder();
while (e.MoveNext() && c < maxLength-1)
{
var strEl = e.GetTextElement();
result.Append(strEl);
if (char.IsControl(strEl[0]) || char.GetUnicodeCategory(strEl[0]) == UnicodeCategory.Format)
continue;
c++;
}
return result.Append("…").ToString();
}
public static string PadLeftVisible(this string s, int totalWidth, char padding = ' ')
{
s = s ?? "";

10
Tests/StringUtilTests.cs
View File

@@ -7,7 +7,7 @@ namespace Tests
public class StringUtilTests
{
[Test]
public void StringLengthTest()
public void VisibleLengthTest()
{
Assert.That("🇭🇷".GetVisibleLength(), Is.EqualTo(2));
Assert.That("\u200d".GetVisibleLength(), Is.EqualTo(0));
@@ -15,5 +15,13 @@ namespace Tests
Assert.That("a\u0304\u0308bc\u0327".GetVisibleLength(), Is.EqualTo(3));
Assert.That("Megamouse".GetVisibleLength(), Is.EqualTo(9));
}
[Test]
public void VisibleTrimTest()
{
Assert.That("abc".TrimVisible(100), Is.EqualTo("abc"));
Assert.That("abc".TrimVisible(3), Is.EqualTo("abc"));
Assert.That("abc".TrimVisible(2), Is.EqualTo("a…"));
}
}
}