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

Will now read sami files without the <P> tag

Browse Source
This commit is contained in:
niksedk 2014-06-05 15:56:16 +02:00
parent f66651d59f
commit c46da6fc76
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Logic/SubtitleFormats/Sami.cs
View File

@ -234,8 +234,17 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
const string syncTag = "<sync start=";
const string syncTagEnc = "<sync encrypted=\"true\" start=";
int syncStartPos = allInputLower.IndexOf(syncTag);
int index = syncStartPos + syncTag.Length;
int syncStartPosEnc = allInputLower.IndexOf(syncTagEnc);
if ((syncStartPosEnc >= 0 && syncStartPosEnc < syncStartPos) || syncStartPos == -1)
{
syncStartPos = syncStartPosEnc;
index = syncStartPosEnc + syncTagEnc.Length;
}
var p = new Paragraph();
while (syncStartPos >= 0)
{
@ -253,6 +262,10 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
index++;
int syncEndPos = allInputLower.IndexOf(syncTag, index);
int syncEndPosEnc = allInputLower.IndexOf(syncTagEnc, index);
if ((syncStartPosEnc >= 0 && syncStartPosEnc < syncStartPos) || syncEndPos == -1)
syncEndPos = syncEndPosEnc;
string text;
if (syncEndPos >= 0)
text = allInput.Substring(index, syncEndPos - index);
@ -308,7 +321,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
text = text.Replace(" ", " ");
text = text.Replace("</BODY>", string.Empty).Replace("</SAMI>", string.Empty).TrimEnd();
if (text.IndexOf(">") > 0)
int endSyncPos = text.ToUpper().IndexOf("</SYNC>");
if (text.IndexOf(">") > 0 && (text.IndexOf(">") < endSyncPos || endSyncPos == -1))
text = text.Remove(0, text.IndexOf(">")+1);
text = text.TrimEnd();
@ -396,6 +410,13 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
{
syncStartPos = allInputLower.IndexOf(syncTag, syncEndPos);
index = syncStartPos + syncTag.Length;
syncStartPosEnc = allInputLower.IndexOf(syncTagEnc, syncEndPos);
if ((syncStartPosEnc >= 0 && syncStartPosEnc < syncStartPos) || syncStartPos == -1)
{
syncStartPos = syncStartPosEnc;
index = syncStartPosEnc + syncTagEnc.Length;
}
}
}
if (p != null && !string.IsNullOrEmpty(p.Text) && subtitle.Paragraphs.IndexOf(p) == -1)