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

Allow some malformed WebVTT - thx manuelrn :)

Browse Source 
Fix #5334
This commit is contained in:
niksedk 2021-09-11 00:55:00 +02:00
parent f37a701e6e
commit 78387fd5ed
4 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LanguageMaster.xml
View File

@ -2484,6 +2484,9 @@ Continue?</RestoreDefaultSettingsMsg>
<MinFrameGap>Min. gap in frames</MinFrameGap>
<XFramesAtYFrameRateGivesZMs>{0} frames at a frame rate of {1} gives {2} milliseconds.</XFramesAtYFrameRateGivesZMs>
<UseXAsNewGap>Use "{0}" milliseconds as new minimum gap?</UseXAsNewGap>
<BDOpensIn>BD sup/bdn-xml opens in</BDOpensIn>
<BDOpensInOcr>OCR</BDOpensInOcr>
<BDOpensInEdit>Edit</BDOpensInEdit>
</Settings>
<SettingsMpv>
<DownloadMpv>Download mpv lib</DownloadMpv>

30
src/libse/SubtitleFormats/WebVTT.cs
View File

@ -134,7 +134,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
positionInfo = Configuration.Settings.SubtitleSettings.WebVttCueAn2;
}
return (" " + positionInfo).TrimEnd();
return (" " + positionInfo).TrimEnd();
}
internal static string FormatText(Paragraph p)
@ -329,6 +329,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
{
paragraph.Text = ColorWebVttToHtml(paragraph.Text);
paragraph.Text = EscapeDecodeText(paragraph.Text);
paragraph.Text = RemoveWeirdReatingHeader(paragraph.Text);
paragraph.StartTime.TotalMilliseconds += addSeconds * 1000;
paragraph.EndTime.TotalMilliseconds += addSeconds * 1000;
}
@ -342,6 +343,33 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
private string RemoveWeirdReatingHeader(string input)
{
var text = input.Trim();
text = text.Replace(" " + Environment.NewLine, Environment.NewLine);
text = text.Replace(Environment.NewLine + " ", Environment.NewLine);
if (text.Contains(Environment.NewLine + "WEBVTT"))
{
if (text.EndsWith('}') && text.Contains("STYLE"))
{
text = text.Remove(text.IndexOf(Environment.NewLine + "WEBVTT"));
}
}
else if (text.EndsWith(Environment.NewLine + "WEBVTT", StringComparison.Ordinal))
{
text = text.Remove(text.LastIndexOf(Environment.NewLine + "WEBVTT"));
}
else if (text.Contains(Environment.NewLine + "STYLE" + Environment.NewLine))
{
if (text.TrimEnd().EndsWith("}"))
{
text = text.Remove(text.IndexOf(Environment.NewLine + "STYLE" + Environment.NewLine));
}
}
return text;
}
private static double GetXTimeStampSeconds(string input)
{
if (!Configuration.Settings.SubtitleSettings.WebVttUseXTimestampMap)

22
src/ui/Forms/Main.resx
View File

@ -538,16 +538,16 @@
<data name="toolStripButtonAssaDraw.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIvSURBVFhH1ZbPShtRFMYH6aaCXZR2E5NadSdu/AOi79DH
aDbFxqbNY7iQJGYSsnEhRG3c9CFcKFhwY11qLNguWuiqhDD9zsk98To5JnNnVOoPfszcmdz7fXMThniP
Dt/3g2q16qSZmpxarRbE4c5K0EJMdiG6IFEB2cZiscgyWtBtglgFek87CC0wLHAuYId7OO3TNzcJLdQW
OBWgX7mghlv20IJF4FSg0+nwJC1Qk7m60MNJELmAbD1tsRamuslT9HASuBcIhwyR0cJJELuA4JWur2ky
WjgJYhXYPuPT4Mu3dT6GQ20ZLZwEsQoQ/uHboHqU5fPzP/3BIqOFkyBygXq9zhMEChcJLXxim28NJHIB
otlsdidZ4VKACBcgGo0Gh9ymWXo4lUrlV3fJ/gJSIhxOYOd+myWSUS6XeUEtnBQKB+YE2E/4efp1cJlf
Y82l6NBCxNZxXg0XhVKpROEnZjpjF7j6lHcrYdZVQ223jj92Pxf6bvcRTgX2pibcd0GeXgvUJNrt9o0A
Cid30umnUqCVyxXM7cFIAVfMdG93Mr0hBWjcyr//GmsXXMT/w59mau/p96Yyp+aS51wgCfbTC60POfff
QhwknM2k/to+fIGQUuDeSmihtruTrx6mgBmqSIEfBccX0zD28cKJUuD72rvFe9kFCfczqTcYPoPP4Qv4
0hxpPAavX0yrqysYJ+YJHIUUMA6n4Sycg0tw2Rzn4Qyk+ylIn6d5I/B/wfP+AZDTfGLErdaxAAAAAElF
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIvSURBVFhH1ZbBThNRFIYnxI0kujCyAIu1sCNsVBKj7+Bj
wIbU1kIfgwVpa6dNNyxIKlg2PoQLTCBxoy6hmgALSFiRphn+c3pPuUwP7dwZIPolX2buTO/9/7ltJvX+
O3zfD2q1mpNmanLq9XoQh1srQQsxS6+jCxIVkG0slUosowXdJIhVoP+0w9ACwwLnAna4h9MBfXOT0EJt
gVMB+pULarhlHy1YBE4Fut0uT9ICNZmjQz2cBJELyNbTFmthqp94ih5OAvcC4ZARMlo4CWIXELzy1TVN
RgsnQawCm7/5NPj6a42P4VBbRgsnQawChL+7GNS+L/H5wflgsMho4SSIXKDRaPAEgcJFQgtPb/KtoUQu
QLRard4kK1wKEOECRLPZ5JCbNEuPplqtnvaWHCwgJcLhBHbuzCyRjEqlwgtq4aRQ/GZOgP2EX2ZfBH8K
edZcig4tRGzsFdRwUSiXyxT+w0xn7AJHqwW3EmZdNdR2Y2+l97nQd7uDcCqwPZN23wV5ei1Qk+h0OtcC
KJz8nEo9lALtXK5obg9HCrhipntbmdS6FKBxu/BhP9YuuIj/hydmav/pt2emf5pLnnOBJNhPL7Q/5tx/
C3GQcDY1eWF7/wVCSoE7K6GF2m5lnt9PATNUkQLHRccX0yh28MKJUuBvfnnhTnZBwv3pqfcYPoZP4FM4
YY40fgSvXkzZ7DuME/MAjkMKeAZn4Tx8Cd/At+b4Cs5Buj8F6fM0bwz+K3jeJXM3fFok18CtAAAAAElF
TkSuQmCC
</value>
</data>
@ -791,7 +791,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAcQBKwHEASsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAcwBKwHMASsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

9
src/ui/Logic/LanguageDeserializer.cs
View File

@ -6820,6 +6820,15 @@ namespace Nikse.SubtitleEdit.Logic
case "Settings/UseXAsNewGap":
language.Settings.UseXAsNewGap = reader.Value;
break;
case "Settings/BDOpensIn":
language.Settings.BDOpensIn = reader.Value;
break;
case "Settings/BDOpensInOcr":
language.Settings.BDOpensInOcr = reader.Value;
break;
case "Settings/BDOpensInEdit":
language.Settings.BDOpensInEdit = reader.Value;
break;
case "SettingsMpv/DownloadMpv":
language.SettingsMpv.DownloadMpv = reader.Value;
break;