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

Closes #2654

Browse Source
This commit is contained in:
Ivandro Ismael 2017-11-29 22:09:14 +00:00
parent 8508cc72f4
commit 4adedf2568
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Logic/FindReplaceDialogHelper.cs
View File

@ -253,31 +253,27 @@ namespace Nikse.SubtitleEdit.Logic
// validate pattern if find type is regex
if (FindReplaceType.FindType == FindType.RegEx)
{
if (!Utilities.IsValidRegex(FindText))
if (!Utilities.IsValidRegex(_findText))
{
MessageBox.Show(Configuration.Settings.Language.General.RegularExpressionIsNotValid);
return count;
}
_regEx = new Regex(_findText);
}
// count matches
StringComparison comparison = FindReplaceType.FindType == FindType.Normal ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
foreach (var p in subtitle.Paragraphs)
{
if (p.Text.Length < FindText.Length)
continue;
switch (FindReplaceType.FindType)
if (FindReplaceType.FindType != FindType.RegEx)
{
case FindType.Normal:
count += GetWordCount(p.Text, _findText, wholeWord, StringComparison.OrdinalIgnoreCase);
break;
case FindType.CaseSensitive:
count += GetWordCount(p.Text, _findText, wholeWord, StringComparison.Ordinal);
break;
case FindType.RegEx:
count += _regEx.Matches(p.Text).Count;
break;
if (p.Text.Length < _findText.Length)
{
continue;
}
count += GetWordCount(p.Text, _findText, wholeWord, comparison);
}
else
{
count += _regEx.Matches(p.Text).Count;
}
}
return count;