Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/strippable text optimization #9182

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+74 −71
Open

Feature/strippable text optimization #9182

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3156eb3
Refactor `StrippableText` construction logic.
ivandrofly Jan 6, 2025
5835b9d
Fix incorrect assertions in StrippableTextFontDontTouch test
ivandrofly Jan 6, 2025
aa624de
Fix improper character stripping logic in StrippableText.
ivandrofly Jan 6, 2025
e21ee6c
Add support for identifying and handling ASS tags.
ivandrofly Jan 6, 2025
18198d2
Refactor KnownHtmlTags logic and improve tag checking.
ivandrofly Jan 6, 2025
fd59ac5
Use StringComparison.Ordinal for consistency in tag checks
ivandrofly Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Tests/Logic/StrippableTextTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ public void StrippableTextItalic3()
public void StrippableTextFontDontTouch()
{
var st = new StrippableText("{MAN} Hi, how are you today!");
Assert.AreEqual("", st.Pre);
Assert.AreEqual("{", st.Pre);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this test was wrong.

We should treat '{' as '[' When it hold hearing impaired word/sentence

Assert.AreEqual("!", st.Post);
Assert.AreEqual("{MAN} Hi, how are you today", st.StrippedText);
Assert.AreEqual("MAN} Hi, how are you today", st.StrippedText);
}

[TestMethod]
Expand Down
125 changes: 49 additions & 76 deletions src/libse/Common/StrippableText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,99 +21,72 @@ public StrippableText(string text)
public StrippableText(string input, string stripStartCharacters, string stripEndCharacters)
{
OriginalText = input;
var text = input;

Pre = string.Empty;
if (text.Length > 0 && ("<{" + stripStartCharacters).Contains(text[0]))
var len = input.Length;
var l = 0;
for (var r = 0; r < len; r++)
{
int beginLength;
do
if (input[r] == '<' || input[r] == '{')
{
l = r;
}
else if ((input[r] == '>' && input[l] == '<') || (input[r] == '}' && input[l] == '{'))
{
beginLength = text.Length;
// get the tag from l to r
var tag = input.Substring(l, r - l + 1);

while (text.Length > 0 && stripStartCharacters.Contains(text[0]))
// {man} etc...
if (tag[0] == '{' && !tag.StartsWith("{\\", StringComparison.Ordinal))
{
Pre += text[0];
text = text.Remove(0, 1);
}
// try to find non-visible char
l++;
while (l < r && stripStartCharacters.Contains(input[l]) || input[l] == '{' || input[l] == '<')
{
l++;
}

// ASS/SSA codes like {\an9}
int endIndex = text.IndexOf('}');
if (endIndex > 0 && text.StartsWith("{\\", StringComparison.Ordinal))
{
int nextStartIndex = text.IndexOf('{', 2);
if (nextStartIndex == -1 || nextStartIndex > endIndex)
// non-special char found in between l and r
if (input[l] != '<' && input[l] != '{')
{
endIndex++;
Pre += text.Substring(0, endIndex);
text = text.Remove(0, endIndex);
break;
}
}

// tags like <i> or <font face="Segoe Print" color="#ff0000">
endIndex = text.IndexOf('>');
if (text.StartsWith('<') && endIndex >= 2)
{
endIndex++;
Pre += text.Substring(0, endIndex);
text = text.Remove(0, endIndex);
}
l = r + 1;
}
else if (input[l] != '<' && stripStartCharacters.Contains(input[r]))
{
l = r + 1;
}
else if (input[l] != '<' && input[l] != '{')
{
break;
}
while (text.Length < beginLength);
}

Post = string.Empty;
if (text.Length > 0 && (">" + stripEndCharacters).Contains(text[text.Length - 1]))
var k = len - 1;
for (int j = len - 1; j >= l; j--)
{
int beginLength;
do
if (input[j] == '>')
{
beginLength = text.Length;

while (text.Length > 0 && stripEndCharacters.Contains(text[text.Length - 1]))
{
Post = text[text.Length - 1] + Post;
text = text.Substring(0, text.Length - 1);
}

if (text.EndsWith('>'))
{
// tags </i> </b> </u>
if (text.EndsWith("</i>", StringComparison.OrdinalIgnoreCase) ||
text.EndsWith("</b>", StringComparison.OrdinalIgnoreCase) ||
text.EndsWith("</u>", StringComparison.OrdinalIgnoreCase))
{
Post = text.Substring(text.Length - 4) + Post;
text = text.Substring(0, text.Length - 4);
}

// tag </font>
if (text.EndsWith("</font>", StringComparison.OrdinalIgnoreCase))
{
Post = text.Substring(text.Length - 7) + Post;
text = text.Substring(0, text.Length - 7);
}

if (text.EndsWith('>'))
{
var lastIndexOfStart = text.LastIndexOf("<");
if (lastIndexOfStart >= 0)
{
var tag = text.Substring(lastIndexOfStart);
tag = tag.TrimStart('<').TrimEnd('>');
if (tag.StartsWith("/c.", StringComparison.Ordinal) && !tag.Contains(' ') && !tag.Contains('\n'))
{
Post = text.Substring(lastIndexOfStart) + Post;
text = text.Substring(0, lastIndexOfStart);
}
}
}
}
k = j;
}
else if (input[j] == '<' && input[k] == '>')
{
k = j - 1;
}
else if (stripEndCharacters.Contains(input[j]))
{
k = j - 1;
}
else if (input[k] != '>')
{
break;
}
while (text.Length < beginLength);
}

StrippedText = text;
StrippedText = input.Substring(l, k - l + 1);
Pre = input.Substring(0, l);
Post = input.Substring(k + 1);
}

private static string GetAndInsertNextId(List<string> replaceIds, List<string> replaceNames, string name, int idName)
Expand Down