Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Use Contains(char[]) instead of multiple Contains(char) (Forms/FixCommonErrors)

Browse Source
This commit is contained in:
Waldi Ravens 2015-06-14 15:16:22 +02:00
parent 8cb277115f
commit 89e58e7a22
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Forms/FixCommonErrors.cs
View File

@ -1463,7 +1463,7 @@ namespace Nikse.SubtitleEdit.Forms
}
//fix missing spaces before/after music quotes - #He's so happy# -> #He's so happy#
if ((p.Text.Contains('#') || p.Text.Contains('♪') || p.Text.Contains('♫')) && p.Text.Length > 5)
if (p.Text.Length > 5 && p.Text.Contains(new[] { '#', '♪', '♫' }))
{
string newText = p.Text;
if (@"#♪♫".Contains(newText[0]) && !@" <".Contains(newText[1]) && !newText.Substring(1).StartsWith(Environment.NewLine) &&
@ -1945,7 +1945,7 @@ namespace Nikse.SubtitleEdit.Forms
nextText = HtmlUtil.RemoveHtmlTags(next.Text).TrimStart('-', '"', '„').TrimStart();
string tempNoHtml = HtmlUtil.RemoveHtmlTags(p.Text).TrimEnd();
if (IsOneLineUrl(p.Text) || p.Text.Contains('♪') || p.Text.Contains('♫') || p.Text.EndsWith('\''))
if (IsOneLineUrl(p.Text) || p.Text.Contains(new[] { '♪', '♫' }) || p.Text.EndsWith('\''))
{
// ignore urls
}
@ -2495,7 +2495,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (oldText.Contains(':') || oldText.Contains(';'))
if (oldText.Contains(new[] { ':', ';' }))
{
bool lastWasColon = false;
for (int j = 0; j < p.Text.Length; j++)
@ -5057,4 +5057,4 @@ namespace Nikse.SubtitleEdit.Forms
}
}
}
}

4
src/Logic/Forms/FixCommonErrorsHelper.cs
View File

@ -451,7 +451,7 @@ namespace Nikse.SubtitleEdit.Logic.Forms
{
s = s.TrimEnd().TrimEnd('.', '?', '!', ':', ';');
s = s.TrimStart('-');
if (s.IndexOfAny(new[] { '.', '?', '!', ':', ';', '-', '♪', '♫' }) < 0 &&
if (!s.Contains(new[] { '.', '?', '!', ':', ';', '-', '♪', '♫' }) &&
!(s.StartsWith('[') && s.Contains("]" + Environment.NewLine, StringComparison.Ordinal)) &&
!(s.StartsWith('(') && s.Contains(")" + Environment.NewLine, StringComparison.Ordinal)) &&
s != s.ToUpper())
@ -463,4 +463,4 @@ namespace Nikse.SubtitleEdit.Logic.Forms
}
}
}
}