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

Fix hang in CsvNuendo - thx Dvid :)

Browse Source
This commit is contained in:
niksedk 2023-10-23 11:06:59 +02:00
parent 6df5a64e3a
commit c9d61c3a9c
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SubtitleEdit.sln.DotSettings
View File

@ -35,6 +35,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Matroska/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Nikse/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Nllb/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Nuendo/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Purfview/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Tahoma/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Tesseract/@EntryIndexedValue">True</s:Boolean>

44
src/libse/SubtitleFormats/CsvNuendo.cs
View File

@ -8,10 +8,10 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
{
public class CsvNuendo : SubtitleFormat
{
private static readonly Regex CsvLine = new Regex("^(\"(.*)\")*,\\d+:\\d+:\\d+:\\d+,\\d+:\\d+:\\d+:\\d+,(\"(.*)\")*", RegexOptions.Compiled);
private static readonly Regex CsvLineNoQuotes = new Regex("[^\"][^,]+[^\"],\\d+:\\d+:\\d+:\\d+,\\d+:\\d+:\\d+:\\d+,[^\"][^,]+[^\"]", RegexOptions.Compiled);
private static readonly Regex CsvLineNoQuotesFirst = new Regex("[^\"][^,]+[^\"],\\d+:\\d+:\\d+:\\d+,\\d+:\\d+:\\d+:\\d+,(\"(.*)\")*", RegexOptions.Compiled);
private static readonly Regex CsvLineAllQuotes = new Regex("^(\"(.*)\")*,\"\\d+:\\d+:\\d+:\\d+\",\"\\d+:\\d+:\\d+:\\d+\",(\"(.*)\")*", RegexOptions.Compiled);
private static readonly Regex CsvLine = new Regex("^(\"(.*)\")*,\\d+:\\d+:\\d+:\\d+,\\d+:\\d+:\\d+:\\d+,(\"(.*)\")*", RegexOptions.Compiled, TimeSpan.FromSeconds(2));
private static readonly Regex CsvLineNoQuotes = new Regex("[^\"][^,]+[^\"],\\d+:\\d+:\\d+:\\d+,\\d+:\\d+:\\d+:\\d+,[^\"][^,]+[^\"]", RegexOptions.Compiled, TimeSpan.FromSeconds(2));
private static readonly Regex CsvLineNoQuotesFirst = new Regex("[^\"][^,]+[^\"],\\d+:\\d+:\\d+:\\d+,\\d+:\\d+:\\d+:\\d+,(\"(.*)\")*", RegexOptions.Compiled, TimeSpan.FromSeconds(2));
private static readonly Regex CsvLineAllQuotes = new Regex("^(\"(.*)\")*,\"\\d+:\\d+:\\d+:\\d+\",\"\\d+:\\d+:\\d+:\\d+\",(\"(.*)\")*", RegexOptions.Compiled, TimeSpan.FromSeconds(2));
private const string LineFormat = "{1}{0}{2}{0}{3}{0}{4}";
private static readonly string Header = string.Format(LineFormat, ",", "\"Character\"", "\"Timecode In\"", "\"Timecode Out\"", "\"Dialogue\"");
@ -27,7 +27,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
for (var index = 0; index < lines.Count; index++)
{
var line = lines[index];
if (index == 0 &&
if (index == 0 &&
(line.StartsWith("<tt xmlns", StringComparison.Ordinal) ||
line.StartsWith("<?xml version", StringComparison.Ordinal)))
{
@ -35,21 +35,29 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
sb.Append(line);
if (line.IndexOf(':') > 0 &&
(CsvLine.IsMatch(line) ||
CsvLineNoQuotes.IsMatch(line) ||
CsvLineAllQuotes.IsMatch(line) ||
CsvLineNoQuotesFirst.IsMatch(line)))
try
{
fine++;
}
else
{
errors++;
if (fine == 0 && errors > 10)
if (line.IndexOf(':') > 0 &&
(CsvLine.IsMatch(line) ||
CsvLineNoQuotes.IsMatch(line) ||
CsvLineAllQuotes.IsMatch(line) ||
CsvLineNoQuotesFirst.IsMatch(line)))
{
return false;
fine++;
}
else
{
errors++;
if (fine == 0 && errors > 10)
{
return false;
}
}
}
catch
{
return false;
}
}
@ -79,7 +87,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
Paragraph p = null;
foreach (var line in lines)
{
if (line.Contains(':') &&
if (line.Contains(':') &&
CsvLine.IsMatch(line) ||
CsvLineNoQuotes.IsMatch(line) ||
CsvLineAllQuotes.IsMatch(line) ||