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

Fixed cvs quote encoding/decoding in new subtitle format csv3

Browse Source
This commit is contained in:
niksedk 2014-04-02 21:50:09 +02:00
parent 5ce0d1dbbb
commit b979444717
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Logic/SubtitleFormats/Csv3.cs
View File

@ -73,6 +73,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
line1 = arr[0];
if (arr.Length > 1)
line2 = arr[1];
line1 = line1.Replace("\"", "\"\"");
line2 = line2.Replace("\"", "\"\"");
sb.AppendLine(string.Format(format, Seperator, EncodeTimeCode(p.StartTime), EncodeTimeCode(p.EndTime), line1, line2));
}
return sb.ToString().Trim();
@ -120,6 +122,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
if (string.IsNullOrEmpty(csv))
return string.Empty;
csv = csv.Replace("\"\"", "\"");
var sb = new StringBuilder();
csv = csv.Trim();
if (csv.StartsWith("\""))
@ -140,9 +144,12 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
{
isBreak = false;
}
else
else if (i == 0 || i == csv.Length - 1 || sb.ToString().EndsWith(Environment.NewLine))
{
sb.Append(Environment.NewLine);
sb.Append("\"");
}
else
{
isBreak = true;
}
}
@ -153,6 +160,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
else if (isBreak && s == ",")
{
sb.Append(Environment.NewLine);
}
else
{